From 47a870ac4602c242449d10009b1a6a6662927517 Mon Sep 17 00:00:00 2001
From: Daniel Reimer <reimer.daniel@freenet.de>
Date: Sun, 6 Jan 2008 14:04:44 +0000
Subject: [PATCH] More Manifests and now all relevant Apps are Skinned. (Tell
 me if I missed one) DLLs will come later this day.

svn path=/trunk/; revision=31624
---
 reactos/base/applications/calc/manifest.xml   | 23 +++++++++++++++++++
 reactos/base/applications/calc/rsrc.rc        |  2 ++
 .../base/applications/charmap/manifest.xml    |  2 +-
 reactos/base/applications/control/control.rc  | 15 +++---------
 .../base/applications/control/manifest.xml    | 23 +++++++++++++++++++
 .../applications/games/solitaire/manifest.xml | 23 +++++++++++++++++++
 .../base/applications/games/solitaire/rsrc.rc |  2 ++
 .../applications/games/winemine/manifest.xml  |  2 +-
 reactos/base/applications/mmc/manifest.xml    |  2 +-
 .../base/applications/msconfig/manifest.xml   | 23 +++++++++++++++++++
 .../base/applications/msconfig/msconfig.rc    |  3 +++
 .../mscutils/devmgmt/manifest.xml             |  2 +-
 .../mscutils/eventvwr/manifest.xml            |  2 +-
 .../mscutils/servman/manifest.xml             |  2 +-
 reactos/base/applications/mstsc/manifest.xml  |  4 ++--
 .../base/applications/notepad/manifest.xml    | 23 +++++++++++++++++++
 reactos/base/applications/notepad/rsrc.rc     |  2 ++
 .../applications/regedit/clb/manifest.xml     | 23 +++++++++++++++++++
 .../base/applications/regedit/manifest.xml    | 23 +++++++++++++++++++
 reactos/base/applications/regedit/regedit.rc  |  3 +++
 .../base/applications/sndvol32/manifest.xml   |  2 +-
 .../base/applications/taskmgr/manifest.xml    | 23 +++++++++++++++++++
 reactos/base/applications/taskmgr/taskmgr.rc  |  2 ++
 .../base/applications/winhelp/manifest.xml    | 23 +++++++++++++++++++
 reactos/base/applications/winhelp/rsrc.rc     |  2 ++
 reactos/base/setup/reactos/manifest.xml       | 23 +++++++++++++++++++
 reactos/base/setup/reactos/reactos.rc         |  3 +++
 reactos/base/setup/welcome/manifest.xml       | 23 +++++++++++++++++++
 reactos/base/setup/welcome/welcome.rc         |  3 +++
 reactos/base/shell/explorer-new/manifest.xml  |  4 ++--
 reactos/base/system/winlogon/manifest.xml     | 23 +++++++++++++++++++
 reactos/base/system/winlogon/winlogon.rc      |  3 +++
 reactos/dll/cpl/access/manifest.xml           |  4 ++--
 reactos/dll/cpl/appwiz/manifest.xml           |  4 ++--
 reactos/dll/cpl/desk/manifest.xml             |  4 ++--
 reactos/dll/cpl/hdwwiz/manifest.xml           |  4 ++--
 reactos/dll/cpl/input/manifest.xml            |  4 ++--
 reactos/dll/cpl/intl/manifest.xml             |  4 ++--
 reactos/dll/cpl/joy/manifest.xml              |  4 ++--
 reactos/dll/cpl/liccpa/manifest.xml           |  4 ++--
 reactos/dll/cpl/main/manifest.xml             |  4 ++--
 reactos/dll/cpl/mmsys/manifest.xml            |  4 ++--
 reactos/dll/cpl/ncpa/manifest.xml             |  4 ++--
 reactos/dll/cpl/powercfg/manifest.xml         |  4 ++--
 reactos/dll/cpl/telephon/manifest.xml         |  4 ++--
 reactos/dll/cpl/timedate/manifest.xml         |  4 ++--
 reactos/dll/cpl/usrmgr/manifest.xml           |  4 ++--
 reactos/dll/win32/rasdlg/manifest.xml         |  2 +-
 48 files changed, 346 insertions(+), 54 deletions(-)
 create mode 100644 reactos/base/applications/calc/manifest.xml
 create mode 100644 reactos/base/applications/control/manifest.xml
 create mode 100644 reactos/base/applications/games/solitaire/manifest.xml
 create mode 100644 reactos/base/applications/msconfig/manifest.xml
 create mode 100644 reactos/base/applications/notepad/manifest.xml
 create mode 100644 reactos/base/applications/regedit/clb/manifest.xml
 create mode 100644 reactos/base/applications/regedit/manifest.xml
 create mode 100644 reactos/base/applications/taskmgr/manifest.xml
 create mode 100644 reactos/base/applications/winhelp/manifest.xml
 create mode 100644 reactos/base/setup/reactos/manifest.xml
 create mode 100644 reactos/base/setup/welcome/manifest.xml
 create mode 100644 reactos/base/system/winlogon/manifest.xml

