From 0ec4624546425a26d86f9403f93f007c8ec6acdd Mon Sep 17 00:00:00 2001
From: Semyon Bezrukov <semen.bezrukov@onlyoffice.com>
Date: Fri, 31 Jan 2025 18:30:09 +0300
Subject: [PATCH] Refactor properties

---
 win-linux/package/windows/DesktopEditors.aip | 180 +++++++++----------
 1 file changed, 89 insertions(+), 91 deletions(-)

diff --git a/win-linux/package/windows/DesktopEditors.aip b/win-linux/package/windows/DesktopEditors.aip
index 27dd2fca9..f692fce52 100644
--- a/win-linux/package/windows/DesktopEditors.aip
+++ b/win-linux/package/windows/DesktopEditors.aip
@@ -4,7 +4,7 @@
     <ROW Property="AI_APP_FILE" Value="[#DesktopEditors.exe]"/>
     <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
     <ROW Property="AI_EXTERNALUIUNINSTALLERNAME" MultiBuildValue="MsiBuild64:aiui#MsiBuild32:aiui"/>
-    <ROW Property="AI_PRODUCTNAME_ARP" Value="[|PackageName] [|Version] ([|Arch])" ValueLocId="-"/>
+    <ROW Property="AI_PRODUCTNAME_ARP" Value="[|AppName] [|Version] ([|Arch])" ValueLocId="-"/>
     <ROW Property="AI_SHORTCUTSREG" Value="0|0|0|0|"/>
     <ROW Property="AI_UNINSTALLER" Value="msiexec.exe"/>
     <ROW Property="ALLUSERS" Value="1"/>
@@ -18,12 +18,12 @@
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="ARPURLINFOABOUT" Value="http://www.onlyoffice.com" ValueLocId="-"/>
     <ROW Property="ARPURLUPDATEINFO" Value="http://www.onlyoffice.com/download.aspx" ValueLocId="-"/>
-    <ROW Property="AppName" Value="Desktop Editors" ValueLocId="-"/>
-    <ROW Property="AppShortName" Value="DesktopEditors" ValueLocId="-"/>
+    <ROW Property="AppName" Value="ONLYOFFICE" ValueLocId="-"/>
     <ROW Property="AppUserModelID" Value="ASC.Documents.5" ValueLocId="-"/>
     <ROW Property="Arch" Value="x64" MultiBuildValue="MsiBuild32:x86" ValueLocId="-"/>
     <ROW Property="CTRLS" Value="2"/>
-    <ROW Property="DesktopEditorsName" Value="ONLYOFFICE Editors" ValueLocId="-"/>
+    <ROW Property="CompanyPath" Value="ONLYOFFICE" ValueLocId="-"/>
+    <ROW Property="DesktopPath" Value="DesktopEditors" ValueLocId="-"/>
     <ROW Property="EMPTY_LANG_DIR" Value="en-US"/>
     <ROW Property="ExtPfx" Value="ASC" ValueLocId="-"/>
     <ROW Property="FORMS" Value="1" ValueLocId="-"/>
@@ -38,11 +38,11 @@
     <ROW Property="NewPresentation" Value="New presentation"/>
     <ROW Property="NewSpreadsheet" Value="New spreadsheet"/>
     <ROW Property="PLUGINS" Value="1" ValueLocId="-"/>
-    <ROW Property="PackageName" Value="[|VendorName] [|AppName]" ValueLocId="-"/>
-    <ROW Property="PackageShortName" Value="[|VendorShortName]-[|AppShortName]" ValueLocId="-"/>
+    <ROW Property="PackageFileName" Value="[|CompanyPath]-[|DesktopPath]" ValueLocId="-"/>
+    <ROW Property="PackageName" Value="ONLYOFFICE Desktop Editors" ValueLocId="-"/>
     <ROW Property="ProductCode" Value="1025:{00000000-0000-0000-0000-000000000000} 1026:{00000000-0000-0000-0000-000000000000} 1027:{00000000-0000-0000-0000-000000000000} 1028:{00000000-0000-0000-0000-000000000000} 1029:{00000000-0000-0000-0000-000000000000} 1030:{00000000-0000-0000-0000-000000000000} 1031:{00000000-0000-0000-0000-000000000000} 1032:{00000000-0000-0000-0000-000000000000} 1033:{00000000-0000-0000-0000-000000000000} 1035:{00000000-0000-0000-0000-000000000000} 1036:{00000000-0000-0000-0000-000000000000} 1037:{00000000-0000-0000-0000-000000000000} 1038:{00000000-0000-0000-0000-000000000000} 1040:{00000000-0000-0000-0000-000000000000} 1041:{00000000-0000-0000-0000-000000000000} 1042:{00000000-0000-0000-0000-000000000000} 1043:{00000000-0000-0000-0000-000000000000} 1044:{00000000-0000-0000-0000-000000000000} 1045:{00000000-0000-0000-0000-000000000000} 1046:{00000000-0000-0000-0000-000000000000} 1048:{00000000-0000-0000-0000-000000000000} 1049:{00000000-0000-0000-0000-000000000000} 1051:{00000000-0000-0000-0000-000000000000} 1053:{00000000-0000-0000-0000-000000000000} 1055:{00000000-0000-0000-0000-000000000000} 1057:{00000000-0000-0000-0000-000000000000} 1058:{00000000-0000-0000-0000-000000000000} 1059:{00000000-0000-0000-0000-000000000000} 1060:{00000000-0000-0000-0000-000000000000} 1062:{00000000-0000-0000-0000-000000000000} 1066:{00000000-0000-0000-0000-000000000000} 1110:{00000000-0000-0000-0000-000000000000} 2052:{00000000-0000-0000-0000-000000000000} 2057:{00000000-0000-0000-0000-000000000000} 2070:{00000000-0000-0000-0000-000000000000} 2074:{00000000-0000-0000-0000-000000000000} 3082:{00000000-0000-0000-0000-000000000000} 3098:{00000000-0000-0000-0000-000000000000} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
