diff --git a/cmake/pack.cmake b/cmake/pack.cmake
index 0e5864866..757a6c687 100644
--- a/cmake/pack.cmake
+++ b/cmake/pack.cmake
@@ -47,7 +47,8 @@ elseif (WIN32)
 	set(CPACK_WIX_PRODUCT_ICON "${ROOT_DIR}/contrib/installer/vengi-icon.ico")
 	set(CPACK_WIX_UI_BANNER "${ROOT_DIR}/contrib/installer/vengi-banner-493x58.png")
 	set(CPACK_WIX_UI_DIALOG "${ROOT_DIR}/contrib/installer/vengi-banner-493x312.png")
-	set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT  "https://vengi-voxel.github.io/vengi")
+	set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "https://vengi-voxel.github.io/vengi")
+	set(CPACK_WIX_PATCH_FILE "${ROOT_DIR}/contrib/installer/windows/wixpatch.xml")
 	set(CPACK_WIX_CULTURES "en-US;de-DE")
 	# guids were generated by cmake
 	set(CPACK_WIX_UPGRADE_GUID "9F20CEE6-8CF0-4618-922F-47942B336330")
diff --git a/contrib/installer/windows/wixpatch.xml b/contrib/installer/windows/wixpatch.xml
index d44374cdb..7ef2087d9 100644
Binary files a/contrib/installer/windows/wixpatch.xml and b/contrib/installer/windows/wixpatch.xml differ
diff --git a/src/tools/formatprinter/FormatPrinter.cpp b/src/tools/formatprinter/FormatPrinter.cpp
index b2ee337bc..0322d6363 100644
--- a/src/tools/formatprinter/FormatPrinter.cpp
+++ b/src/tools/formatprinter/FormatPrinter.cpp
@@ -249,23 +249,24 @@ void FormatPrinter::printMarkdownTables() {
 }
 
 void FormatPrinter::printApplicationWix() {
+	Log::printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 	Log::printf("<CPackWiXPatch>\n");
 	Log::printf("	<!--  Fragment ID is from: <your build dir>/_CPack_Packages/win64/WIX/files.wxs -->\n");
-	Log::printf("	<CPackWiXFragment Id=\"CM_CP_voxedit.vengi_voxedit.exe\">\n");
+	Log::printf("	<CPackWiXFragment Id=\"CM_CP_voxedit.voxedit.vengi_voxedit.exe\">\n");
 	Log::printf("		<Environment Id=\"PATH\" Name=\"PATH\" Value=\"[INSTALL_ROOT]\" Permanent=\"yes\" Part=\"last\" Action=\"set\" System=\"yes\" />\n");
 	Log::printf("\n");
 	Log::printf("		<!-- Open With -->\n");
 	Log::printf("		<RegistryValue Root=\"HKCR\" Key=\"Applications\\vengi_voxedit.exe\" Type=\"string\" Name=\"FriendlyAppName\" Value=\"Vengi Voxel Editor\"/>\n");
-	Log::printf("		<RegistryValue Root=\"HKCR\" Key=\"Applications\\vengi_voxedit.exe\\shell\\open\\command\" Type=\"string\" Value=\"[#CM_FP_voxedit.vengi_voxedit.exe] &quot;%%1&quot;\"/>\n");
+	Log::printf("		<RegistryValue Root=\"HKCR\" Key=\"Applications\\vengi_voxedit.exe\\shell\\open\\command\" Type=\"string\" Value=\"[#CM_FP_voxedit.voxedit.vengi_voxedit.exe] &quot;%%1&quot;\"/>\n");
 	Log::printf("\n");
 	Log::printf("		<!-- App Paths -->\n");
 	Log::printf("		<RegistryKey Root=\"HKLM\" Key=\"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\vengi_voxedit.exe\">\n");
-	Log::printf("			<RegistryValue Type=\"string\" Value=\"[#CM_FP_voxedit.vengi_voxedit.exe]\" />\n");
-	Log::printf("			<RegistryValue Type=\"string\" Name=\"Path\" Value=\"[INSTALL_ROOT]\" />\n");
+	Log::printf("			<RegistryValue Type=\"string\" Value=\"[#CM_FP_voxedit.voxedit.vengi_voxedit.exe]\" />\n");
+	Log::printf("			<RegistryValue Type=\"string\" Name=\"Path\" Value=\"[#CM_CP_voxedit.voxedit.vengi_voxedit.exe]\" />\n");
 	Log::printf("		</RegistryKey>\n");
 	Log::printf("\n");
 	Log::printf("		<!-- Default Programs Capabilities -->\n");
-	Log::printf("		<RegistryKey Root=\"HKLM\" Key=\"SOFTWARE\\Clients\\Media\\vengi-voxedit\\Capabilities\">\n");
+	Log::printf("		<RegistryKey Root=\"HKLM\" Key=\"SOFTWARE\\vengi-voxedit\\Capabilities\">\n");
 	Log::printf("			<RegistryValue Type=\"string\" Name=\"ApplicationName\" Value=\"vengi-voxedit\" />\n");
 	Log::printf("			<RegistryValue Type=\"string\" Name=\"ApplicationDescription\" Value=\"Vengi Voxel Editor\" />\n");
 	Log::printf("		</RegistryKey>\n");
@@ -277,12 +278,13 @@ void FormatPrinter::printApplicationWix() {
 			if (!uniqueExtensions.insert(e)) {
 				continue;
 			}
-			Log::printf("		<RegistryValue Root=\"HKLM\" Key=\"Software\\Clients\\Media\\vengi-voxedit\\Capabilities\\FileAssociations\" Name=\".%s\" Value=\"vengi-voxedit.%s\" Type=\"string\" />\n", e.c_str(), e.c_str());
+			const core::String &m = uniqueMimetype(*desc);
+			Log::printf("		<RegistryValue Root=\"HKLM\" Key=\"Software\\vengi-voxedit\\Capabilities\\FileAssociations\" Name=\".%s\" Value=\"vengi-voxedit.%s\" Type=\"string\" />\n", e.c_str(), e.c_str());
 			Log::printf("		<RegistryValue Root=\"HKCR\" Key=\"Applications\\vengi_voxedit.exe\\SupportedTypes\" Name=\".%s\" Value=\"\" Type=\"string\" />\n", e.c_str());
 			Log::printf("		<RegistryValue Root=\"HKCR\" Key=\".%s\\OpenWithProgids\" Name=\"vengi-voxedit.%s\" Value=\"\" Type=\"string\" />\n", e.c_str(), e.c_str());
-			Log::printf("		<ProgId Id=\"vengi-voxedit.%s\" Description=\"%s\" Icon=\"CM_FP_voxedit.vengi_voxedit.exe\">\n", e.c_str(), desc->name.c_str());
-			Log::printf("			<Extension Id=\"%s\">\n", e.c_str());
-			Log::printf("				<Verb Id=\"open\" TargetFile=\"CM_FP_voxedit.vengi_voxedit.exe\" Argument=\"&quot;%%1&quot;\" />\n");
+			Log::printf("		<ProgId Id=\"vengi-voxedit.%s\" Description=\"%s\" Icon=\"CM_FP_voxedit.voxedit.vengi_voxedit.exe\">\n", e.c_str(), desc->name.c_str());
+			Log::printf("			<Extension Id=\"%s\" ContentType=\"%s\">\n", e.c_str(), m.c_str());
+			Log::printf("				<Verb Id=\"open\" TargetFile=\"CM_FP_voxedit.voxedit.vengi_voxedit.exe\" Argument=\"&quot;%%1&quot;\" />\n");
 			Log::printf("			</Extension>\n");
 			Log::printf("		</ProgId>\n");
 			Log::printf("\n");
@@ -290,7 +292,7 @@ void FormatPrinter::printApplicationWix() {
 	}
 	Log::printf("\n");
 	Log::printf("		<!-- Default Programs entry -->\n");
-	Log::printf("		<RegistryValue Root=\"HKLM\" Key=\"SOFTWARE\\RegisteredApplications\" Name=\"venig-voxedit\" Value=\"SOFTWARE\\Clients\\Media\vengi-voxedit\\Capabilities\" Type=\"string\" />\n");
+	Log::printf("		<RegistryValue Root=\"HKLM\" Key=\"SOFTWARE\\RegisteredApplications\" Name=\"vengi-voxedit\" Value=\"SOFTWARE\\vengi-voxedit\\Capabilities\" Type=\"string\" />\n");
 	Log::printf("	</CPackWiXFragment>\n");
 	Log::printf("</CPackWiXPatch>\n");
 }