[ros-diffs] [gadamopoulos] 75495: [SYSSETUP] -Implement a wizard page that lets the user select lautus as the default theme. If the user keeps pressing enter, the theme will not be applied.

Author: gadamopoulos
Date: Sun Aug  6 09:18:19 2017
New Revision: 75495

URL: http://svn.reactos.org/svn/reactos?rev=75495&view=rev
Log:
[SYSSETUP] -Implement a wizard page that lets the user select lautus as the default theme.
If the user keeps pressing enter, the theme will not be applied.

Added:
    trunk/reactos/dll/win32/syssetup/resources/thmclassic.bmp   (with props)
    trunk/reactos/dll/win32/syssetup/resources/thmlautus.bmp   (with props)
Modified:
    trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc
    trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc
    trunk/reactos/dll/win32/syssetup/lang/da-DK.rc
    trunk/reactos/dll/win32/syssetup/lang/de-DE.rc
    trunk/reactos/dll/win32/syssetup/lang/el-GR.rc
    trunk/reactos/dll/win32/syssetup/lang/en-US.rc
    trunk/reactos/dll/win32/syssetup/lang/es-ES.rc
    trunk/reactos/dll/win32/syssetup/lang/et-EE.rc
    trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc
    trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc
    trunk/reactos/dll/win32/syssetup/lang/he-IL.rc
    trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc
    trunk/reactos/dll/win32/syssetup/lang/id-ID.rc
    trunk/reactos/dll/win32/syssetup/lang/it-IT.rc
    trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc
    trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc
    trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc
    trunk/reactos/dll/win32/syssetup/lang/no-NO.rc
    trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc
    trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc
    trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc
    trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc
    trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc
    trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc
    trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc
    trunk/reactos/dll/win32/syssetup/lang/th-TH.rc
    trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc
    trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc
    trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc
    trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc
    trunk/reactos/dll/win32/syssetup/resource.h
    trunk/reactos/dll/win32/syssetup/syssetup.rc
    trunk/reactos/dll/win32/syssetup/wizard.c

Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Самопревключване на часовника за
зимно и лятно време", IDC_AUTODAYLIGHT, 53, 124, 220, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Настройка на РеактОС"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Задайте правилните дата и
време."
     IDS_PROCESSTITLE "Вписване на съставните"
     IDS_PROCESSSUBTITLE "Почакайте..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -89,6 +89,15 @@
     AUTOCHECKBOX "Automaticky nastavit hodiny při přechodu na &letní čas a
zpět", IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Instalátor"
@@ -141,6 +150,8 @@
     IDS_DATETIMESUBTITLE "Nastavte správný čas pro Váš počítač."
     IDS_PROCESSTITLE "Registrace součástí"
     IDS_PROCESSSUBTITLE "Prosím čekejte..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/da…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/da-DK.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/da-DK.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -102,6 +102,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -154,6 +163,8 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "Registering Components"
     IDS_PROCESSSUBTITLE "Please wait..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "&Uhr automatisch auf Sommer-/Winterzeit umstellen",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS-Installation"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Stellen Sie das korrekte Datum und die Uhrzeit für Ihren
Computer ein."
     IDS_PROCESSTITLE "Komponenten werden registriert"
     IDS_PROCESSSUBTITLE "Bitte warten..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "&Αυτόματη ρύθμιση με την αλλαγή θερινής ώρας",
IDC_AUTODAYLIGHT, 53, 114, 190, 20
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Εγκατάσταση του ReactOS"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Ορίστε τη σωστή ημερομηνία και
ώρα για τον υπολογιστή σας."
     IDS_PROCESSTITLE "Τίτλος"
     IDS_PROCESSSUBTITLE "Υπότιτλος"
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -102,6 +102,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -154,6 +163,9 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "Registering Components"
     IDS_PROCESSSUBTITLE "Please wait..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
+
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -84,6 +84,15 @@
     AUTOCHECKBOX "Ajustar el reloj automáticamente durante el horario de