-    <ROW Property="ProductName" Value="[|PackageName]" ValueLocId="-"/>
+    <ROW Property="ProductName" Value="[|AppName]" ValueLocId="-"/>
     <ROW Property="ProductVersion" Value="0.0.0.0" Options="32"/>
     <ROW Property="ProgID" Value="[|ExtPfx].Editors" ValueLocId="-"/>
     <ROW Property="Protocol" Value="oo-office" ValueLocId="-"/>
@@ -100,16 +100,14 @@
     <ROW Property="REGISTER_XML" Value="1" Type="4" ValueLocId="-"/>
     <ROW Property="REGISTER_XPS" Value="1" Type="4" ValueLocId="-"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
+    <ROW Property="RegisteredAppName" Value="ONLYOFFICE Editors" ValueLocId="-"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;UPGRADE_1"/>
-    <ROW Property="ServiceDescription" Value="Update service for [|PackageName]"/>
-    <ROW Property="ServiceName" Value="ONLYOFFICE Update Service" ValueLocId="-"/>
-    <ROW Property="ServiceShortName" Value="[|ServiceName]" ValueLocId="-"/>
-    <ROW Property="ShortcutName" Value="ONLYOFFICE" ValueLocId="-"/>
+    <ROW Property="ServiceDescription" Value="Update service for [|AppName]"/>
+    <ROW Property="ServiceName" Value="[|AppName] Update Service" ValueLocId="-"/>
+    <ROW Property="ShortcutName" Value="[|AppName]" ValueLocId="-"/>
     <ROW Property="UPDATE_SERVICE" Value="0" ValueLocId="-"/>
     <ROW Property="UpgradeCode" Value="{47EEF706-B0E4-4C43-944B-E5F914B92B79}"/>
     <ROW Property="VC_REDIST" Value="1" ValueLocId="-"/>
-    <ROW Property="VendorName" Value="ONLYOFFICE" ValueLocId="-"/>
-    <ROW Property="VendorShortName" Value="[|VendorName]" ValueLocId="-"/>
     <ROW Property="Version" Value="0.0.0" ValueLocId="-"/>
     <ROW Property="WindowsType9X" MultiBuildValue="MsiBuild64:Windows 9x/ME#MsiBuild32:Windows 9x/ME" ValueLocId="-"/>
     <ROW Property="WindowsType9XDisplay" MultiBuildValue="MsiBuild64:Windows 9x/ME#MsiBuild32:Windows 9x/ME" ValueLocId="-"/>
@@ -512,8 +510,8 @@
     <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="251"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="MsiBuild32" BuildName="MsiBuild32" BuildOrder="2" BuildType="0" PackageFolder="." PackageFileName="[|PackageShortName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Subject:[|PackageName] [|ProductVersion] [|Arch]" ExtUI="true" UseLargeSchema="true" UACExecutionLevel="2"/>
-    <ROW BuildKey="MsiBuild64" BuildName="MsiBuild64" BuildOrder="1" BuildType="0" PackageFolder="." PackageFileName="[|PackageShortName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Subject:[|PackageName] [|ProductVersion] [|Arch]" ExtUI="true" UseLargeSchema="true" MsiPackageType="x64" UACExecutionLevel="2"/>
+    <ROW BuildKey="MsiBuild32" BuildName="MsiBuild32" BuildOrder="2" BuildType="0" PackageFolder="." PackageFileName="[|PackageFileName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Subject:[|PackageName] [|ProductVersion] [|Arch]" ExtUI="true" UseLargeSchema="true" UACExecutionLevel="2"/>
+    <ROW BuildKey="MsiBuild64" BuildName="MsiBuild64" BuildOrder="1" BuildType="0" PackageFolder="." PackageFileName="[|PackageFileName]-[|ProductVersion]-[|Arch]" Languages="en;ar;be;bg;ca;cs;da;de;el;en_GB;es;fi;fr;gl;he;hu;id;it;ja;ko;lv;nb;nl;pl;pt;pt_BR;ro;ru;sk;sl;sr_SP_Cyrillic;sr_SP_Latin;sv;tr;uk;vi;zh;zh_TW" LangOpt="1" InstallationType="4" SummInfoMetadata="Creating Application:[|AI_PACKAGING_TOOL]#Subject:[|PackageName] [|ProductVersion] [|Arch]" ExtUI="true" UseLargeSchema="true" MsiPackageType="x64" UACExecutionLevel="2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -554,7 +552,7 @@
     <ATTRIBUTE name="TranslateSegments" value="0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000111100011110000000110000000000001"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="[|PackageName]" SignOptions="7" SignTool="0" UseSha256="1"/>
