diff --git a/Application/Application.cpp b/Application/Application.cpp
index 5060e287..574877bd 100644
--- a/Application/Application.cpp
+++ b/Application/Application.cpp
@@ -23,16 +23,6 @@
 #include <ShellAPI.h>
 #include "../Library/Rainmeter.h"
 
-#if defined _M_IX86
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#elif defined _M_IA64
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='ia64' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#elif defined _M_X64
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#else
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#endif
-
 /*
 ** Entry point.
 **
diff --git a/Application/Application.manifest b/Application/Application.manifest
new file mode 100644
index 00000000..45f90406
--- /dev/null
+++ b/Application/Application.manifest
@@ -0,0 +1,13 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
+		</dependentAssembly>
+	</dependency>
+	<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+		<application>
+			<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+		</application>
+	</compatibility>
+</assembly>
diff --git a/Application/Application.vcxproj b/Application/Application.vcxproj
index 1ce6e366..eba9ac40 100644
--- a/Application/Application.vcxproj
+++ b/Application/Application.vcxproj
@@ -109,6 +109,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x32\debug\skins
 xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\themes
 :skip</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -144,6 +147,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x64\debug\skins
 xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\themes
 :skip</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -183,6 +189,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x32\release\skins
 xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\themes
 :skip</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -220,6 +229,9 @@ xcopy /Q /S /Y ..\Build\Skins ..\testbench\x64\release\skins
 xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\release\themes
 :skip</Command>
     </PostBuildEvent>
+    <Manifest>
+      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Application.cpp" />
diff --git a/SkinInstaller/Application.h b/SkinInstaller/Application.h
index c4b30376..d07e9e72 100644
--- a/SkinInstaller/Application.h
+++ b/SkinInstaller/Application.h
@@ -23,12 +23,6 @@
 #include "zip.h"
 #include "unzip.h"
 
-#if defined _M_IX86
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#elif defined _M_X64
-#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#endif
-
 #define MAX_LINE_LENGTH		4096
 #define MB_ERROR			MB_OK | MB_TOPMOST | MB_ICONERROR
 
diff --git a/SkinInstaller/SkinInstaller.vcxproj b/SkinInstaller/SkinInstaller.vcxproj
index 2818c971..6a5c6906 100644
--- a/SkinInstaller/SkinInstaller.vcxproj
+++ b/SkinInstaller/SkinInstaller.vcxproj
@@ -105,6 +105,9 @@
     <BuildLog>
       <Path>$(IntDir)\$(MSBuildProjectName).log</Path>
     </BuildLog>
+    <Manifest>
+      <AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <MASM>
@@ -140,6 +143,9 @@
     <BuildLog>
       <Path>$(IntDir)\$(MSBuildProjectName).log</Path>
     </BuildLog>
+    <Manifest>
+      <AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <MASM>
@@ -174,6 +180,9 @@
     <Bscmake>
       <OutputFile>$(IntDir)SkinInstaller.bsc</OutputFile>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <MASM>
@@ -206,6 +215,9 @@
     <Bscmake>
       <OutputFile>$(IntDir)SkinInstaller.bsc</OutputFile>
     </Bscmake>
+    <Manifest>
+      <AdditionalManifestFiles>..\Application\Application.manifest</AdditionalManifestFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Library\Dialog.cpp" />