verano", IDC_AUTODAYLIGHT, 53, 124, 230, 10 //201
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalación de ReactOS"
@@ -136,6 +145,8 @@
     IDS_DATETIMESUBTITLE "Fije la fecha y hora correcta de su equipo."
     IDS_PROCESSTITLE "Registrando componentes"
     IDS_PROCESSSUBTITLE "Espere un momento..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Säti &suveajale üleminekul kellaaeg automaatselt",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOSi paigaldamine"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Sisesta õige kellaaeg ja kuupäev."
     IDS_PROCESSTITLE "Komponentide registreerimine"
     IDS_PROCESSSUBTITLE "Palun oota..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fi…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -102,6 +102,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -154,6 +163,8 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "Registering Components"
     IDS_PROCESSSUBTITLE "Please wait..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Ajuster automatiquement l'horloge pour l'heure
&d'été", IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installation de ReactOS"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre
ordinateur."
     IDS_PROCESSTITLE "Enregistrement des composants"
     IDS_PROCESSSUBTITLE "Veuillez patienter..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/he…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/he-IL.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "×”×ª×§× ×ª ReactOS"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "רושם מרכיבים"
     IDS_PROCESSSUBTITLE "× × להמתין..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Automatikus átállás a nyári idõszámításra",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Telepítõ"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Beállíthatod a számítógép dátumát és
óráját."
     IDS_PROCESSTITLE "Process page title"
     IDS_PROCESSSUBTITLE "Process page subtitle"
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Otomatis menyesuaikan waktu atas perubahan &daylight
saving", IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Setup ReactOS"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Setel tanggal dan jam yang benar untuk komputer
anda."
     IDS_PROCESSTITLE "Judul halaman proses"
     IDS_PROCESSSUBTITLE "Subjudul halaman proses"
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Cambia automaticamente con l'ora &legale",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Installazione di ReactOS"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Impostare la data e l'ora corrette per il proprio
computer."
     IDS_PROCESSTITLE "Registrazione dei componenti"
     IDS_PROCESSSUBTITLE "Attendere prego..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "自動的にサマータイムの調整をする(&D)",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS セットアップ"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE
"コンピュータの日付と時刻を正しく設定してください。"
     IDS_PROCESSTITLE "コンポーネントの登録中"
     IDS_PROCESSSUBTITLE "お待ちください..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/lt…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -102,6 +102,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -154,6 +163,8 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "Registering Components"
     IDS_PROCESSSUBTITLE "Please wait..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "Registering Components"
     IDS_PROCESSSUBTITLE "Please wait..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Juster klokken automatisk for &sommertid",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS installasjon"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Still inn dato og tid for din datamaskin."
     IDS_PROCESSTITLE "Bearbeid side tittel"
     IDS_PROCESSSUBTITLE "Bearbeider side undertittel"
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Automatycznie ustaw zegar przy &zmianie czasu (DST)",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalator ReactOS"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Ustaw prawidłową datę i czas."
     IDS_PROCESSTITLE "Rejestracja składników"
     IDS_PROCESSSUBTITLE "Proszę czekać..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "Ajustar o relógio automaticamente para o horário de
&verão", IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Instalação do ReactOS"
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "Definir a data e a hora corretas para o seu
computador."
     IDS_PROCESSTITLE "Registrando componentes"
     IDS_PROCESSSUBTITLE "Por favor aguarde..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -90,6 +90,15 @@
     LTEXT "Fusul orar:", IDC_STATIC, 53, 42, 253, 8
     COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE
| WS_TABSTOP | WS_VSCROLL
     AUTOCHECKBOX "Aj&ustează ora automat la schimbarea fusului orar",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
+END
+
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -144,6 +153,8 @@
     IDS_DATETIMESUBTITLE "Stabilire dată și oră corectă pentru calculator"
     IDS_PROCESSTITLE "Înregistrare componente"
     IDS_PROCESSSUBTITLE "Așteptați…"
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -85,6 +85,15 @@
     AUTOCHECKBOX "Ав&томатический переход на летнее время и обратно.", IDC_AUTODAYLIGHT, 53, 124,
201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Установка ReactOS"
@@ -137,6 +146,8 @@
     IDS_DATETIMESUBTITLE "Установите правильную дату и
время на вашем компьютере."
     IDS_PROCESSTITLE "Процесс установки"
     IDS_PROCESSSUBTITLE "Установка ReactOS на ваш
компьютер."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -89,6 +89,15 @@
     AUTOCHECKBOX "Automaticky posunúť hodiny pri prechode na &letný čas a