+    <ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="[|AppName]" SignOptions="7" SignTool="0" UseSha256="1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
     <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
@@ -1096,8 +1094,8 @@
     <ROW Action="CreateJumpList" Type="210" Source="DesktopEditors.exe" Target="--create-jump-list [JUMP_LIST_ARG]"/>
     <ROW Action="IncompatibleVersion" Type="19" Target="[IncompatibleVersion_ErrorText]"/>
     <ROW Action="RemoveJumpList" Type="210" Source="DesktopEditors.exe" Target="--remove-jump-list"/>
-    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="MsiBuild64:[ProgramFiles64Folder][VendorShortName]\[AppShortName]#MsiBuild32:[ProgramFilesFolder][VendorShortName]\[AppShortName]"/>
-    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][VendorName]"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="MsiBuild64:[ProgramFiles64Folder][CompanyPath]\[DesktopPath]#MsiBuild32:[ProgramFilesFolder][CompanyPath]\[DesktopPath]"/>
+    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][CompanyPath]"/>
     <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiDialogComponent">
@@ -1472,61 +1470,61 @@
     <ROW Registry="VersionMinor" Root="-1" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductName] [ProductVersion]" Name="VersionMinor" Value="#4" Component_="AI_CustomARPName" VirtualValue="#"/>
     <ROW Registry="Windows" Root="-1" Key="Software\Microsoft\Windows" Name="\"/>
     <ROW Registry="reg_cu_sw" Root="1" Key="Software" Name="\"/>