diff --git a/reactos/base/applications/calc/manifest.xml b/reactos/base/applications/calc/manifest.xml
new file mode 100644
index 00000000000..73b5c9a0ff9
--- /dev/null
+++ b/reactos/base/applications/calc/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Calculator"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Calculator</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/calc/rsrc.rc b/reactos/base/applications/calc/rsrc.rc
index c4f0ca84b14..eb57d785e1c 100644
--- a/reactos/base/applications/calc/rsrc.rc
+++ b/reactos/base/applications/calc/rsrc.rc
@@ -23,6 +23,8 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+1 24 DISCARDABLE "manifest.xml"
+
 IDI_CALCICON ICON "calculator.ico"
 
 #include "lang/bg-BG.rc"
diff --git a/reactos/base/applications/charmap/manifest.xml b/reactos/base/applications/charmap/manifest.xml
index ff397fc542c..414ff6855f5 100644
--- a/reactos/base/applications/charmap/manifest.xml
+++ b/reactos/base/applications/charmap/manifest.xml
@@ -3,7 +3,7 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="Win32 Application.default.App"
+    name="ReactOS.Application.Character.Map"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>
diff --git a/reactos/base/applications/control/control.rc b/reactos/base/applications/control/control.rc
index 84039e7e76b..0798c673bcc 100644
--- a/reactos/base/applications/control/control.rc
+++ b/reactos/base/applications/control/control.rc
@@ -1,5 +1,3 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
 #include <reactos/resource.h>
 #include <windows.h>
@@ -7,22 +5,15 @@
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS System Control Panel\0"
 #define REACTOS_STR_INTERNAL_NAME	"control\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"control.exe\0"
+
+1 24 DISCARDABLE "manifest.xml"
+
 #ifndef MS_COMPILER
 #include <reactos/version.rc>
 #else
 #include <../../../include/reactos/version.rc>
 #endif
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
 IDI_MAINICON            ICON    DISCARDABLE     "resources/config.ico"
-/////////////////////////////////////////////////////////////////////////////
-
 
 #include "rsrc.rc"
diff --git a/reactos/base/applications/control/manifest.xml b/reactos/base/applications/control/manifest.xml
new file mode 100644
index 00000000000..47d14cfb8cf
--- /dev/null
+++ b/reactos/base/applications/control/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Control.Panel"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Control Panel</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/games/solitaire/manifest.xml b/reactos/base/applications/games/solitaire/manifest.xml
new file mode 100644
index 00000000000..87a06da3806
--- /dev/null
+++ b/reactos/base/applications/games/solitaire/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Solitaire"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Solitaire</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/games/solitaire/rsrc.rc b/reactos/base/applications/games/solitaire/rsrc.rc
index c13d2d248aa..7d147f73f78 100644
--- a/reactos/base/applications/games/solitaire/rsrc.rc
+++ b/reactos/base/applications/games/solitaire/rsrc.rc
@@ -3,6 +3,8 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+1 24 DISCARDABLE "manifest.xml"
+
 IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 
 #include "lang/bg-BG.rc"
