diff --git a/Toolkit.sln b/Toolkit.sln
index e9e5e6a..649975e 100755
--- a/Toolkit.sln
+++ b/Toolkit.sln
@@ -6,6 +6,10 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{36EED776-1944-4C7B-A662-FBB1E36B6773}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchiveTool", "Tools\ArchiveTool\ArchiveTool.csproj", "{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{569CDE34-96F0-44BE-BD31-62B6A43C85B8} = {569CDE34-96F0-44BE-BD31-62B6A43C85B8}
+		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B} = {718F3F76-51AE-46CB-B11B-027B9BBC8A0B}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextureTool", "Tools\TextureTool\TextureTool.csproj", "{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}"
 EndProject
@@ -25,6 +29,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RageLib.GTA5.UnitTests", "RageLib.GTA5.UnitTests\RageLib.GTA5.UnitTests.csproj", "{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}"
 	ProjectSection(ProjectDependencies) = postProject
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8} = {569CDE34-96F0-44BE-BD31-62B6A43C85B8}
+		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B} = {718F3F76-51AE-46CB-B11B-027B9BBC8A0B}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_TestTools.GTA5", "_TestTools.GTA5", "{E240F677-DCC5-4C33-B370-119A9E4A5144}"
@@ -42,116 +47,78 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateMetaEnumsAndStructs
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Debug|x64.Build.0 = Debug|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Debug|x86.Build.0 = Debug|Any CPU
-		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Release|x64.ActiveCfg = Release|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Release|x64.Build.0 = Release|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Release|x86.ActiveCfg = Release|Any CPU
 		{7A5CAE95-08CD-4E4A-A900-77E2732EE6BC}.Release|x86.Build.0 = Release|Any CPU
-		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Debug|x64.Build.0 = Debug|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Release|x64.ActiveCfg = Release|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Release|x64.Build.0 = Release|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Release|x86.ActiveCfg = Release|Any CPU
 		{0C1A9502-FEF1-423D-8798-FCC5C84EAEFE}.Release|x86.Build.0 = Release|Any CPU
-		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Debug|x64.Build.0 = Debug|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Debug|x86.Build.0 = Debug|Any CPU
-		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Release|x64.ActiveCfg = Release|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Release|x64.Build.0 = Release|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Release|x86.ActiveCfg = Release|Any CPU
 		{718F3F76-51AE-46CB-B11B-027B9BBC8A0B}.Release|x86.Build.0 = Release|Any CPU
-		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Debug|x64.Build.0 = Debug|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Debug|x86.Build.0 = Debug|Any CPU
-		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x64.ActiveCfg = Release|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x64.Build.0 = Release|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x86.ActiveCfg = Release|Any CPU
 		{569CDE34-96F0-44BE-BD31-62B6A43C85B8}.Release|x86.Build.0 = Release|Any CPU
-		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|Any CPU.Build.0 = Debug|x64
 		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x64.ActiveCfg = Debug|x64
 		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x64.Build.0 = Debug|x64
 		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Debug|x86.ActiveCfg = Debug|x64
-		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|Any CPU.ActiveCfg = Release|x64
-		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|Any CPU.Build.0 = Release|x64
 		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x64.ActiveCfg = Release|x64
 		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x64.Build.0 = Release|x64
 		{755AB64B-16B4-4C90-AA3B-BFF448E5A21E}.Release|x86.ActiveCfg = Release|x64
-		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|x64.Build.0 = Debug|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Debug|x86.Build.0 = Debug|Any CPU
-		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Release|x64.ActiveCfg = Release|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Release|x64.Build.0 = Release|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Release|x86.ActiveCfg = Release|Any CPU
 		{EE0B585C-081B-4E36-AF53-7F4E4D5E7A65}.Release|x86.Build.0 = Release|Any CPU
-		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Debug|x64.Build.0 = Debug|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Debug|x86.Build.0 = Debug|Any CPU
-		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Release|x64.ActiveCfg = Release|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Release|x64.Build.0 = Release|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Release|x86.ActiveCfg = Release|Any CPU
 		{34E4D20C-A0BF-4BE8-B35E-B18E73BA2D23}.Release|x86.Build.0 = Release|Any CPU
-		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Debug|x64.Build.0 = Debug|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Debug|x86.Build.0 = Debug|Any CPU
-		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Release|x64.ActiveCfg = Release|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Release|x64.Build.0 = Release|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Release|x86.ActiveCfg = Release|Any CPU
 		{D6DC4413-15ED-4511-B0DB-D287EA1FDC99}.Release|x86.Build.0 = Release|Any CPU
-		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Debug|x64.Build.0 = Debug|Any CPU
 		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Debug|x86.Build.0 = Debug|Any CPU
-		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Release|x64.ActiveCfg = Release|Any CPU
 		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Release|x64.Build.0 = Release|Any CPU
 		{AA6C01BA-97C3-498E-8274-16CF113B5B3D}.Release|x86.ActiveCfg = Release|Any CPU
diff --git a/build.ps1 b/build.ps1
index 3af89e5..8cefbe4 100644
--- a/build.ps1
+++ b/build.ps1
@@ -30,4 +30,5 @@ function Find-MSBuild
 
 $MSBuild = Find-MSBuild
 
+& "$MSBuild" -t:restore
 & "$MSBuild" Toolkit.sln /p:Configuration=$build