diff --git a/.github/validate-rapps.py b/.github/validate-rapps.py
index d0944c1b..ca9a6c41 100644
--- a/.github/validate-rapps.py
+++ b/.github/validate-rapps.py
@@ -52,6 +52,9 @@
         b'DelReg',
         b'DelRegEmpty',
     ],
+    b'ExeInZip': [
+        b'Exe',
+    ],
 }
 
 ALL_ARCH = [
diff --git a/dvdwritenow.txt b/dvdwritenow.txt
index 078ad02a..c63bf61f 100644
--- a/dvdwritenow.txt
+++ b/dvdwritenow.txt
@@ -8,6 +8,10 @@ URLSite = http://dwn.alter.org.ua/
 URLDownload = https://web.archive.org/web/20150606193303if_/http://dwn.alter.org.ua/downloads/dwn_1_5_12_sp2.zip
 SHA1 = 52ff824dc8363e4e6323f3417dbd337cb21d7f98
 SizeBytes = 1354393
+Installer = ExeInZip
+
+[ExeInZip]
+Exe = setup.exe
 
 [Section.0a]
 License = Gratuito
diff --git a/efsearch.txt b/efsearch.txt
index 40f584ea..967f6046 100644
--- a/efsearch.txt
+++ b/efsearch.txt
@@ -8,6 +8,7 @@ URLSite = http://www.sowsoft.com
 URLDownload = http://www.sowsoft.com/download/efsearch.zip
 SHA1 = f008759a3ed0dd96ca51438b857b41c4bd6a4e11
 SizeBytes = 967106
+Installer = ExeInZip
 
 [Section.0a]
 Description = Buscador de archivos compatible con ReactOS.
diff --git a/fotografix.txt b/fotografix.txt
index 4d89eb8d..9236e58d 100644
--- a/fotografix.txt
+++ b/fotografix.txt
@@ -5,8 +5,8 @@ License = EULA
 Description = Fotografix is a lightweight, portable image editor that lets you work with layers.
 Category = 3
 URLSite = https://lmadhavan.com/fotografix/
-URLDownload = https://download.informer.com/win-1192890760-93a4fa67-6c42a183-bc315a08f3a5836c33-b403a27a21d559a6b-3523549472-1192923221/fotografix15.zip
-SHA1 = 438ee0a517507396cdab6d814638d7313d0b99e0
+URLDownload = https://github.com/lmadhavan/fotografix/releases/download/v1.5/fotografix15.zip
+SHA1 = e6deec4335c9b4123e36e1733ae60f39b64e0d8f
 SizeBytes = 364219
 Icon = fotografix.ico
 Installer = Generate
diff --git a/hxd.txt b/hxd.txt
index 6208a5fe..8c417e94 100644
--- a/hxd.txt
+++ b/hxd.txt
@@ -8,6 +8,7 @@ URLSite = https://mh-nexus.de/en/
 URLDownload = https://mh-nexus.de/downloads/HxDSetup.zip
 SHA1 = d0d69744f1d01353507bc090ff79fb45db6882c0
 SizeBytes = 3348036
+Installer = ExeInZip
 
 [Section.0a]
 License = Gratuito
diff --git a/royalenoirtheme.txt b/royalenoirtheme.txt
index 0a9dd2a5..79073e87 100644
--- a/royalenoirtheme.txt
+++ b/royalenoirtheme.txt
@@ -8,6 +8,7 @@ URLSite = https://istartedsomething.com/20061029/royale-noir/
 URLDownload = https://web.archive.org/web/20250404212305im_/https://fs12n3.sendspace.com/dl/ad1b2bb86900f5dea662d4064bd6c56d/67f04d93416101f6/ouby5o/royale_noir.zip
 SHA1 = b3b97d7a145808dc17b4699ca9a6f96ca9d2beca
 SizeBytes = 385099
+Scope = Machine
 Installer = Generate
 
 [Generate]
diff --git a/royaletheme.txt b/royaletheme.txt
index 82a0f67f..62f1c43d 100644
--- a/royaletheme.txt
+++ b/royaletheme.txt
@@ -9,3 +9,8 @@ URLSite = https://web.archive.org/web/20051028063258if_/http://www.microsoft.com
 URLDownload = https://web.archive.org/web/20051128025233im_/http://download.microsoft.com/download/a/c/4/ac407ba2-30d2-447b-8c93-83967a92dd9f/royale.zip
 SHA1 = 08d5face1bbe9cde6944b8b5ae453fe2a117faec
 SizeBytes = 688390
+Scope = Machine
+Installer = ExeInZip
+
+[ExeInZip]
+Exe = Royale Theme for Win XP (2)\Royale Theme for Win XP.exe
diff --git a/tweakui.txt b/tweakui.txt
index 8f737bf7..93966ef0 100644
--- a/tweakui.txt
+++ b/tweakui.txt
@@ -10,6 +10,7 @@ URLSite = https://web.archive.org/web/200602if_/http://www.microsoft.com/windows
 URLDownload = https://web.archive.org/web/20060317201822im_/http://download.microsoft.com/download/f/c/a/fca6767b-9ed9-45a6-b352-839afb2a2679/TweakUiPowertoySetup.exe
 SHA1 = d8b623f6ebfea42b3286e4c0c3ba637ffabcb704
 SizeBytes = 150192
+Scope = Machine
 
 [Section.amd64]
 URLDownload = https://web.archive.org/web/20240511215442im_/https://cfcdn.neosmart.net/software/TweakUI/TweakUI_64Bit.msi?response-content-disposition=attachment%3B%20filename%3D%22TweakUI_64Bit.msi%22&response-cache-control=max-age%3D1209600&Policy=eyJTdGF0ZW1lbnQiOlt7IlJlc291cmNlIjoiaHR0cHM6Ly9jZmNkbi5uZW9zbWFydC5uZXQvc29mdHdhcmUvVHdlYWtVSS9Ud2Vha1VJXzY0Qml0Lm1zaT9yZXNwb25zZS1jb250ZW50LWRpc3Bvc2l0aW9uPWF0dGFjaG1lbnQlM0IlMjBmaWxlbmFtZSUzRCUyMlR3ZWFrVUlfNjRCaXQubXNpJTIyXHUwMDI2cmVzcG9uc2UtY2FjaGUtY29udHJvbD1tYXgtYWdlJTNEMTIwOTYwMCIsIkNvbmRpdGlvbiI6eyJEYXRlTGVzc1RoYW4iOnsiQVdTOkVwb2NoVGltZSI6MTcxNTQ2ODA1NX19fV19&Signature=jB8YXnD2agGZvRCUczb9lvriVi3YFtGNJYzODOt8ymiNH4Rt8hTaEPb4VSu90gWIg8Pg9SxofOWdJA287P5G0O4raiDmm2nED29QY1OcABJZO4raPdE-U6XbprjtaC5T9wJ-91diEojULxOOimOBiZObpcMwgtOukJ043e-M-3r8qTGUk~YWyYS5qOiddiaFjipZRvzP2pYx05KcUjargCgc6~ut9oo7oTdRek0XPXlgkJBVcq4-toljJ05zFkqAFUL3q6BsBLmFtO1MlOM6XBN4U7klHst9nWKxEV~fyLc6uakwPbcIQsurC-VdALOeg1arjZ3PFN0fxtO9TX707g__&Key-Pair-Id=APKAIPY5GEV5EHVOFFNQ
diff --git a/tweakui1.txt b/tweakui1.txt
index cad21711..26f7f1f8 100644
--- a/tweakui1.txt
+++ b/tweakui1.txt
@@ -10,6 +10,7 @@ URLSite = https://web.archive.org/web/20040405071854if_/http://www.microsoft.com
 URLDownload = https://archive.org/download/ms_tweakui/TweakUI.zip
 SHA1 = aa0b0c24c3ebd486bfc5d2751815c6fc01b35ea2
 SizeBytes = 83283
+Scope = Machine
 Installer = Generate
 
 [Generate]
diff --git a/watercolor.txt b/watercolor.txt
index 30bf7f03..1e8e80dd 100644
--- a/watercolor.txt
+++ b/watercolor.txt
@@ -8,6 +8,7 @@ URLSite = http://www.neowin.net/forum/topic/32604-watercolor-v43/
 URLDownload = https://uploads.s.zeid.me/Watercolor/Watercolor43.exe
 SHA1 = 069be12175d80a0f3c76daa5b90eeca8f547dd28
 SizeBytes = 881783
+Scope = Machine
 
 [Section.0a]
 Description = Un tema de Windows basado en el look del Windows Codename Whistler.
diff --git a/watercolorlite.txt b/watercolorlite.txt
index 5d23ebbb..2c1c763c 100644
--- a/watercolorlite.txt
+++ b/watercolorlite.txt
@@ -8,6 +8,7 @@ URLSite = https://uploads.s.zeid.me/Watercolor/README.html
 URLDownload = https://uploads.s.zeid.me/Watercolor/WatercolorLitev211.exe
 SHA1 = f8fa5c37077249724b7164a27efa47d526f7c2d5
 SizeBytes = 601627
+Scope = Machine
 
 [Section.0a]
 Description = Un tema de Windows basado en el look del Windows Codename Whistler. Pequeña variación sobre el Tema Watercolor 4.3.
diff --git a/zunetheme.txt b/zunetheme.txt
index 644d6fe0..c4e4c21a 100644
--- a/zunetheme.txt
+++ b/zunetheme.txt
@@ -9,3 +9,4 @@ URLSite = https://web.archive.org/web/20061128062226if_/http://www.zune.net:80/e
 URLDownload = https://web.archive.org/web/20130224083838im_/http://download.microsoft.com/download/e/a/9/ea9af5ae-b48e-473e-85fe-dcde7472e644/ZuneDesktopTheme.msi
 SHA1 = 67fa6461855488ab4fd3907d91b229e5124d0843
 SizeBytes = 1722880
+Scope = Machine