späť", IDC_AUTODAYLIGHT, 53, 124, 220, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Inštalátor systému ReactOS"
@@ -141,6 +150,8 @@
     IDS_DATETIMESUBTITLE "Nastavte správny čas pre Váš počítač."
     IDS_PROCESSTITLE "Registrácia súčastí"
     IDS_PROCESSSUBTITLE "Počkajte, prosím ..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sq…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -102,6 +102,15 @@
     AUTOCHECKBOX "Adaptohen automatikisht orën për ditën me diell dhe ruaj
ndryshimet", IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Ndërto ReactOS"
@@ -154,6 +163,8 @@
     IDS_DATETIMESUBTITLE "Vendos datën e saktë dhe orën për kompjuterin
tuaj."
     IDS_PROCESSTITLE "Regjistrimi Komponenteve"
     IDS_PROCESSSUBTITLE "Ju Lutem prisni..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sv…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -102,6 +102,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -154,6 +163,8 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "Registering Components"
     IDS_PROCESSSUBTITLE "Please wait..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/th…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/th-TH.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/th-TH.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -102,6 +102,15 @@
     AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes",
IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Setup"
@@ -154,6 +163,8 @@
     IDS_DATETIMESUBTITLE "Set the correct date and time for your computer."
     IDS_PROCESSTITLE "Registering Components"
     IDS_PROCESSSUBTITLE "Please wait..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -85,6 +85,15 @@
     AUTOCHECKBOX "&Gün ışığı tutum değişiklikleri için saati
kendiliğinden ayarla.", IDC_AUTODAYLIGHT, 53, 124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Kur"
@@ -137,6 +146,8 @@
     IDS_DATETIMESUBTITLE "Bilgisayarınız için doğru zamânı
ayarlayınız."
     IDS_PROCESSTITLE "Bileşenler Kaydediliyor"
     IDS_PROCESSSUBTITLE "Lütfen bekleyiniz..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -89,6 +89,15 @@
     LTEXT "Часовий пояс", IDC_STATIC, 53, 42, 253, 8
     COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE
| WS_TABSTOP | WS_VSCROLL
     AUTOCHECKBOX "Автомати&чне переведення
годинника на літний/зимовий час", IDC_AUTODAYLIGHT, 53,
124, 219, 10
+END
+
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
 END
 
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
@@ -143,6 +152,8 @@
     IDS_DATETIMESUBTITLE "Встановити правильні дату і час
для Вашого комп'ютера."
     IDS_PROCESSTITLE "Реєстрація компонентів"
     IDS_PROCESSSUBTITLE "Зачекайте, будь ласка..."
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -83,6 +83,15 @@
     AUTOCHECKBOX "夏时制自动调整时间(&D)", IDC_AUTODAYLIGHT, 53,
124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安装向导 "
@@ -135,6 +144,8 @@
     IDS_DATETIMESUBTITLE "为您的计算机配置正确的日期和时间。"
     IDS_PROCESSTITLE "正在安装"
     IDS_PROCESSSUBTITLE "正在完成 ReactOS 最后的安装"
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -85,6 +85,15 @@
     AUTOCHECKBOX "夏時制自動調整時間(&D)", IDC_AUTODAYLIGHT, 53,
124, 201, 10
 END
 
+IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+    PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120,
BS_AUTORADIOBUTTON|BS_PUSHLIKE
+END
+
 IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS 安裝嚮導 "
@@ -137,6 +146,8 @@
     IDS_DATETIMESUBTITLE "爲您的計算機配置正確的日期和時間。"
     IDS_PROCESSTITLE "正在安裝"
     IDS_PROCESSSUBTITLE "正在完成 ReactOS 最後的安裝"
+    IDS_THEMESELECTIONTITLE "Appearance"
+    IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer"
 END
 
 STRINGTABLE

Modified: trunk/reactos/dll/win32/syssetup/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/resource.h	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -20,6 +20,8 @@
 
 #define IDB_WATERMARK 100
 #define IDB_HEADER    101
+#define IDB_CLASSIC   102
+#define IDB_LAUTUS    103
 
 #define IDI_ICON1 10
 #define IDI_ICON2 11
@@ -66,6 +68,10 @@
 #define IDC_FINISHTITLE      1071
 #define IDC_RESTART_PROGRESS 1072
 
