diff --git a/MatterControl.sln b/MatterControl.sln
index 130327455..9cb0951df 100644
--- a/MatterControl.sln
+++ b/MatterControl.sln
@@ -88,12 +88,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControlLib", "MatterC
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterControl", "MatterControl.csproj", "{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.shproj", "{D8861CF8-C506-472B-8A57-632BD6CA6496}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.One", "Submodules\agg-sharp\Typography.One\Typography.One.csproj", "{07F53C22-F178-4A25-963F-11DB59024ACA}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.OpenFont", "Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.shproj", "{235A071B-8D06-40AE-A5C5-B1CE59715EE9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.Common", "MatterControl.Common\MatterControl.Common.csproj", "{50505F12-985B-4C5F-8DAB-D5BEA734CD51}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.PartSheet", "Plugins\MatterControl.PartSheet\MatterControl.PartSheet.csproj", "{312CE0DD-0F8F-4366-96A4-44D0AAEF60AA}"
@@ -112,12 +106,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "gsSlicer", "Submodules\gsSl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MatterControl.gsSlicer", "MatterHackers.gsSlicer\MatterControl.gsSlicer.csproj", "{C4F5AB29-8AED-4183-9562-9CA428E736B3}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Typography", "Typography", "{FDD3A966-672B-42D8-86D5-D749B09A9060}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.GlyphLayout", "Submodules\agg-sharp\Typography\Typography.GlyphLayout\Typography.GlyphLayout.shproj", "{D8861CF8-C506-472B-8A57-632BD6CA6496}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Typography.One", "Submodules\agg-sharp\Typography\Typography.One\Typography.One.csproj", "{B112455B-E42E-4718-821F-862884B9C07C}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Typography.OpenFont", "Submodules\agg-sharp\Typography\Typography.OpenFont\Typography.OpenFont.shproj", "{235A071B-8D06-40AE-A5C5-B1CE59715EE9}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.projitems*{235a071b-8d06-40ae-a5c5-b1ce59715ee9}*SharedItemsImports = 13
-		Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
-		Submodules\agg-sharp\Typography.OpenFont\Typography.OpenFont.projitems*{657dbc6d-c3ea-4398-a3fa-ddb73c14f71b}*SharedItemsImports = 4
-		Submodules\agg-sharp\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{d8861cf8-c506-472b-8a57-632bd6ca6496}*SharedItemsImports = 13
+		Submodules\agg-sharp\Typography\Typography.OpenFont\Typography.OpenFont.projitems*{235a071b-8d06-40ae-a5c5-b1ce59715ee9}*SharedItemsImports = 13
+		Submodules\agg-sharp\Typography\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{b112455b-e42e-4718-821f-862884b9c07c}*SharedItemsImports = 5
+		Submodules\agg-sharp\Typography\Typography.OpenFont\Typography.OpenFont.projitems*{b112455b-e42e-4718-821f-862884b9c07c}*SharedItemsImports = 5
+		Submodules\agg-sharp\Typography\Typography.GlyphLayout\Typography.GlyphLayout.projitems*{d8861cf8-c506-472b-8a57-632bd6ca6496}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -414,14 +416,6 @@ Global
 		{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B2B001EE-A142-4E20-ACF8-AE4A9CB984F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{07F53C22-F178-4A25-963F-11DB59024ACA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{50505F12-985B-4C5F-8DAB-D5BEA734CD51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50505F12-985B-4C5F-8DAB-D5BEA734CD51}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50505F12-985B-4C5F-8DAB-D5BEA734CD51}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -486,6 +480,14 @@ Global
 		{C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C4F5AB29-8AED-4183-9562-9CA428E736B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B112455B-E42E-4718-821F-862884B9C07C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -525,9 +527,6 @@ Global
 		{D6DC2669-7B1F-40FE-89BF-45D4C94473E3} = {FED00F38-E911-45E1-A788-26980E84C3D6}
 		{7F077116-2923-4A77-87CC-EC3BE7EB8BC3} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
 		{B0AED568-8796-42B9-BAA9-EBC796134E78} = {57647FCB-8F00-4C05-972C-3CF6ACD12A63}
-		{D8861CF8-C506-472B-8A57-632BD6CA6496} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
-		{07F53C22-F178-4A25-963F-11DB59024ACA} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
-		{235A071B-8D06-40AE-A5C5-B1CE59715EE9} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
 		{50505F12-985B-4C5F-8DAB-D5BEA734CD51} = {FED00F38-E911-45E1-A788-26980E84C3D6}
 		{312CE0DD-0F8F-4366-96A4-44D0AAEF60AA} = {FED00F38-E911-45E1-A788-26980E84C3D6}
 		{8A33EE41-BEFA-499F-9184-1B8D0C8A4600} = {FED00F38-E911-45E1-A788-26980E84C3D6}
@@ -536,6 +535,10 @@ Global
 		{1BB917A2-56AF-4A43-A99F-FF073F53A113} = {19D0D43D-0007-412B-980A-445EA6E8AD94}
 		{B3B79E5B-B7E2-4DE8-9810-666B0037D86F} = {19D0D43D-0007-412B-980A-445EA6E8AD94}
 		{C4F5AB29-8AED-4183-9562-9CA428E736B3} = {19D0D43D-0007-412B-980A-445EA6E8AD94}
+		{FDD3A966-672B-42D8-86D5-D749B09A9060} = {2AB9B589-5C98-4C05-BBEA-F97DAE168EAB}
+		{D8861CF8-C506-472B-8A57-632BD6CA6496} = {FDD3A966-672B-42D8-86D5-D749B09A9060}
+		{B112455B-E42E-4718-821F-862884B9C07C} = {FDD3A966-672B-42D8-86D5-D749B09A9060}
+		{235A071B-8D06-40AE-A5C5-B1CE59715EE9} = {FDD3A966-672B-42D8-86D5-D749B09A9060}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {42D74E06-00EA-43D2-A05B-9BEAD4A2C8A0}