diff --git a/utils.cmake b/utils.cmake
index 343547e..61a3d10 100644
--- a/utils.cmake
+++ b/utils.cmake
@@ -1532,19 +1532,15 @@ function(generate_win32_manifest_file)
     endif()
     set(__architecture "")
     if(MF_ARGS_ARCHITECTURE)
-        set(__architecture "${MF_ARGS_ARCHITECTURE}")
-    else()
-        set(__architecture "*")
+        set(__architecture "processorArchitecture=\"${MF_ARGS_ARCHITECTURE}\"")
     endif()
     set(__language "")
     if(MF_ARGS_LANGUAGE)
-        set(__language "${MF_ARGS_LANGUAGE}")
-    else()
-        set(__language "*")
+        set(__language "language=\"${MF_ARGS_LANGUAGE}\"")
     endif()
     set(__public_key_token "")
     if(MF_ARGS_PUBLIC_KEY_TOKEN)
-        set(__public_key_token "publicKeyToken=\"${MF_ARGS_PUBLIC_KEY_TOKEN}\" ")
+        set(__public_key_token "publicKeyToken=\"${MF_ARGS_PUBLIC_KEY_TOKEN}\"")
     endif()
     set(__description "")
     if(MF_ARGS_DESCRIPTION)
@@ -1613,7 +1609,7 @@ function(generate_win32_manifest_file)
 <!-- This file is auto-generated by CMake. DO NOT EDIT! ALL MODIFICATIONS WILL BE LOST! -->
 
 <assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">
-  <assemblyIdentity type=\"win32\" name=\"${__id}\" version=\"${__version}\" processorArchitecture=\"${__architecture}\" ${__public_key_token}language=\"${__language}\"/>
+  <assemblyIdentity type=\"win32\" name=\"${__id}\" version=\"${__version}\" ${__architecture} ${__public_key_token} ${__language}/>
   ${__description}
   <dependency>
     <dependentAssembly>
@@ -1641,14 +1637,14 @@ function(generate_win32_manifest_file)
     <windowsSettings>
       <dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">True/PM</dpiAware>
       <dpiAwareness xmlns=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">PerMonitorV2, PerMonitor</dpiAwareness>
-      <printerDriverIsolation xmlns=\"http://schemas.microsoft.com/SMI/2011/WindowsSettings\">True</printerDriverIsolation>
-      <longPathAware xmlns=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">True</longPathAware>
+      <printerDriverIsolation xmlns=\"http://schemas.microsoft.com/SMI/2011/WindowsSettings\">true</printerDriverIsolation>
+      <longPathAware xmlns=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">true</longPathAware>
       <heapType xmlns=\"http://schemas.microsoft.com/SMI/2020/WindowsSettings\">SegmentHeap</heapType>
       ${__utf8_codepage}
-      <disableWindowFiltering xmlns=\"http://schemas.microsoft.com/SMI/2011/WindowsSettings\">True</disableWindowFiltering>
-      <highResolutionScrollingAware>True</highResolutionScrollingAware>
-      <ultraHighResolutionScrollingAware>True</ultraHighResolutionScrollingAware>
-      <!-- <gdiScaling xmlns=\"http://schemas.microsoft.com/SMI/2017/WindowsSettings\">True</gdiScaling> -->
+      <disableWindowFiltering xmlns=\"http://schemas.microsoft.com/SMI/2011/WindowsSettings\">true</disableWindowFiltering>
+      <!-- <highResolutionScrollingAware>true</highResolutionScrollingAware> -->
+      <!-- <ultraHighResolutionScrollingAware>true</ultraHighResolutionScrollingAware> -->
+      <!-- <gdiScaling xmlns=\"http://schemas.microsoft.com/SMI/2017/WindowsSettings\">true</gdiScaling> -->
     </windowsSettings>
   </application>
 </assembly>