+#define IDD_THEMEPAGE        1080
+#define IDC_THEMEDSTYLE      1081
+#define IDC_CLASSICSTYLE     1082
+
 #define IDD_GPL      2100
 #define IDC_GPL_TEXT 2101
 
@@ -89,6 +95,9 @@
 
 #define IDS_PROCESSTITLE    3060
 #define IDS_PROCESSSUBTITLE 3061
+
+#define IDS_THEMESELECTIONTITLE    3070
+#define IDS_THEMESELECTIONSUBTITLE 3071
 
 #define IDS_ACKPROJECTS 3100
 

Added: trunk/reactos/dll/win32/syssetup/resources/thmclassic.bmp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/syssetup/resources/thmclassic.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/win32/syssetup/resources/thmlautus.bmp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/syssetup/resources/thmlautus.bmp
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/syssetup.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/syssetup.rc	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -15,6 +15,8 @@
 /* Bitmaps */
 IDB_WATERMARK BITMAP "resources/watermark.bmp"
 IDB_HEADER BITMAP "resources/header.bmp"
+IDB_CLASSIC BITMAP "resources/thmclassic.bmp"
+IDB_LAUTUS BITMAP "resources/thmlautus.bmp"
 
 IDI_ICON1 ICON "resources/1.ico"
 IDI_ICON2 ICON "resources/2.ico"

Modified: trunk/reactos/dll/win32/syssetup/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/wizard.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/wizard.c	[iso-8859-1] Sun Aug  6 09:18:19 2017
@@ -16,6 +16,8 @@
 #include <time.h>
 #include <winnls.h>
 #include <windowsx.h>
+#include <wincon.h>
+#include <shlobj.h>
 
 #define NDEBUG
 #include <debug.h>
@@ -704,7 +706,7 @@
                     PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK |
PSWIZB_NEXT);
                     if (pSetupData->UnattendSetup &&
WriteComputerSettings(pSetupData->ComputerName, hwndDlg))
                     {
-                        SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE);
+                        SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_THEMEPAGE);
                         return TRUE;
                     }
                     break;
@@ -1604,6 +1606,89 @@
     return FALSE;
 }
 