diff --git a/reactos/base/applications/games/winemine/manifest.xml b/reactos/base/applications/games/winemine/manifest.xml
index c24546fd343..d1321f4ed5c 100644
--- a/reactos/base/applications/games/winemine/manifest.xml
+++ b/reactos/base/applications/games/winemine/manifest.xml
@@ -3,7 +3,7 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="ReactOS.WineMine"
+    name="ReactOS.Application.WineMine"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>
diff --git a/reactos/base/applications/mmc/manifest.xml b/reactos/base/applications/mmc/manifest.xml
index d19e587942d..57757f598de 100644
--- a/reactos/base/applications/mmc/manifest.xml
+++ b/reactos/base/applications/mmc/manifest.xml
@@ -3,7 +3,7 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.Management.Console"
+  name="ReactOS.Application.System.Management.Console"
   type="win32"
  />
  <description>ReactOS System Management Console</description>
diff --git a/reactos/base/applications/msconfig/manifest.xml b/reactos/base/applications/msconfig/manifest.xml
new file mode 100644
index 00000000000..44d89893fd2
--- /dev/null
+++ b/reactos/base/applications/msconfig/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Configurator"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Configuration Tool</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/msconfig/msconfig.rc b/reactos/base/applications/msconfig/msconfig.rc
index c1485cc7b42..bbd72c8d657 100644
--- a/reactos/base/applications/msconfig/msconfig.rc
+++ b/reactos/base/applications/msconfig/msconfig.rc
@@ -10,6 +10,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS System Configuration Tool\0"
 #define REACTOS_STR_INTERNAL_NAME	"msconfig\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"msconfig.exe\0"
+
+1 24 DISCARDABLE "manifest.xml"
+
 #include <reactos/version.rc>
 
 IDI_APPICON   ICON "res/msconfig.ico"
diff --git a/reactos/base/applications/mscutils/devmgmt/manifest.xml b/reactos/base/applications/mscutils/devmgmt/manifest.xml
index c0a2723eca5..0c9eefe49a1 100644
--- a/reactos/base/applications/mscutils/devmgmt/manifest.xml
+++ b/reactos/base/applications/mscutils/devmgmt/manifest.xml
@@ -3,7 +3,7 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="Win32 Application.default.App"
+    name="ReactOS.Application.Device.Manager"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>
diff --git a/reactos/base/applications/mscutils/eventvwr/manifest.xml b/reactos/base/applications/mscutils/eventvwr/manifest.xml
index bcee73278ee..72003e74c64 100644
--- a/reactos/base/applications/mscutils/eventvwr/manifest.xml
+++ b/reactos/base/applications/mscutils/eventvwr/manifest.xml
@@ -3,7 +3,7 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="Win32 Application.default.App"
+    name="ReactOS.Application.EventLog.Viewer"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>
diff --git a/reactos/base/applications/mscutils/servman/manifest.xml b/reactos/base/applications/mscutils/servman/manifest.xml
index 4df22534fca..3e89a107bbf 100644
--- a/reactos/base/applications/mscutils/servman/manifest.xml
+++ b/reactos/base/applications/mscutils/servman/manifest.xml
@@ -3,7 +3,7 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="Win32 Application.default.App"
+    name="ReactOS.Application.Service.Manager"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>
diff --git a/reactos/base/applications/mstsc/manifest.xml b/reactos/base/applications/mstsc/manifest.xml
index 86e87690826..ae5a3a37e9b 100644
--- a/reactos/base/applications/mstsc/manifest.xml
+++ b/reactos/base/applications/mstsc/manifest.xml
@@ -3,11 +3,11 @@
   xmlns="urn:schemas-microsoft-com:asm.v1"
   manifestVersion="1.0">
 <assemblyIdentity
-    name="Win32 Application.default.App"
+    name="ReactOS.Application.Remote.Desktop.Client"
     processorArchitecture="x86"
     version="1.0.0.0"
     type="win32"/>
-<description>ReactOS Service Manager</description>
+<description>ReactOS Remote Desktop Client</description>
 <dependency>
     <dependentAssembly>
         <assemblyIdentity
