diff --git a/project/vc12/bc6h/bc6h.vcxproj b/project/vc12/bc6h/bc6h.vcxproj
index 7a0e06f..d13ccd3 100644
--- a/project/vc12/bc6h/bc6h.vcxproj
+++ b/project/vc12/bc6h/bc6h.vcxproj
@@ -18,6 +18,19 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\bc6h\bits.h" />
+    <ClInclude Include="..\..\..\src\bc6h\shapes_two.h" />
+    <ClInclude Include="..\..\..\src\bc6h\tile.h" />
+    <ClInclude Include="..\..\..\src\bc6h\zoh.h" />
+    <ClInclude Include="..\..\..\src\bc6h\zoh_utils.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\bc6h\zoh.cpp" />
+    <ClCompile Include="..\..\..\src\bc6h\zohone.cpp" />
+    <ClCompile Include="..\..\..\src\bc6h\zohtwo.cpp" />
+    <ClCompile Include="..\..\..\src\bc6h\zoh_utils.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C33787E3-5564-4834-9FE3-A9020455A669}</ProjectGuid>
     <RootNamespace>bc6h</RootNamespace>
@@ -129,19 +142,6 @@
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\extern\poshlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\nvtt\bc6h\bits.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc6h\shapes_two.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc6h\tile.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc6h\utils.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc6h\zoh.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\nvtt\bc6h\utils.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc6h\zoh.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc6h\zohone.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc6h\zohtwo.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/project/vc12/bc7/bc7.vcxproj b/project/vc12/bc7/bc7.vcxproj
index 9871c12..2240bea 100644
--- a/project/vc12/bc7/bc7.vcxproj
+++ b/project/vc12/bc7/bc7.vcxproj
@@ -18,6 +18,27 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\bc7\avpcl.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode0.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode1.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode2.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode3.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode4.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode5.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode6.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_mode7.cpp" />
+    <ClCompile Include="..\..\..\src\bc7\avpcl_utils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\bc7\avpcl.h" />
+    <ClInclude Include="..\..\..\src\bc7\avpcl_utils.h" />
+    <ClInclude Include="..\..\..\src\bc7\bits.h" />
+    <ClInclude Include="..\..\..\src\bc7\endpts.h" />
+    <ClInclude Include="..\..\..\src\bc7\shapes_three.h" />
+    <ClInclude Include="..\..\..\src\bc7\shapes_two.h" />
+    <ClInclude Include="..\..\..\src\bc7\tile.h" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F974F34B-AF02-4C88-8E1E-85475094EA78}</ProjectGuid>
     <RootNamespace>bc7</RootNamespace>
@@ -129,27 +150,6 @@
       <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\..\..\src;$(SolutionDir)\..\..\extern\poshlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\nvtt\bc7\avpcl.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc7\bits.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc7\endpts.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc7\shapes_two.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc7\shapes_three.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc7\tile.h" />
-    <ClInclude Include="..\..\..\src\nvtt\bc7\utils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode0.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode1.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode2.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode3.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode4.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode5.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode6.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\avpcl_mode7.cpp" />
-    <ClCompile Include="..\..\..\src\nvtt\bc7\utils.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/project/vc12/nvtt.sln b/project/vc12/nvtt.sln
index 2b74ed4..080f898 100644
--- a/project/vc12/nvtt.sln
+++ b/project/vc12/nvtt.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A08D9CB4-C9D8-46EF-A74D-0EAB11FE34C5}"
 	ProjectSection(SolutionItems) = preProject
@@ -30,8 +30,14 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvddsinfo", "nvddsinfo\nvddsinfo.vcxproj", "{841B73C5-C679-4EEF-A50A-7D6106642B49}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvdecompress", "nvdecompress\nvdecompress.vcxproj", "{75A0527D-BFC9-49C3-B46B-CD1A901D5927}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1AEB7681-57D8-48EE-813D-5C41CC38B647} = {1AEB7681-57D8-48EE-813D-5C41CC38B647}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvimgdiff", "nvimgdiff\nvimgdiff.vcxproj", "{05A59E8B-EA70-4F22-89E8-E0927BA13064}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1AEB7681-57D8-48EE-813D-5C41CC38B647} = {1AEB7681-57D8-48EE-813D-5C41CC38B647}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvassemble", "nvassemble\nvassemble.vcxproj", "{3BC6D760-91E8-4FFB-BD0E-F86F367AD8EA}"
 EndProject
diff --git a/project/vc12/nvtt/nvtt.vcxproj b/project/vc12/nvtt/nvtt.vcxproj
index b879f3d..9ac72b4 100644
--- a/project/vc12/nvtt/nvtt.vcxproj
+++ b/project/vc12/nvtt/nvtt.vcxproj
@@ -416,6 +416,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\nvtt\BlockCompressor.h" />
+    <ClInclude Include="..\..\..\src\nvtt\CompressorDXT1.h" />
+    <ClInclude Include="..\..\..\src\nvtt\CompressorDXT5_RGBM.h" />
     <ClInclude Include="..\..\..\src\nvtt\CubeSurface.h" />
     <ClInclude Include="..\..\..\src\nvtt\SingleColorLookup.h" />
     <ClInclude Include="..\..\..\src\nvtt\Surface.h" />
@@ -454,6 +456,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\nvtt\BlockCompressor.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\CompressorDXT1.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\CompressorDXT5_RGBM.cpp" />
     <ClCompile Include="..\..\..\src\nvtt\CubeSurface.cpp" />
     <ClCompile Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.cpp" />
     <ClCompile Include="..\..\..\src\nvtt\cuda\CudaUtils.cpp" />
diff --git a/project/vc12/nvtt/nvtt.vcxproj.filters b/project/vc12/nvtt/nvtt.vcxproj.filters
index 8dbf23f..df60078 100644
--- a/project/vc12/nvtt/nvtt.vcxproj.filters
+++ b/project/vc12/nvtt/nvtt.vcxproj.filters
@@ -46,6 +46,8 @@
     <ClInclude Include="..\..\..\src\nvtt\BlockCompressor.h" />
     <ClInclude Include="..\..\..\src\nvtt\SingleColorLookup.h" />
     <ClInclude Include="..\..\..\src\nvtt\CompressorDX11.h" />
+    <ClInclude Include="..\..\..\src\nvtt\CompressorDXT1.h" />
+    <ClInclude Include="..\..\..\src\nvtt\CompressorDXT5_RGBM.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\nvtt\cuda\CudaCompressorDXT.cpp">
@@ -72,6 +74,8 @@
     <ClCompile Include="..\..\..\src\nvtt\Surface.cpp" />
     <ClCompile Include="..\..\..\src\nvtt\BlockCompressor.cpp" />
     <ClCompile Include="..\..\..\src\nvtt\TaskDispatcher.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\CompressorDXT1.cpp" />
+    <ClCompile Include="..\..\..\src\nvtt\CompressorDXT5_RGBM.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuildStep Include="..\..\..\src\nvtt\cuda\ConvolveKernel.cu">