-    <ROW Registry="reg_cu_sw_app" Root="1" Key="Software\[VendorShortName]\[AppShortName]" Name="*"/>
-    <ROW Registry="reg_cu_sw_app_locale" Root="1" Key="Software\[VendorShortName]\[AppShortName]" Name="locale" Value="[LOCALE]" Component_="c_reg_cu_sw_app"/>
-    <ROW Registry="reg_cu_sw_company" Root="1" Key="Software\[VendorShortName]" Name="+" Component_="c_reg_cu_sw_app"/>
-    <ROW Registry="reg_fa_cap__csv" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".csv" Value="[ExtPfx].Csv" Component_="c_reg_fa_cap__csv"/>
-    <ROW Registry="reg_fa_cap__djvu" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".djvu" Value="[ExtPfx].DjVu" Component_="c_reg_fa_cap__djvu"/>
-    <ROW Registry="reg_fa_cap__doc" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".doc" Value="[ExtPfx].Document.1" Component_="c_reg_fa_cap__doc"/>
-    <ROW Registry="reg_fa_cap__docm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".docm" Value="[ExtPfx].Docm" Component_="c_reg_fa_cap__docm"/>
-    <ROW Registry="reg_fa_cap__docx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".docx" Value="[ExtPfx].Document.12" Component_="c_reg_fa_cap__docx"/>
-    <ROW Registry="reg_fa_cap__docxf" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".docxf" Value="[ExtPfx].Docxf" Component_="c_reg_fa_cap__docxf"/>
-    <ROW Registry="reg_fa_cap__dot" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".dot" Value="[ExtPfx].Dot" Component_="c_reg_fa_cap__dot"/>
-    <ROW Registry="reg_fa_cap__dotm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".dotm" Value="[ExtPfx].Dotm" Component_="c_reg_fa_cap__dotm"/>
-    <ROW Registry="reg_fa_cap__dotx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".dotx" Value="[ExtPfx].Dotx" Component_="c_reg_fa_cap__dotx"/>
-    <ROW Registry="reg_fa_cap__epub" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".epub" Value="[ExtPfx].Epub" Component_="c_reg_fa_cap__epub"/>
-    <ROW Registry="reg_fa_cap__fb2" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".fb2" Value="[ExtPfx].Fb2" Component_="c_reg_fa_cap__fb2"/>
-    <ROW Registry="reg_fa_cap__fodp" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".fodp" Value="[ExtPfx].Fodp" Component_="c_reg_fa_cap__fodp"/>
-    <ROW Registry="reg_fa_cap__fods" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".fods" Value="[ExtPfx].Fods" Component_="c_reg_fa_cap__fods"/>
-    <ROW Registry="reg_fa_cap__fodt" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".fodt" Value="[ExtPfx].Fodt" Component_="c_reg_fa_cap__fodt"/>
-    <ROW Registry="reg_fa_cap__html" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".html" Value="[ExtPfx].Html" Component_="c_reg_fa_cap__html"/>
-    <ROW Registry="reg_fa_cap__key" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".key" Value="[ExtPfx].Key" Component_="c_reg_fa_cap__key"/>
-    <ROW Registry="reg_fa_cap__numbers" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".numbers" Value="[ExtPfx].Numbers" Component_="c_reg_fa_cap__numbers"/>
-    <ROW Registry="reg_fa_cap__odp" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".odp" Value="[ExtPfx].Show.2" Component_="c_reg_fa_cap__odp"/>
-    <ROW Registry="reg_fa_cap__ods" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".ods" Value="[ExtPfx].Sheet.2" Component_="c_reg_fa_cap__ods"/>
-    <ROW Registry="reg_fa_cap__odt" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".odt" Value="[ExtPfx].Document.2" Component_="c_reg_fa_cap__odt"/>
-    <ROW Registry="reg_fa_cap__otp" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".otp" Value="[ExtPfx].Otp" Component_="c_reg_fa_cap__otp"/>
-    <ROW Registry="reg_fa_cap__ots" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".ots" Value="[ExtPfx].Ots" Component_="c_reg_fa_cap__ots"/>
-    <ROW Registry="reg_fa_cap__ott" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".ott" Value="[ExtPfx].Ott" Component_="c_reg_fa_cap__ott"/>
-    <ROW Registry="reg_fa_cap__oxps" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".oxps" Value="[ExtPfx].Oxps" Component_="c_reg_fa_cap__oxps"/>
-    <ROW Registry="reg_fa_cap__pages" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".pages" Value="[ExtPfx].Pages" Component_="c_reg_fa_cap__pages"/>
-    <ROW Registry="reg_fa_cap__pdf" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".pdf" Value="[ExtPfx].Pdf" Component_="c_reg_fa_cap__pdf"/>
-    <ROW Registry="reg_fa_cap__pot" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".pot" Value="[ExtPfx].Pot" Component_="c_reg_fa_cap__pot"/>
-    <ROW Registry="reg_fa_cap__potm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".potm" Value="[ExtPfx].Potm" Component_="c_reg_fa_cap__potm"/>
-    <ROW Registry="reg_fa_cap__potx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".potx" Value="[ExtPfx].Potx" Component_="c_reg_fa_cap__potx"/>
-    <ROW Registry="reg_fa_cap__pps" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".pps" Value="[ExtPfx].SlideShow.1" Component_="c_reg_fa_cap__pps"/>
-    <ROW Registry="reg_fa_cap__ppsm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".ppsm" Value="[ExtPfx].Ppsm" Component_="c_reg_fa_cap__ppsm"/>
-    <ROW Registry="reg_fa_cap__ppsx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".ppsx" Value="[ExtPfx].SlideShow.12" Component_="c_reg_fa_cap__ppsx"/>
-    <ROW Registry="reg_fa_cap__ppt" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".ppt" Value="[ExtPfx].Show.1" Component_="c_reg_fa_cap__ppt"/>
-    <ROW Registry="reg_fa_cap__pptm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".pptm" Value="[ExtPfx].Pptm" Component_="c_reg_fa_cap__pptm"/>
-    <ROW Registry="reg_fa_cap__pptx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".pptx" Value="[ExtPfx].Show.12" Component_="c_reg_fa_cap__pptx"/>
-    <ROW Registry="reg_fa_cap__rtf" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".rtf" Value="[ExtPfx].Rtf" Component_="c_reg_fa_cap__rtf"/>
-    <ROW Registry="reg_fa_cap__txt" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".txt" Value="[ExtPfx].Txt" Component_="c_reg_fa_cap__txt"/>
-    <ROW Registry="reg_fa_cap__vsdm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".vsdm" Value="[ExtPfx].Vsdm" Component_="c_reg_fa_cap__vsdm"/>
-    <ROW Registry="reg_fa_cap__vsdx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".vsdx" Value="[ExtPfx].Vsdx" Component_="c_reg_fa_cap__vsdx"/>
-    <ROW Registry="reg_fa_cap__vssm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".vssm" Value="[ExtPfx].Vssm" Component_="c_reg_fa_cap__vssm"/>
-    <ROW Registry="reg_fa_cap__vssx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".vssx" Value="[ExtPfx].Vssx" Component_="c_reg_fa_cap__vssx"/>
-    <ROW Registry="reg_fa_cap__vstm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".vstm" Value="[ExtPfx].Vstm" Component_="c_reg_fa_cap__vstm"/>
-    <ROW Registry="reg_fa_cap__vstx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".vstx" Value="[ExtPfx].Vstx" Component_="c_reg_fa_cap__vstx"/>
-    <ROW Registry="reg_fa_cap__xls" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xls" Value="[ExtPfx].Sheet.1" Component_="c_reg_fa_cap__xls"/>
-    <ROW Registry="reg_fa_cap__xlsb" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xlsb" Value="[ExtPfx].Xlsb" Component_="c_reg_fa_cap__xlsb"/>
-    <ROW Registry="reg_fa_cap__xlsm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xlsm" Value="[ExtPfx].Xlsm" Component_="c_reg_fa_cap__xlsm"/>
-    <ROW Registry="reg_fa_cap__xlsx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xlsx" Value="[ExtPfx].Sheet.12" Component_="c_reg_fa_cap__xlsx"/>
-    <ROW Registry="reg_fa_cap__xlt" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xlt" Value="[ExtPfx].Xlt" Component_="c_reg_fa_cap__xlt"/>
-    <ROW Registry="reg_fa_cap__xltm" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xltm" Value="[ExtPfx].Xltm" Component_="c_reg_fa_cap__xltm"/>
-    <ROW Registry="reg_fa_cap__xltx" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xltx" Value="[ExtPfx].Xltx" Component_="c_reg_fa_cap__xltx"/>
-    <ROW Registry="reg_fa_cap__xml" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xml" Value="[ExtPfx].Xml" Component_="c_reg_fa_cap__xml"/>
-    <ROW Registry="reg_fa_cap__xps" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name=".xps" Value="[ExtPfx].Xps" Component_="c_reg_fa_cap__xps"/>
+    <ROW Registry="reg_cu_sw_app" Root="1" Key="Software\[CompanyPath]\[DesktopPath]" Name="*"/>
+    <ROW Registry="reg_cu_sw_app_locale" Root="1" Key="Software\[CompanyPath]\[DesktopPath]" Name="locale" Value="[LOCALE]" Component_="c_reg_cu_sw_app"/>
+    <ROW Registry="reg_cu_sw_company" Root="1" Key="Software\[CompanyPath]" Name="+" Component_="c_reg_cu_sw_app"/>
+    <ROW Registry="reg_fa_cap__csv" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".csv" Value="[ExtPfx].Csv" Component_="c_reg_fa_cap__csv"/>
+    <ROW Registry="reg_fa_cap__djvu" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".djvu" Value="[ExtPfx].DjVu" Component_="c_reg_fa_cap__djvu"/>
+    <ROW Registry="reg_fa_cap__doc" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".doc" Value="[ExtPfx].Document.1" Component_="c_reg_fa_cap__doc"/>
+    <ROW Registry="reg_fa_cap__docm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".docm" Value="[ExtPfx].Docm" Component_="c_reg_fa_cap__docm"/>
+    <ROW Registry="reg_fa_cap__docx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".docx" Value="[ExtPfx].Document.12" Component_="c_reg_fa_cap__docx"/>
+    <ROW Registry="reg_fa_cap__docxf" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".docxf" Value="[ExtPfx].Docxf" Component_="c_reg_fa_cap__docxf"/>
+    <ROW Registry="reg_fa_cap__dot" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".dot" Value="[ExtPfx].Dot" Component_="c_reg_fa_cap__dot"/>
+    <ROW Registry="reg_fa_cap__dotm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".dotm" Value="[ExtPfx].Dotm" Component_="c_reg_fa_cap__dotm"/>
+    <ROW Registry="reg_fa_cap__dotx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".dotx" Value="[ExtPfx].Dotx" Component_="c_reg_fa_cap__dotx"/>
+    <ROW Registry="reg_fa_cap__epub" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".epub" Value="[ExtPfx].Epub" Component_="c_reg_fa_cap__epub"/>
+    <ROW Registry="reg_fa_cap__fb2" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".fb2" Value="[ExtPfx].Fb2" Component_="c_reg_fa_cap__fb2"/>
+    <ROW Registry="reg_fa_cap__fodp" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".fodp" Value="[ExtPfx].Fodp" Component_="c_reg_fa_cap__fodp"/>
+    <ROW Registry="reg_fa_cap__fods" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".fods" Value="[ExtPfx].Fods" Component_="c_reg_fa_cap__fods"/>
+    <ROW Registry="reg_fa_cap__fodt" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".fodt" Value="[ExtPfx].Fodt" Component_="c_reg_fa_cap__fodt"/>
+    <ROW Registry="reg_fa_cap__html" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".html" Value="[ExtPfx].Html" Component_="c_reg_fa_cap__html"/>
+    <ROW Registry="reg_fa_cap__key" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".key" Value="[ExtPfx].Key" Component_="c_reg_fa_cap__key"/>
+    <ROW Registry="reg_fa_cap__numbers" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".numbers" Value="[ExtPfx].Numbers" Component_="c_reg_fa_cap__numbers"/>
+    <ROW Registry="reg_fa_cap__odp" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".odp" Value="[ExtPfx].Show.2" Component_="c_reg_fa_cap__odp"/>
+    <ROW Registry="reg_fa_cap__ods" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".ods" Value="[ExtPfx].Sheet.2" Component_="c_reg_fa_cap__ods"/>
+    <ROW Registry="reg_fa_cap__odt" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".odt" Value="[ExtPfx].Document.2" Component_="c_reg_fa_cap__odt"/>
+    <ROW Registry="reg_fa_cap__otp" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".otp" Value="[ExtPfx].Otp" Component_="c_reg_fa_cap__otp"/>
+    <ROW Registry="reg_fa_cap__ots" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".ots" Value="[ExtPfx].Ots" Component_="c_reg_fa_cap__ots"/>
+    <ROW Registry="reg_fa_cap__ott" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".ott" Value="[ExtPfx].Ott" Component_="c_reg_fa_cap__ott"/>
+    <ROW Registry="reg_fa_cap__oxps" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".oxps" Value="[ExtPfx].Oxps" Component_="c_reg_fa_cap__oxps"/>
+    <ROW Registry="reg_fa_cap__pages" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".pages" Value="[ExtPfx].Pages" Component_="c_reg_fa_cap__pages"/>
+    <ROW Registry="reg_fa_cap__pdf" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".pdf" Value="[ExtPfx].Pdf" Component_="c_reg_fa_cap__pdf"/>
+    <ROW Registry="reg_fa_cap__pot" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".pot" Value="[ExtPfx].Pot" Component_="c_reg_fa_cap__pot"/>
+    <ROW Registry="reg_fa_cap__potm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".potm" Value="[ExtPfx].Potm" Component_="c_reg_fa_cap__potm"/>
+    <ROW Registry="reg_fa_cap__potx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".potx" Value="[ExtPfx].Potx" Component_="c_reg_fa_cap__potx"/>
+    <ROW Registry="reg_fa_cap__pps" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".pps" Value="[ExtPfx].SlideShow.1" Component_="c_reg_fa_cap__pps"/>
+    <ROW Registry="reg_fa_cap__ppsm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".ppsm" Value="[ExtPfx].Ppsm" Component_="c_reg_fa_cap__ppsm"/>
+    <ROW Registry="reg_fa_cap__ppsx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".ppsx" Value="[ExtPfx].SlideShow.12" Component_="c_reg_fa_cap__ppsx"/>
+    <ROW Registry="reg_fa_cap__ppt" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".ppt" Value="[ExtPfx].Show.1" Component_="c_reg_fa_cap__ppt"/>
+    <ROW Registry="reg_fa_cap__pptm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".pptm" Value="[ExtPfx].Pptm" Component_="c_reg_fa_cap__pptm"/>
+    <ROW Registry="reg_fa_cap__pptx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".pptx" Value="[ExtPfx].Show.12" Component_="c_reg_fa_cap__pptx"/>
+    <ROW Registry="reg_fa_cap__rtf" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".rtf" Value="[ExtPfx].Rtf" Component_="c_reg_fa_cap__rtf"/>
+    <ROW Registry="reg_fa_cap__txt" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".txt" Value="[ExtPfx].Txt" Component_="c_reg_fa_cap__txt"/>
+    <ROW Registry="reg_fa_cap__vsdm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".vsdm" Value="[ExtPfx].Vsdm" Component_="c_reg_fa_cap__vsdm"/>
+    <ROW Registry="reg_fa_cap__vsdx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".vsdx" Value="[ExtPfx].Vsdx" Component_="c_reg_fa_cap__vsdx"/>
+    <ROW Registry="reg_fa_cap__vssm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".vssm" Value="[ExtPfx].Vssm" Component_="c_reg_fa_cap__vssm"/>
+    <ROW Registry="reg_fa_cap__vssx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".vssx" Value="[ExtPfx].Vssx" Component_="c_reg_fa_cap__vssx"/>
+    <ROW Registry="reg_fa_cap__vstm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".vstm" Value="[ExtPfx].Vstm" Component_="c_reg_fa_cap__vstm"/>
+    <ROW Registry="reg_fa_cap__vstx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".vstx" Value="[ExtPfx].Vstx" Component_="c_reg_fa_cap__vstx"/>
+    <ROW Registry="reg_fa_cap__xls" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xls" Value="[ExtPfx].Sheet.1" Component_="c_reg_fa_cap__xls"/>
+    <ROW Registry="reg_fa_cap__xlsb" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xlsb" Value="[ExtPfx].Xlsb" Component_="c_reg_fa_cap__xlsb"/>
+    <ROW Registry="reg_fa_cap__xlsm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xlsm" Value="[ExtPfx].Xlsm" Component_="c_reg_fa_cap__xlsm"/>
+    <ROW Registry="reg_fa_cap__xlsx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xlsx" Value="[ExtPfx].Sheet.12" Component_="c_reg_fa_cap__xlsx"/>
+    <ROW Registry="reg_fa_cap__xlt" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xlt" Value="[ExtPfx].Xlt" Component_="c_reg_fa_cap__xlt"/>
+    <ROW Registry="reg_fa_cap__xltm" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xltm" Value="[ExtPfx].Xltm" Component_="c_reg_fa_cap__xltm"/>
+    <ROW Registry="reg_fa_cap__xltx" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xltx" Value="[ExtPfx].Xltx" Component_="c_reg_fa_cap__xltx"/>
+    <ROW Registry="reg_fa_cap__xml" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xml" Value="[ExtPfx].Xml" Component_="c_reg_fa_cap__xml"/>
+    <ROW Registry="reg_fa_cap__xps" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name=".xps" Value="[ExtPfx].Xps" Component_="c_reg_fa_cap__xps"/>
     <ROW Registry="reg_fa_ext__csv" Root="0" Key=".csv" Value="[ExtPfx].Csv" Component_="c_reg_fa_ext__csv"/>
     <ROW Registry="reg_fa_ext__djvu" Root="0" Key=".djvu" Value="[ExtPfx].DjVu" Component_="c_reg_fa_ext__djvu"/>
     <ROW Registry="reg_fa_ext__doc" Root="0" Key=".doc" Value="[ExtPfx].Document.1" Component_="c_reg_fa_ext__doc"/>