diff --git a/reactos/base/applications/notepad/manifest.xml b/reactos/base/applications/notepad/manifest.xml
new file mode 100644
index 00000000000..fd4fea8cb5f
--- /dev/null
+++ b/reactos/base/applications/notepad/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.NotePad"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS NotePad</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/notepad/rsrc.rc b/reactos/base/applications/notepad/rsrc.rc
index 39a0387428c..cd48a8593d9 100644
--- a/reactos/base/applications/notepad/rsrc.rc
+++ b/reactos/base/applications/notepad/rsrc.rc
@@ -25,6 +25,8 @@
 #include "commctrl.h"
 #include "notepad_res.h"
 
+1 24 DISCARDABLE "manifest.xml"
+
 IDI_NPICON ICON "res/notepad.ico"
 
 #include "lang/bg-BG.rc"
diff --git a/reactos/base/applications/regedit/clb/manifest.xml b/reactos/base/applications/regedit/clb/manifest.xml
new file mode 100644
index 00000000000..87a06da3806
--- /dev/null
+++ b/reactos/base/applications/regedit/clb/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Solitaire"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Solitaire</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/regedit/manifest.xml b/reactos/base/applications/regedit/manifest.xml
new file mode 100644
index 00000000000..1f962c72bf3
--- /dev/null
+++ b/reactos/base/applications/regedit/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.RegEdit"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Registry Editor</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/regedit/regedit.rc b/reactos/base/applications/regedit/regedit.rc
index 64165dcf434..b1b015088a6 100644
--- a/reactos/base/applications/regedit/regedit.rc
+++ b/reactos/base/applications/regedit/regedit.rc
@@ -25,6 +25,9 @@
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Registry Explorer\0"
 #define REACTOS_STR_INTERNAL_NAME	"regedit\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"regedit.exe\0"
+
+1 24 DISCARDABLE "manifest.xml"
+
 #include <reactos/version.rc>
 
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
diff --git a/reactos/base/applications/sndvol32/manifest.xml b/reactos/base/applications/sndvol32/manifest.xml
index e4d0c400710..7b12f188c2d 100644
--- a/reactos/base/applications/sndvol32/manifest.xml
+++ b/reactos/base/applications/sndvol32/manifest.xml
@@ -3,7 +3,7 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.Sound.Volume.Control"
+  name="ReactOS.Application.Volume.Control"
   type="win32"
  />
  <description>ReactOS Volume Control</description>
diff --git a/reactos/base/applications/taskmgr/manifest.xml b/reactos/base/applications/taskmgr/manifest.xml
new file mode 100644
index 00000000000..d882ec354eb
--- /dev/null
+++ b/reactos/base/applications/taskmgr/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Task.Manager"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Task Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/taskmgr/taskmgr.rc b/reactos/base/applications/taskmgr/taskmgr.rc
index f40264d2ef7..1f83ed8d117 100644
--- a/reactos/base/applications/taskmgr/taskmgr.rc
+++ b/reactos/base/applications/taskmgr/taskmgr.rc
@@ -8,6 +8,8 @@
 #define res res
 #endif
 