+
+static INT_PTR CALLBACK
+ThemePageDlgProc(HWND hwndDlg,
+                    UINT uMsg,
+                    WPARAM wParam,
+                    LPARAM lParam)
+{
+    PSETUPDATA SetupData;
+
+    /* Retrieve pointer to the global setup data */
+    SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
+    switch (uMsg)
+    {
+        case WM_INITDIALOG:
+        {
+            BUTTON_IMAGELIST imldata = {0, {0,10,0,10}, BUTTON_IMAGELIST_ALIGN_TOP};
+            
+            /* Save pointer to the global setup data */
+            SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam;
+            SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData);
+            
+            imldata.himl = ImageList_LoadImage(hDllInstance,
MAKEINTRESOURCE(IDB_CLASSIC), 0, 0, CLR_NONE , IMAGE_BITMAP, LR_CREATEDIBSECTION);
+            SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BCM_SETIMAGELIST, 0,
(LPARAM)&imldata);
+
+            imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_LAUTUS),
0, 0, CLR_NONE , IMAGE_BITMAP, LR_CREATEDIBSECTION);
+            SendDlgItemMessage(hwndDlg, IDC_THEMEDSTYLE, BCM_SETIMAGELIST, 0,
(LPARAM)&imldata);
+            
+            SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BM_SETCHECK, BST_CHECKED, 0);
+            break;
+        }
+        case WM_COMMAND:
+            if (HIWORD(wParam) == BN_CLICKED)
+            {
+                switch (LOWORD(wParam))
+                {
+                    case IDC_THEMEDSTYLE:
+                    {
+                        WCHAR wszParams[1024];
+                        WCHAR wszTheme[MAX_PATH];
+                        WCHAR* format = L"desk.cpl desk,@Appearance
/Action:ActivateMSTheme /file:\"%s\"";
+
+                        SHGetFolderPathAndSubDirW(0, CSIDL_RESOURCES, NULL,
SHGFP_TYPE_DEFAULT, L"themes\\lautus\\lautus.msstyles", wszTheme);
+                        swprintf(wszParams, format, wszTheme);
+                        RunControlPanelApplet(hwndDlg, wszParams);
+                        break;
+                    }
+                    case IDC_CLASSICSTYLE:
+                        RunControlPanelApplet(hwndDlg, L"desk.cpl desk,@Appearance
/Action:ActivateMSTheme");
+                        break;
+                }
+            }
+        case WM_NOTIFY:
+            switch (((LPNMHDR)lParam)->code)
+            {
+                case PSN_SETACTIVE:
+                    /* Enable the Back and Next buttons */
+                    PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK |
PSWIZB_NEXT);
+                    if (SetupData->UnattendSetup)
+                    {
+                        SetWindowLongPtr(hwndDlg, DWL_MSGRESULT,
SetupData->uFirstNetworkWizardPage);
+                        return TRUE;
+                    }
+                    break;
+
+                case PSN_WIZNEXT:
+                    break;
+
+                case PSN_WIZBACK:
+                    SetupData->UnattendSetup = FALSE;
+                    break;
+
+                default:
+                    break;
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return FALSE;
+}
 
 static UINT CALLBACK
 RegistrationNotificationProc(PVOID Context,
@@ -2406,6 +2491,25 @@
 
 typedef DWORD(WINAPI *PFNREQUESTWIZARDPAGES)(PDWORD, HPROPSHEETPAGE *, PSETUPDATA);
 
+BOOL ActivateComctl32v6ActCtx(ULONG_PTR *cookie, HANDLE* hActCtx)
+{
+    ACTCTXW ActCtx = {sizeof(ACTCTX), ACTCTX_FLAG_RESOURCE_NAME_VALID};
+    WCHAR fileBuffer[MAX_PATH];
+
+    *hActCtx = INVALID_HANDLE_VALUE;
+
+    if (!GetModuleFileName(hDllInstance, fileBuffer, MAX_PATH))
+        return FALSE;
+
+    ActCtx.lpSource = fileBuffer;
+    ActCtx.lpResourceName = ISOLATIONAWARE_MANIFEST_RESOURCE_ID;
+    *hActCtx = CreateActCtx(&ActCtx);
+    if (*hActCtx == INVALID_HANDLE_VALUE)
+        return FALSE;
+
+    return ActivateActCtx(*hActCtx, cookie);
+}
+
 VOID
 InstallWizard(VOID)
 {
@@ -2419,6 +2523,9 @@
     HMODULE hNetShell = NULL;
     PFNREQUESTWIZARDPAGES pfn = NULL;
     DWORD dwPageCount = 8, dwNetworkPageCount = 0;
+    BOOL bActCtxActivated;
+    ULONG_PTR cookie;
+    HANDLE hActCtx;
 
     LogItem(L"BEGIN_SECTION", L"InstallWizard");
 
@@ -2435,6 +2542,11 @@
                     MB_ICONERROR | MB_OK);
         goto done;
     }
+
+    /* Load and activate the act ctx for comctl32v6 now manually. 
+     *  Even if the exe of the process had a manifest, at the point of its launch
+     *  the manifest of comctl32 wouldn't be installed so it wouldn't be loaded
at all */
+    bActCtxActivated = ActivateComctl32v6ActCtx(&cookie, &hActCtx);
 
     hNetShell = LoadLibraryW(L"netshell.dll");
     if (hNetShell != NULL)
@@ -2519,6 +2631,13 @@
     psp.pszTemplate = MAKEINTRESOURCE(IDD_DATETIMEPAGE);
     phpage[nPages++] = CreatePropertySheetPage(&psp);
 
+    /* Create the theme selection page */
+    psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
+    psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_THEMESELECTIONTITLE);
+    psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_THEMESELECTIONSUBTITLE);
+    psp.pfnDlgProc = ThemePageDlgProc;
+    psp.pszTemplate = MAKEINTRESOURCE(IDD_THEMEPAGE);
+    phpage[nPages++] = CreatePropertySheetPage(&psp);
 
     pSetupData->uFirstNetworkWizardPage = IDD_PROCESSPAGE;
     pSetupData->uPostNetworkWizardPage = IDD_PROCESSPAGE;
@@ -2582,6 +2701,12 @@
     if (hNetShell != NULL)
         FreeLibrary(hNetShell);
 
+    if (bActCtxActivated)
+    {
+        DeactivateActCtx(0, cookie);
+        ReleaseActCtx(hActCtx);
+    }
+
     if (pSetupData != NULL)
     {
         DeleteObject(pSetupData->hBoldFont);