@@ -2341,7 +2339,7 @@
     <ROW Registry="reg_fa_type_progid_shellnew_menutext__pdf" Root="0" Key=".pdf\[ExtPfx].Pdf\ShellNew" Name="MenuText" Value="#%@[#DesktopEditors.exe],-1003" Component_="c_reg_fa_new__pdf" VirtualValue="#%"/>
     <ROW Registry="reg_fa_type_progid_shellnew_menutext__pptx" Root="0" Key=".pptx\[ExtPfx].Show.12\ShellNew" Name="MenuText" Value="#%@[#DesktopEditors.exe],-1002" Component_="c_reg_fa_new__pptx" VirtualValue="#%"/>
     <ROW Registry="reg_fa_type_progid_shellnew_menutext__xlsx" Root="0" Key=".xlsx\[ExtPfx].Sheet.12\ShellNew" Name="MenuText" Value="#%@[#DesktopEditors.exe],-1001" Component_="c_reg_fa_new__xlsx" VirtualValue="#%"/>
-    <ROW Registry="reg_progid" Root="0" Key="[ProgID]" Value="[DesktopEditorsName]" Component_="c_reg_progid"/>
+    <ROW Registry="reg_progid" Root="0" Key="[ProgID]" Value="[RegisteredAppName]" Component_="c_reg_progid"/>
     <ROW Registry="reg_progid_icon" Root="0" Key="[ProgID]\DefaultIcon" Value="[#DesktopEditors.exe],0" Component_="c_reg_progid"/>
     <ROW Registry="reg_progid_icon_k" Root="0" Key="[ProgID]\DefaultIcon" Name="\"/>
     <ROW Registry="reg_progid_k" Root="0" Key="[ProgID]" Name="\"/>