+1 24 DISCARDABLE "manifest.xml"
+
 /* BINRES taskmgr.ico */
 IDI_TASKMANAGER         ICON    DISCARDABLE "res/taskmgr.ico"
 /* {
diff --git a/reactos/base/applications/winhelp/manifest.xml b/reactos/base/applications/winhelp/manifest.xml
new file mode 100644
index 00000000000..98d40c0ad9c
--- /dev/null
+++ b/reactos/base/applications/winhelp/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.WinHelp"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Help</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/applications/winhelp/rsrc.rc b/reactos/base/applications/winhelp/rsrc.rc
index 2e59984d54f..35efc0deb5f 100644
--- a/reactos/base/applications/winhelp/rsrc.rc
+++ b/reactos/base/applications/winhelp/rsrc.rc
@@ -23,6 +23,8 @@
 #include "winhelp.h"
 #include "winhelp_res.h"
 
+1 24 DISCARDABLE "manifest.xml"
+
 #include "lang/bg-BG.rc"
 #include "lang/cs-CZ.rc"
 #include "lang/da-DK.rc"
diff --git a/reactos/base/setup/reactos/manifest.xml b/reactos/base/setup/reactos/manifest.xml
new file mode 100644
index 00000000000..878772ac458
--- /dev/null
+++ b/reactos/base/setup/reactos/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.ReactOS"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS CD Autostart</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/setup/reactos/reactos.rc b/reactos/base/setup/reactos/reactos.rc
index 093c683bf46..42a2a16b307 100644
--- a/reactos/base/setup/reactos/reactos.rc
+++ b/reactos/base/setup/reactos/reactos.rc
@@ -6,6 +6,9 @@
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Setup\0"
 #define REACTOS_STR_INTERNAL_NAME	"reactos\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"reactos.exe\0"
+
+1 24 DISCARDABLE "manifest.xml"
+
 #include <reactos/version.rc>
 
 
diff --git a/reactos/base/setup/welcome/manifest.xml b/reactos/base/setup/welcome/manifest.xml
new file mode 100644
index 00000000000..6354b8c3e02
--- /dev/null
+++ b/reactos/base/setup/welcome/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Welcome"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Welcome App</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/setup/welcome/welcome.rc b/reactos/base/setup/welcome/welcome.rc
index 648c4d4c40a..59fecd78367 100755
--- a/reactos/base/setup/welcome/welcome.rc
+++ b/reactos/base/setup/welcome/welcome.rc
@@ -6,6 +6,9 @@
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS-Welcome\0"
 #define REACTOS_STR_INTERNAL_NAME	"welcome\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"welcome.exe\0"
+
+1 24 DISCARDABLE "manifest.xml"
+
 #include <reactos/version.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/base/shell/explorer-new/manifest.xml b/reactos/base/shell/explorer-new/manifest.xml
index 1035bef08b2..ebd7e2290d3 100644
--- a/reactos/base/shell/explorer-new/manifest.xml
+++ b/reactos/base/shell/explorer-new/manifest.xml
@@ -3,10 +3,10 @@
 <assemblyIdentity
     version="1.0.0.0"
     processorArchitecture="X86"
-    name="ReactOS.Explorer"
+    name="ReactOS.Application.Explorer"
     type="win32"
 />
-<description>ROS Explorer</description>
+<description>ReactOS Explorer</description>
 <dependency>
     <dependentAssembly>
         <assemblyIdentity
diff --git a/reactos/base/system/winlogon/manifest.xml b/reactos/base/system/winlogon/manifest.xml
new file mode 100644
index 00000000000..ab44627c9d9
--- /dev/null
+++ b/reactos/base/system/winlogon/manifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Application.Logon"
+    processorArchitecture="x86"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Logon</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="x86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/reactos/base/system/winlogon/winlogon.rc b/reactos/base/system/winlogon/winlogon.rc
index a13ca75bc83..5c0f46d6190 100644
--- a/reactos/base/system/winlogon/winlogon.rc
+++ b/reactos/base/system/winlogon/winlogon.rc
@@ -6,6 +6,9 @@
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Logon Application\0"
 #define REACTOS_STR_INTERNAL_NAME	"winlogon\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"winlogon.exe\0"
+
+1 24 DISCARDABLE "manifest.xml"
+
 #include <reactos/version.rc>
 
 #include "rsrc.rc"
diff --git a/reactos/dll/cpl/access/manifest.xml b/reactos/dll/cpl/access/manifest.xml
index 2fc419fecf1..a2f7817009e 100644
--- a/reactos/dll/cpl/access/manifest.xml
+++ b/reactos/dll/cpl/access/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Access"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Accessibility Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/appwiz/manifest.xml b/reactos/dll/cpl/appwiz/manifest.xml
index 2fc419fecf1..06c9943fef7 100644
--- a/reactos/dll/cpl/appwiz/manifest.xml
+++ b/reactos/dll/cpl/appwiz/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.AppWiz"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Application Wizard Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/desk/manifest.xml b/reactos/dll/cpl/desk/manifest.xml
index 2fc419fecf1..00130b7e208 100644
--- a/reactos/dll/cpl/desk/manifest.xml
+++ b/reactos/dll/cpl/desk/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Desk"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Desktop Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/hdwwiz/manifest.xml b/reactos/dll/cpl/hdwwiz/manifest.xml
index 2fc419fecf1..2866a68c6db 100644
--- a/reactos/dll/cpl/hdwwiz/manifest.xml
+++ b/reactos/dll/cpl/hdwwiz/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.HdwWiz"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Hardware Wizard Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/input/manifest.xml b/reactos/dll/cpl/input/manifest.xml
index 2fc419fecf1..1e4e81fa44e 100644
--- a/reactos/dll/cpl/input/manifest.xml
+++ b/reactos/dll/cpl/input/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Input"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Input Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/intl/manifest.xml b/reactos/dll/cpl/intl/manifest.xml
index 2fc419fecf1..5c9d06b1041 100644
--- a/reactos/dll/cpl/intl/manifest.xml
+++ b/reactos/dll/cpl/intl/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Intl"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Regional Settings Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/joy/manifest.xml b/reactos/dll/cpl/joy/manifest.xml
index 4b535606583..ed8fbeb811f 100644
--- a/reactos/dll/cpl/joy/manifest.xml
+++ b/reactos/dll/cpl/joy/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Joy"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Joystick Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/liccpa/manifest.xml b/reactos/dll/cpl/liccpa/manifest.xml
index 2fc419fecf1..64a6820e529 100644
--- a/reactos/dll/cpl/liccpa/manifest.xml
+++ b/reactos/dll/cpl/liccpa/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Liccpa"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Licensing Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/main/manifest.xml b/reactos/dll/cpl/main/manifest.xml
index 2fc419fecf1..ef09e1f2d56 100644
--- a/reactos/dll/cpl/main/manifest.xml
+++ b/reactos/dll/cpl/main/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Main"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Mouse Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/mmsys/manifest.xml b/reactos/dll/cpl/mmsys/manifest.xml
index 2fc419fecf1..ceb2340952b 100644
--- a/reactos/dll/cpl/mmsys/manifest.xml
+++ b/reactos/dll/cpl/mmsys/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.MMSys"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Multimedia Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/ncpa/manifest.xml b/reactos/dll/cpl/ncpa/manifest.xml
index 2fc419fecf1..a47d3419444 100644
--- a/reactos/dll/cpl/ncpa/manifest.xml
+++ b/reactos/dll/cpl/ncpa/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Ncpa"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Network Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/powercfg/manifest.xml b/reactos/dll/cpl/powercfg/manifest.xml
index 2fc419fecf1..62008aa2ad8 100644
--- a/reactos/dll/cpl/powercfg/manifest.xml
+++ b/reactos/dll/cpl/powercfg/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.PowerCfg"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Power Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/telephon/manifest.xml b/reactos/dll/cpl/telephon/manifest.xml
index 4b535606583..9e3b0b21206 100644
--- a/reactos/dll/cpl/telephon/manifest.xml
+++ b/reactos/dll/cpl/telephon/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Telephon"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Telephon Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/timedate/manifest.xml b/reactos/dll/cpl/timedate/manifest.xml
index 2fc419fecf1..206f667fdcd 100644
--- a/reactos/dll/cpl/timedate/manifest.xml
+++ b/reactos/dll/cpl/timedate/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.TimeDate"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS Time-Date Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/cpl/usrmgr/manifest.xml b/reactos/dll/cpl/usrmgr/manifest.xml
index 2fc419fecf1..f413f580765 100644
--- a/reactos/dll/cpl/usrmgr/manifest.xml
+++ b/reactos/dll/cpl/usrmgr/manifest.xml
@@ -3,10 +3,10 @@
  <assemblyIdentity
   version="1.0.0.0"
   processorArchitecture="X86"
-  name="ReactOS.System.ControlPanel.System"
+  name="ReactOS.System.ControlPanel.Usrmgr"
   type="win32"
  />
- <description>ReactOS System Control Panel</description>
+ <description>ReactOS User Manager Control Panel</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity
diff --git a/reactos/dll/win32/rasdlg/manifest.xml b/reactos/dll/win32/rasdlg/manifest.xml
index 93439c6b262..684fb5f5c54 100644
--- a/reactos/dll/win32/rasdlg/manifest.xml
+++ b/reactos/dll/win32/rasdlg/manifest.xml
@@ -6,7 +6,7 @@
   name="ReactOS.System.Net.rasdlg"
   type="win32"
  />
- <description>ReactOS Ras dialog</description>
+ <description>ReactOS Ras Dialog</description>
  <dependency>
   <dependentAssembly>
    <assemblyIdentity