@@ -2349,7 +2347,7 @@
     <ROW Registry="reg_progid_shell_open" Root="0" Key="[ProgID]\shell\open" Name="\"/>
     <ROW Registry="reg_progid_shell_open_command" Root="0" Key="[ProgID]\shell\open\command" Value="&quot;[#DesktopEditors.exe]&quot; &quot;%1&quot;" Component_="c_reg_progid"/>
     <ROW Registry="reg_progid_shell_open_command_k" Root="0" Key="[ProgID]\shell\open\command" Name="\"/>
-    <ROW Registry="reg_progid_shell_open_friendlyappname" Root="0" Key="[ProgID]\shell\open" Name="FriendlyAppName" Value="[DesktopEditorsName]" Component_="c_reg_progid"/>
+    <ROW Registry="reg_progid_shell_open_friendlyappname" Root="0" Key="[ProgID]\shell\open" Name="FriendlyAppName" Value="[RegisteredAppName]" Component_="c_reg_progid"/>
     <ROW Registry="reg_protocol" Root="0" Key="[Protocol]" Value="URL:[Protocol]" Component_="c_reg_protocol"/>
     <ROW Registry="reg_protocol_icon" Root="0" Key="[Protocol]\DefaultIcon" Value="[#DesktopEditors.exe],0" Component_="c_reg_protocol"/>
     <ROW Registry="reg_protocol_icon_k" Root="0" Key="[Protocol]\DefaultIcon" Name="\"/>
@@ -2360,26 +2358,26 @@
     <ROW Registry="reg_protocol_shell_open_k" Root="0" Key="[Protocol]\shell\open" Name="\"/>
     <ROW Registry="reg_protocol_url_protocol" Root="0" Key="[Protocol]" Name="URL Protocol" Component_="c_reg_protocol"/>
     <ROW Registry="reg_sw" Root="-1" Key="Software" Name="\"/>
-    <ROW Registry="reg_sw_app" Root="-1" Key="Software\[VendorShortName]\[AppShortName]" Name="*"/>
-    <ROW Registry="reg_sw_app_apppath" Root="-1" Key="Software\[VendorShortName]\[AppShortName]" Name="AppPath" Value="[APPDIR]" Component_="c_reg_sw_app"/>
-    <ROW Registry="reg_sw_app_cap" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities" Name="\"/>
-    <ROW Registry="reg_sw_app_cap_applicationdescription" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities" Name="ApplicationDescription" Value="[ARPCOMMENTS]" Component_="c_reg_sw_app"/>
-    <ROW Registry="reg_sw_app_cap_applicationicon" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities" Name="ApplicationIcon" Value="[#DesktopEditors.exe],0" Component_="c_reg_sw_app"/>
-    <ROW Registry="reg_sw_app_cap_applicationname" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities" Name="ApplicationName" Value="[PackageName]" Component_="c_reg_sw_app"/>
-    <ROW Registry="reg_sw_app_cap_fileassociations" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\FileAssociations" Name="\"/>
-    <ROW Registry="reg_sw_app_cap_urlassociations" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\URLAssociations" Name="\"/>
-    <ROW Registry="reg_sw_app_checkforupdates" Root="-1" Key="Software\[VendorShortName]\[AppShortName]" Name="CheckForUpdates" Value="#[UPDATE_SERVICE]" Component_="c_reg_sw_app" ValueLocId="-" VirtualValue="#"/>
-    <ROW Registry="reg_sw_app_locale" Root="-1" Key="Software\[VendorShortName]\[AppShortName]" Name="locale" Value="[LOCALE]" Component_="c_reg_sw_app"/>
-    <ROW Registry="reg_sw_app_version" Root="-1" Key="Software\[VendorShortName]\[AppShortName]" Name="Version" Value="[ProductVersion]" Component_="c_reg_sw_app"/>
-    <ROW Registry="reg_sw_company" Root="-1" Key="Software\[VendorShortName]" Name="+" Component_="c_reg_sw_app"/>
-    <ROW Registry="reg_sw_registeredapps" Root="-1" Key="Software\RegisteredApplications" Name="[DesktopEditorsName]" Value="Software\[VendorShortName]\[AppShortName]\Capabilities" Component_="c_reg_sw_registeredapps"/>
-    <ROW Registry="reg_ua_cap__protocol" Root="-1" Key="Software\[VendorShortName]\[AppShortName]\Capabilities\URLAssociations" Name="[Protocol]" Value="[ProgID]" Component_="c_reg_ua_cap__protocol"/>
+    <ROW Registry="reg_sw_app" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="*"/>
+    <ROW Registry="reg_sw_app_apppath" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="AppPath" Value="[APPDIR]" Component_="c_reg_sw_app"/>
+    <ROW Registry="reg_sw_app_cap" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities" Name="\"/>
+    <ROW Registry="reg_sw_app_cap_applicationdescription" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities" Name="ApplicationDescription" Value="[ARPCOMMENTS]" Component_="c_reg_sw_app"/>
+    <ROW Registry="reg_sw_app_cap_applicationicon" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities" Name="ApplicationIcon" Value="[#DesktopEditors.exe],0" Component_="c_reg_sw_app"/>
+    <ROW Registry="reg_sw_app_cap_applicationname" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities" Name="ApplicationName" Value="[AppName]" Component_="c_reg_sw_app"/>
+    <ROW Registry="reg_sw_app_cap_fileassociations" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\FileAssociations" Name="\"/>
+    <ROW Registry="reg_sw_app_cap_urlassociations" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\URLAssociations" Name="\"/>
+    <ROW Registry="reg_sw_app_checkforupdates" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="CheckForUpdates" Value="#[UPDATE_SERVICE]" Component_="c_reg_sw_app" ValueLocId="-" VirtualValue="#"/>
+    <ROW Registry="reg_sw_app_locale" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="locale" Value="[LOCALE]" Component_="c_reg_sw_app"/>
+    <ROW Registry="reg_sw_app_version" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]" Name="Version" Value="[ProductVersion]" Component_="c_reg_sw_app"/>
+    <ROW Registry="reg_sw_company" Root="-1" Key="Software\[CompanyPath]" Name="+" Component_="c_reg_sw_app"/>
+    <ROW Registry="reg_sw_registeredapps" Root="-1" Key="Software\RegisteredApplications" Name="[RegisteredAppName]" Value="Software\[CompanyPath]\[DesktopPath]\Capabilities" Component_="c_reg_sw_registeredapps"/>
+    <ROW Registry="reg_ua_cap__protocol" Root="-1" Key="Software\[CompanyPath]\[DesktopPath]\Capabilities\URLAssociations" Name="[Protocol]" Value="[ProgID]" Component_="c_reg_ua_cap__protocol"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiServCtrlComponent">
-    <ROW ServiceControl="updatesvc.exe" Name="[ServiceShortName]" Event="161" Wait="0" Component_="c_exe_updatesvc"/>
+    <ROW ServiceControl="updatesvc.exe" Name="[ServiceName]" Event="161" Wait="0" Component_="c_exe_updatesvc"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiServInstComponent">
-    <ROW ServiceInstall="updatesvc.exe" Name="[ServiceShortName]" DisplayName="[ServiceName]" ServiceType="16" StartType="2" ErrorControl="1" Component_="c_exe_updatesvc" Description="[ServiceDescription]"/>
+    <ROW ServiceInstall="updatesvc.exe" Name="[ServiceName]" DisplayName="[ServiceName]" ServiceType="16" StartType="2" ErrorControl="1" Component_="c_exe_updatesvc" Description="[ServiceDescription]"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
     <ROW Shortcut="sc_desktop_exe_desktopeditors" Directory_="DesktopFolder" Name="ONLYOF~1|[|ShortcutName]" Component_="c_exe_desktopeditors" Target="[#DesktopEditors.exe]" Hotkey="0" Icon_="i_desktopeditors" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>