diff --git a/reactos/base/setup/welcome/lang/bg-BG.rc b/reactos/base/setup/welcome/lang/bg-BG.rc
index df66a8d4d0b..12ad5969163 100644
--- a/reactos/base/setup/welcome/lang/bg-BG.rc
+++ b/reactos/base/setup/welcome/lang/bg-BG.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Добре дошли"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Добре дошли в операционна система ReactOS.\n\nИзберете си от темите в ляво."
-//    IDS_CHECKTEXT "Показвай отново този прозорец"
-//    IDS_CLOSETEXT "Изход"
+
+    IDS_CHECKTEXT "Показвай отново този прозорец"
+    IDS_CLOSETEXT "Изход"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Инсталиране на ReactOS"
     IDS_TOPICBUTTON1 "Разгледай това CD"
     IDS_TOPICBUTTON2 "Изход"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Инсталиране на ReactOSS"
     IDS_TOPICTITLE1 "Разгледай това CD"
     IDS_TOPICTITLE2 "Изход"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Създаване на нова инсталация ня ReactOS или обновяване на съществуваща такава."
     IDS_TOPICDESC1 "Разглеждане на CD-то."
     IDS_TOPICDESC2 "Натиснете за изход от програмата."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/cs-CZ.rc b/reactos/base/setup/welcome/lang/cs-CZ.rc
index 349ccf89274..906cdca678e 100644
--- a/reactos/base/setup/welcome/lang/cs-CZ.rc
+++ b/reactos/base/setup/welcome/lang/cs-CZ.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Vítejte"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Vítejte v operačním systému ReactOS.\n\nKlepněte na tlačítko v levém sloupci."
-//    IDS_CHECKTEXT "Zobrazit dialog znovu"
-//    IDS_CLOSETEXT "Konec"
+
+    IDS_CHECKTEXT "Zobrazit dialog znovu"
+    IDS_CLOSETEXT "Konec"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Instalovat ReactOS"
     IDS_TOPICBUTTON1 "Prohlížet toto CD"
     IDS_TOPICBUTTON2 "Konec"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Instalovat ReactOS"
     IDS_TOPICTITLE1 "Prohlížet toto CD"
     IDS_TOPICTITLE2 "Konec"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Nainstaluje ReactOS na Váš počítač nebo zaktualizuje existující systém."
     IDS_TOPICDESC1 "Prohlížet toto CD."
     IDS_TOPICDESC2 "Klepněte pro ukončení tohoto programu."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/da-DK.rc b/reactos/base/setup/welcome/lang/da-DK.rc
index 237dbf419aa..19d9c00b9b8 100644
--- a/reactos/base/setup/welcome/lang/da-DK.rc
+++ b/reactos/base/setup/welcome/lang/da-DK.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Velkommen"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Velkommen til ReactOS operativ System.\n\nKlik på et emne til venstre."
-//    IDS_CHECKTEXT "Vis denne dialog igen ved opstart"
-//    IDS_CLOSETEXT "Afslut"
+
+    IDS_CHECKTEXT "Vis denne dialog igen ved opstart"
+    IDS_CLOSETEXT "Afslut"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Installer ReactOS"
     IDS_TOPICBUTTON1 "Gennemse Cdrom"
     IDS_TOPICBUTTON2 "Afslut"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Installer ReactOS"
     IDS_TOPICTITLE1 "Gennemse Cdrom"
     IDS_TOPICTITLE2 "Afslut"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Opret en ny ReactOS installation på din computer eller opgradere en eksisterende installation."
     IDS_TOPICDESC1 "Gennemse ReactOS Installations Cdrom"
     IDS_TOPICDESC2 "Klik på Afslut for at lukke."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/de-DE.rc b/reactos/base/setup/welcome/lang/de-DE.rc
index 9ff73f04aaa..18b8fc3e19d 100644
--- a/reactos/base/setup/welcome/lang/de-DE.rc
+++ b/reactos/base/setup/welcome/lang/de-DE.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Willkommen"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Willkommen in ReactOS.\n\nKlicken Sie auf ein Thema auf der linken Seite."
-//    IDS_CHECKTEXT "Dialog beim nächsen Start wieder anzeigen"
-//    IDS_CLOSETEXT "Beenden"
+
+    IDS_CHECKTEXT "Dialog beim nächsen Start wieder anzeigen"
+    IDS_CLOSETEXT "Beenden"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "ReactOS installieren"
     IDS_TOPICBUTTON1 "CD durchsuchen"
     IDS_TOPICBUTTON2 "Beenden"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "ReactOS installieren"
     IDS_TOPICTITLE1 "CD durchsuchen"
     IDS_TOPICTITLE2 "Beenden"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Installiert ReactOS auf ihrem Computer oder aktualisiert eine bestehende Installation."
     IDS_TOPICDESC1 "Die ReactOS-CD durchsuchen."
     IDS_TOPICDESC2 "Klicken Sie, um dieses Programm zu beenden."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/el-GR.rc b/reactos/base/setup/welcome/lang/el-GR.rc
index 25093b90445..0a63e8bca03 100644
--- a/reactos/base/setup/welcome/lang/el-GR.rc
+++ b/reactos/base/setup/welcome/lang/el-GR.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Καλώς Ήλθατε"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Καλώς ήλθατε στο ReactOS Λειτουργικό Σύστημα.\n\nΕπιλέξτε ένα θέμα από το μενού στα αριστερά."
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Εγκατάσταση του ReactOS"
     IDS_TOPICBUTTON1 "Εξερεύνηση αυτού του CD"
     IDS_TOPICBUTTON2 "Έξοδος"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Εγκατάσταση του ReactOS"
     IDS_TOPICTITLE1 "Εξερεύνηση αυτού του CD"
     IDS_TOPICTITLE2 "Έξοδος"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Δημιουργία νέας εγκατάστασης του ReactOS στον υπολογιστή ή αναβάθμιση μιας ήδη υπάρχουσας εγκατάστασης."
     IDS_TOPICDESC1 "Εξερεύνηση αυτού του CD."
     IDS_TOPICDESC2 "Πατήστε για να τερματίσετε την εφαρμογή αυτή."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/en-US.rc b/reactos/base/setup/welcome/lang/en-US.rc
index 71d4de477a7..860c8b88eab 100644
--- a/reactos/base/setup/welcome/lang/en-US.rc
+++ b/reactos/base/setup/welcome/lang/en-US.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Welcome"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Welcome to ReactOS Operating System.\n\nClick a topic on the left."
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Install ReactOS"
     IDS_TOPICBUTTON1 "Browse this CD"
     IDS_TOPICBUTTON2 "Exit"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Install ReactOS"
     IDS_TOPICTITLE1 "Browse this CD"
     IDS_TOPICTITLE2 "Exit"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Create a new ReactOS installation on your computer or upgrade an existing installation."
     IDS_TOPICDESC1 "Browse the CD."
     IDS_TOPICDESC2 "Click to exit this application."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/es-ES.rc b/reactos/base/setup/welcome/lang/es-ES.rc
index 3d6a303e431..b524ffd3413 100644
--- a/reactos/base/setup/welcome/lang/es-ES.rc
+++ b/reactos/base/setup/welcome/lang/es-ES.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Bienvenido"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Bienvenido al Sistema Operativo ReactOS.\n\nHaz Click en una opción a la izquierda."
-//    IDS_CHECKTEXT "Mostrar este dialogo otra vez"
-//    IDS_CLOSETEXT "Salir"
+
+    IDS_CHECKTEXT "Mostrar este dialogo otra vez"
+    IDS_CLOSETEXT "Salir"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Instalar ReactOS"
     IDS_TOPICBUTTON1 "Explorar este CD"
     IDS_TOPICBUTTON2 "Salir"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Instalar ReactOS"
     IDS_TOPICTITLE1 "Explorar este CD"
     IDS_TOPICTITLE2 "Salir"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Crear una nueva instalación de ReactOS en su PC o actualizar una instalación existente."
     IDS_TOPICDESC1 "Explorar este CD."
     IDS_TOPICDESC2 "Haz Click para salir de esta aplicación."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/et-EE.rc b/reactos/base/setup/welcome/lang/et-EE.rc
index 33d6dc0de47..57f8cb92334 100644
--- a/reactos/base/setup/welcome/lang/et-EE.rc
+++ b/reactos/base/setup/welcome/lang/et-EE.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Tere tulemast"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Tere tulemast operatsioonisüsteemi ReactOS.\n\nVali teema vasakult."
-//    IDS_CHECKTEXT "Näita seda dialoogi veel"
-//    IDS_CLOSETEXT "Välju"
+
+    IDS_CHECKTEXT "Näita seda dialoogi veel"
+    IDS_CLOSETEXT "Välju"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Paigalda ReactOS"
     IDS_TOPICBUTTON1 "Sirvi CD sisu"
     IDS_TOPICBUTTON2 "Välju"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Paigalda ReactOS"
     IDS_TOPICTITLE1 "Sirvi CD sisu"
     IDS_TOPICTITLE2 "Välju"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Paigalda ReactOS oma arvutisse või uuenda olemasolevat installatsiooni."
     IDS_TOPICDESC1 "Sirvi CD sisu."
     IDS_TOPICDESC2 "Vajuta, et väljuda."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/fr-FR.rc b/reactos/base/setup/welcome/lang/fr-FR.rc
index 51bfd05510e..551f8bec633 100644
--- a/reactos/base/setup/welcome/lang/fr-FR.rc
+++ b/reactos/base/setup/welcome/lang/fr-FR.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Bienvenue"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Bienvenue sur le système d'exploitation ReactOS.\n\nCliquez sur une section à gauche."
-//    IDS_CHECKTEXT "Afficher cette boîte de dialogue de nouveau."
-//    IDS_CLOSETEXT "Quitter"
+
+    IDS_CHECKTEXT "Afficher cette boîte de dialogue de nouveau."
+    IDS_CLOSETEXT "Quitter"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Installer ReactOS"
     IDS_TOPICBUTTON1 "Naviguer dans ce CD"
     IDS_TOPICBUTTON2 "Quitter"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Installer ReactOS"
     IDS_TOPICTITLE1 "Naviguer dans ce CD"
     IDS_TOPICTITLE2 "Quitter"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Crée une nouvelle installation de ReactOS sur votre ordinateur ou met à jour votre installation actuelle."
     IDS_TOPICDESC1 "Explore le CD."
     IDS_TOPICDESC2 "Cliquez pour quitter l'installation."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/he-IL.rc b/reactos/base/setup/welcome/lang/he-IL.rc
index 8b3fd94cbbb..327aab5d3c5 100644
--- a/reactos/base/setup/welcome/lang/he-IL.rc
+++ b/reactos/base/setup/welcome/lang/he-IL.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ברוכים הבאים - ReactOS"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "ברוכים הבאים למערכת ההפעלה ReactOS,\nבחר נושא מצד ימין"
-//    IDS_CHECKTEXT "הראה חלון זה שוב"
-//    IDS_CLOSETEXT "יציאה"
+
+    IDS_CHECKTEXT "הראה חלון זה שוב"
+    IDS_CLOSETEXT "יציאה"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "התקנת ReactOS"
     IDS_TOPICBUTTON1 "סייר בתוכן הדיסק"
     IDS_TOPICBUTTON2 "יציאה"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "התקנת ReactOS"
     IDS_TOPICTITLE1 "סייר בתוכן הדיסק"
     IDS_TOPICTITLE2 "יציאה"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "צור התקנה חדשה של ReactOS במחשבך או שדרג את ההתקנה הנוכחית."
     IDS_TOPICDESC1 "סייר בתוכן הדיסק."
     IDS_TOPICDESC2 "לחץ כדי לסגור יישום זה."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/hu-HU.rc b/reactos/base/setup/welcome/lang/hu-HU.rc
index adddf6e9a31..7f39ebd638c 100644
--- a/reactos/base/setup/welcome/lang/hu-HU.rc
+++ b/reactos/base/setup/welcome/lang/hu-HU.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Üdvözlünk"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Üdvözlünk a ReactOS Operációs Rendszerben.\n\n"
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Kilépés"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Kilépés"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "ReactOS telepítése"
     IDS_TOPICBUTTON1 "A CD böngészése"
     IDS_TOPICBUTTON2 "Kilépés"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "ReactOS telepítése"
     IDS_TOPICTITLE1 "A CD böngészése"
     IDS_TOPICTITLE2 "Kilépés"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "A ReactOS telepítése vagy frissítése."
     IDS_TOPICDESC1 "A CD böngészése"
     IDS_TOPICDESC2 "Kilépés"
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/id-ID.rc b/reactos/base/setup/welcome/lang/id-ID.rc
index 6a52808b0c3..393b11dcec2 100644
--- a/reactos/base/setup/welcome/lang/id-ID.rc
+++ b/reactos/base/setup/welcome/lang/id-ID.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Selamat Datang"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Selamat datang di ReactOS Operating System.\n\nKlik topik di sisi kiri."
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Instalasi ReactOS"
     IDS_TOPICBUTTON1 "Lihat CD ini"
     IDS_TOPICBUTTON2 "Keluar"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Instalasi ReactOS"
     IDS_TOPICTITLE1 "Lihat CD ini"
     IDS_TOPICTITLE2 "Keluar"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Buat instalasi baru ReactOS pada komputer anda atau tingkatkan instalasi yang sudah ada."
     IDS_TOPICDESC1 "Lihat CD."
     IDS_TOPICDESC2 "Klik untuk keluar aplikasi ini."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/it-IT.rc b/reactos/base/setup/welcome/lang/it-IT.rc
index fec8dea465f..ed30b4da021 100644
--- a/reactos/base/setup/welcome/lang/it-IT.rc
+++ b/reactos/base/setup/welcome/lang/it-IT.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Benvenuto"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Benvenuto nel ReactOS Operating System.\n\nClicca su un argomento a sinistra."
-//    IDS_CHECKTEXT "Mostra ancora questa finestra"
-//    IDS_CLOSETEXT "Esci"
+
+    IDS_CHECKTEXT "Mostra ancora questa finestra"
+    IDS_CLOSETEXT "Esci"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Installa ReactOS"
     IDS_TOPICBUTTON1 "Esplora il CD"
     IDS_TOPICBUTTON2 "Esci"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic Titolos */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Installa ReactOS"
     IDS_TOPICTITLE1 "Esplora il CD"
     IDS_TOPICTITLE2 "Esci"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Descrizione argomentos */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Crea una nuova installazione di ReactOS sul tuo computer o aggiorna l'installazione esistente."
     IDS_TOPICDESC1 "Esplora il CD."
     IDS_TOPICDESC2 "Clicca per uscire dall'applicazione."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/ja-JP.rc b/reactos/base/setup/welcome/lang/ja-JP.rc
index 446c8c85db9..a1e8a1f25f1 100644
--- a/reactos/base/setup/welcome/lang/ja-JP.rc
+++ b/reactos/base/setup/welcome/lang/ja-JP.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Welcome"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "ReactOS へようこそ。\n\n左側のトピックをクリックしてください。"
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "ReactOS をインストールする"
     IDS_TOPICBUTTON1 "この CD を開く"
     IDS_TOPICBUTTON2 "終了"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "ReactOS をインストールする"
     IDS_TOPICTITLE1 "この CD を開く"
     IDS_TOPICTITLE2 "終了"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "コンピュータに新しく ReactOS をインストールしたり、既存の ReactOS をアップグレードします。"
     IDS_TOPICDESC1 "CD の内容を参照します。"
     IDS_TOPICDESC2 "クリックするとこのアプリケーションを終了します。"
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/lt-LT.rc b/reactos/base/setup/welcome/lang/lt-LT.rc
index a8c965394fe..78d94bb1f87 100644
--- a/reactos/base/setup/welcome/lang/lt-LT.rc
+++ b/reactos/base/setup/welcome/lang/lt-LT.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Sveiki"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Sveiki, čia ReactOS Operacinė Sistema.\n\nPasirinkite punktą kairėje."
-//    IDS_CHECKTEXT "Rodyti šį langą vėl"
-//    IDS_CLOSETEXT "Išeiti"
+
+    IDS_CHECKTEXT "Rodyti šį langą vėl"
+    IDS_CLOSETEXT "Išeiti"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Įdiegti ReactOS"
     IDS_TOPICBUTTON1 "Peržiūrėti šį CD"
     IDS_TOPICBUTTON2 "Išeiti"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Įdiegti ReactOS"
     IDS_TOPICTITLE1 "Peržiūrėti šį CD"
     IDS_TOPICTITLE2 "Išeiti"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Įdiekite arba atnaujinkite ReactOS."
     IDS_TOPICDESC1 "Peržiūrėti šį CD."
     IDS_TOPICDESC2 "Paspauskite, kad išeitumėte iš programos."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/ms-MY.rc b/reactos/base/setup/welcome/lang/ms-MY.rc
index a2e28541231..7e3ec28a423 100644
--- a/reactos/base/setup/welcome/lang/ms-MY.rc
+++ b/reactos/base/setup/welcome/lang/ms-MY.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Selamat Datang"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Selamat datang ke ReactOS Operating System.\n\nKlik tajuk di sebelah kiri."
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Pasang ReactOS"
     IDS_TOPICBUTTON1 "Layari CD ini"
     IDS_TOPICBUTTON2 "Keluar"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Pasang ReactOS"
     IDS_TOPICTITLE1 "Layari CD ini"
     IDS_TOPICTITLE2 "Keluar"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Membuat pemasangan ReactOS yang baru di dalam komputer anda atau naik taraf pemasangan sedia ada."
     IDS_TOPICDESC1 "Layari CD ini."
     IDS_TOPICDESC2 "Klik untuk keluar dari aplikasi ini."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/nl-NL.rc b/reactos/base/setup/welcome/lang/nl-NL.rc
index c9cd8270af1..f6c049c48cd 100644
--- a/reactos/base/setup/welcome/lang/nl-NL.rc
+++ b/reactos/base/setup/welcome/lang/nl-NL.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Welkom"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Welkom bij het ReactOS Operation System.\n\nKlik links op een onderwerp."
-//    IDS_CHECKTEXT "Ga terug naar dit scherm"
-//    IDS_CLOSETEXT "Afsluiten"
+
+    IDS_CHECKTEXT "Ga terug naar dit scherm"
+    IDS_CLOSETEXT "Afsluiten"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Installeer ReactOS"
     IDS_TOPICBUTTON1 "Deze CD Verkennen"
     IDS_TOPICBUTTON2 "Afsluiten"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Installeer ReactOS"
     IDS_TOPICTITLE1 "Deze CD Verkennen"
     IDS_TOPICTITLE2 "Afsluiten"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Maak een nieuwe ReactOS installatie of upgrade een bestaande installatie."
     IDS_TOPICDESC1 "Deze CD Verkennen."
     IDS_TOPICDESC2 "Klik om dit programma af te sluiten."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/no-NO.rc b/reactos/base/setup/welcome/lang/no-NO.rc
index 990004fb3fb..861b0867e78 100644
--- a/reactos/base/setup/welcome/lang/no-NO.rc
+++ b/reactos/base/setup/welcome/lang/no-NO.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Velkommen"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Velkommen til ReactOS Operativsystem.\n\nTrykk et emne til venstre."
-//    IDS_CHECKTEXT "Vis denne dialoget igjen"
-//    IDS_CLOSETEXT "Avslutt"
+
+    IDS_CHECKTEXT "Vis denne dialoget igjen"
+    IDS_CLOSETEXT "Avslutt"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Innstaller ReactOS"
     IDS_TOPICBUTTON1 "Utforsk denne CD"
     IDS_TOPICBUTTON2 "Avslutt"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Innstaller ReactOS"
     IDS_TOPICTITLE1 "Utforsk denne CD"
     IDS_TOPICTITLE2 "Avslutt"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Opprett en ny ReactOS innstallasjon på din datamaskin eller oppgrader eksisterende innstallasjon."
     IDS_TOPICDESC1 "Utforsk CDen."
     IDS_TOPICDESC2 "Trykk avslutt for å avslutte denne applikasjonen."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/pl-PL.rc b/reactos/base/setup/welcome/lang/pl-PL.rc
index 1ae5d1d174a..543b1765445 100644
--- a/reactos/base/setup/welcome/lang/pl-PL.rc
+++ b/reactos/base/setup/welcome/lang/pl-PL.rc
@@ -14,8 +14,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Zapraszamy"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Witaj w systemie operacyjnym ReactOS.\n\nWybierz temat po lewej."
-//    IDS_CHECKTEXT "Pokaż ten dialog ponownie"
-//    IDS_CLOSETEXT "Wyjście"
+
+    IDS_CHECKTEXT "Pokaż ten dialog ponownie"
+    IDS_CLOSETEXT "Wyjście"
 END
 
 /* Topic buttons */
@@ -24,13 +25,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Zainstaluj ReactOS"
     IDS_TOPICBUTTON1 "Przeglądaj CD"
     IDS_TOPICBUTTON2 "Wyjście"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -39,13 +33,6 @@ BEGIN
     IDS_TOPICTITLE0 "Zainstaluj ReactOS"
     IDS_TOPICTITLE1 "Przeglądaj CD"
     IDS_TOPICTITLE2 "Wyjście"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -54,11 +41,4 @@ BEGIN
     IDS_TOPICDESC0 "Utwórz nową instalację ReactOS na komputerze lub aktualizuj już istniejącą."
     IDS_TOPICDESC1 "Przeglądaj CD."
     IDS_TOPICDESC2 "Kliknij, aby zakończyć aplikację."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/pt-BR.rc b/reactos/base/setup/welcome/lang/pt-BR.rc
index e438760d25a..4daccd7b69e 100644
--- a/reactos/base/setup/welcome/lang/pt-BR.rc
+++ b/reactos/base/setup/welcome/lang/pt-BR.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Bem vindo"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Bem vindo ao Sistema Operacional ReactOS.\n\nClique em um tópico à esquerda."
-//    IDS_CHECKTEXT "Exibir este diálogo novamente"
-//    IDS_CLOSETEXT "Sair"
+
+    IDS_CHECKTEXT "Exibir este diálogo novamente"
+    IDS_CLOSETEXT "Sair"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Instalar ReactOS"
     IDS_TOPICBUTTON1 "Examinar este CD"
     IDS_TOPICBUTTON2 "Sair"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Instalar ReactOS"
     IDS_TOPICTITLE1 "Examinar este CD"
     IDS_TOPICTITLE2 "Sair"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Cria uma nova instalação do ReactOS em seu computador ou atualiza uma instalação já existente."
     IDS_TOPICDESC1 "Exibe os arquivos contidos no CD."
     IDS_TOPICDESC2 "Clique para fechar este aplicativo."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/ro-RO.rc b/reactos/base/setup/welcome/lang/ro-RO.rc
index b5953046243..0d669172887 100644
--- a/reactos/base/setup/welcome/lang/ro-RO.rc
+++ b/reactos/base/setup/welcome/lang/ro-RO.rc
@@ -15,8 +15,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Bun venit"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Bun venit în Sistemul de Operare ReactOS.\n\nAlegeți o opțiune din stânga."
-//    IDS_CHECKTEXT "Afișează acest dialog și altă dată"
-//    IDS_CLOSETEXT "Ieșire"
+
+    IDS_CHECKTEXT "Afișează acest dialog și altă dată"
+    IDS_CLOSETEXT "Ieșire"
 END
 
 /* Topic buttons */
@@ -25,13 +26,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Instalare ReactOS"
     IDS_TOPICBUTTON1 "Explorare CD"
     IDS_TOPICBUTTON2 "Ieșire"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -40,13 +34,6 @@ BEGIN
     IDS_TOPICTITLE0 "Instalare ReactOS"
     IDS_TOPICTITLE1 "Explorare CD"
     IDS_TOPICTITLE2 "Ieșire"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -55,11 +42,4 @@ BEGIN
     IDS_TOPICDESC0 "Creați o instalare nouă sau actualizați o instalare existentă."
     IDS_TOPICDESC1 "Explorați conținutul acestui CD."
     IDS_TOPICDESC2 "Apăsați pentru a ieși din aplicație."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/ru-RU.rc b/reactos/base/setup/welcome/lang/ru-RU.rc
index 742c95821f3..510aa8e0788 100644
--- a/reactos/base/setup/welcome/lang/ru-RU.rc
+++ b/reactos/base/setup/welcome/lang/ru-RU.rc
@@ -8,8 +8,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Добро пожаловать!"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Добро пожаловать в ReactOS.\n\nВыберите пункт слева."
-//    IDS_CHECKTEXT "Показывать это окно снова"
-//    IDS_CLOSETEXT "Выход"
+
+    IDS_CHECKTEXT "Показывать это окно снова"
+    IDS_CLOSETEXT "Выход"
 END
 
 /* Topic buttons */
@@ -18,13 +19,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Установить ReactOS"
     IDS_TOPICBUTTON1 "Обзор диска"
     IDS_TOPICBUTTON2 "Выход"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -33,13 +27,6 @@ BEGIN
     IDS_TOPICTITLE0 "Установить ReactOS"
     IDS_TOPICTITLE1 "Обзор диска"
     IDS_TOPICTITLE2 "Выход"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -48,11 +35,4 @@ BEGIN
     IDS_TOPICDESC0 "Установит ReactOS на Ваш компьютер с нуля или обновит уже установленную версию."
     IDS_TOPICDESC1 "Обзор диска."
     IDS_TOPICDESC2 "Выберите для выхода из этого приложения."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/sk-SK.rc b/reactos/base/setup/welcome/lang/sk-SK.rc
index 06b7948facd..872bbada204 100644
--- a/reactos/base/setup/welcome/lang/sk-SK.rc
+++ b/reactos/base/setup/welcome/lang/sk-SK.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Vitajte"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Vitajte v operačnom systéme ReactOS.\n\nKliknite na tlačidlo v ľavom stĺpci."
-//    IDS_CHECKTEXT "Zobraziť toto okno aj nabudúce"
-//    IDS_CLOSETEXT "Koniec"
+
+    IDS_CHECKTEXT "Zobraziť toto okno aj nabudúce"
+    IDS_CLOSETEXT "Koniec"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Inštalovať ReactOS"
     IDS_TOPICBUTTON1 "Prezerať toto CD"
     IDS_TOPICBUTTON2 "Koniec"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Inštalovať ReactOS"
     IDS_TOPICTITLE1 "Prezerať toto CD"
     IDS_TOPICTITLE2 "Koniec"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Nainštaluje ReactOS na Váš počítač alebo zaktualizuje už existujúci systém."
     IDS_TOPICDESC1 "Prezerať toto CD."
     IDS_TOPICDESC2 "Kliknutím ukončíte tento program."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/sq-AL.rc b/reactos/base/setup/welcome/lang/sq-AL.rc
index 9b2ceaa74cd..d1a21f780f3 100644
--- a/reactos/base/setup/welcome/lang/sq-AL.rc
+++ b/reactos/base/setup/welcome/lang/sq-AL.rc
@@ -12,8 +12,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Mirë se vini"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Mirë se vini në Sistemin Operative ReactOS.\n\nKliko në një topik në të majtë."
-//    IDS_CHECKTEXT "Trego këtë dialog përsëri"
-//    IDS_CLOSETEXT "Dil"
+
+    IDS_CHECKTEXT "Trego këtë dialog përsëri"
+    IDS_CLOSETEXT "Dil"
 END
 
 /* Topic buttons */
@@ -22,13 +23,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Instalo ReactOS"
     IDS_TOPICBUTTON1 "Shfleto këtë CD"
     IDS_TOPICBUTTON2 "Dil"
-//    IDS_TOPICBUTTON3 "Temë bosh 3"
-//    IDS_TOPICBUTTON4 "Temë bosh 4"
-//    IDS_TOPICBUTTON5 "Temë bosh 5"
-//    IDS_TOPICBUTTON6 "Temë bosh 6"
-//    IDS_TOPICBUTTON7 "Temë bosh 7"
-//    IDS_TOPICBUTTON8 "Temë bosh 8"
-//    IDS_TOPICBUTTON9 "Temë bosh 9"
 END
 
 /* Topic titles */
@@ -37,13 +31,6 @@ BEGIN
     IDS_TOPICTITLE0 "Instalo ReactOS"
     IDS_TOPICTITLE1 "Shfleto këtë CD"
     IDS_TOPICTITLE2 "Dil"
-//    IDS_TOPICTITLE3 "Titull teme bosh 3"
-//    IDS_TOPICTITLE4 "Titull teme bosh 4"
-//    IDS_TOPICTITLE5 "Titull teme bosh 5"
-//    IDS_TOPICTITLE6 "Titull teme bosh 6"
-//    IDS_TOPICTITLE7 "Titull teme bosh 7"
-//    IDS_TOPICTITLE8 "Titull teme bosh 8"
-//    IDS_TOPICTITLE9 "Titull teme bosh 9"
 END
 
 /* Topic descriptions */
@@ -52,11 +39,4 @@ BEGIN
     IDS_TOPICDESC0 "Krijo një instalim ose përmirësim të ReactOS'it në instalimin ekzistues në kompjuterin tuaj."
     IDS_TOPICDESC1 "Shfleto këtë CD."
     IDS_TOPICDESC2 "Kliko për të dalë nga ky program."
-//    IDS_TOPICDESC3 "Përshkrimi i Temës 3.\n\nPërshkrimi i Temës 3 Këtu."
-//    IDS_TOPICDESC4 "Përshkrimi i Temës 4.\n\nPërshkrimi i Temës 4 Këtu."
-//    IDS_TOPICDESC5 "Përshkrimi i Temës 5.\n\nPërshkrimi i Temës 5 Këtu."
-//    IDS_TOPICDESC6 "Përshkrimi i Temës 6.\n\nPërshkrimi i Temës 6 Këtu."
-//    IDS_TOPICDESC7 "Përshkrimi i Temës 7.\n\nPërshkrimi i Temës 7 Këtu."
-//    IDS_TOPICDESC8 "Përshkrimi i Temës 8.\n\nPërshkrimi i Temës 8 Këtu."
-//    IDS_TOPICDESC9 "Përshkrimi i Temës 9.\n\nPërshkrimi i Temës 9 Këtu."
 END
diff --git a/reactos/base/setup/welcome/lang/sv-SE.rc b/reactos/base/setup/welcome/lang/sv-SE.rc
index 063edaefd36..870e35e83f4 100644
--- a/reactos/base/setup/welcome/lang/sv-SE.rc
+++ b/reactos/base/setup/welcome/lang/sv-SE.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Välkommen"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Välkommen till ReactOS Operating System.\n\nKlicka på ett avsnitt till vänster."
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Installera ReactOS"
     IDS_TOPICBUTTON1 "Utforska skivan"
     IDS_TOPICBUTTON2 "Avsluta"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Installera ReactOS"
     IDS_TOPICTITLE1 "Utforska skivan"
     IDS_TOPICTITLE2 "Avsluta"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Skapa en ny ReactOS installation på den här datorn eller uppgradera en befintlig."
     IDS_TOPICDESC1 "Utforska skivan."
     IDS_TOPICDESC2 "Avsluta det här programmet."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/th-TH.rc b/reactos/base/setup/welcome/lang/th-TH.rc
index 5bb90a97e42..b3a280feb01 100644
--- a/reactos/base/setup/welcome/lang/th-TH.rc
+++ b/reactos/base/setup/welcome/lang/th-TH.rc
@@ -15,8 +15,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - ยินดีต้อนรับ"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "ยินดีต้อนรับสู่ระบบปฏิบัติการ ReactOS \n\nกดเลือกเนื้อหาบนแถบซ้ายมือ"
-//    IDS_CHECKTEXT "แสดงคำแนะนำอีกครั้ง"
-//    IDS_CLOSETEXT "ออกจากโปรแกรม"
+
+    IDS_CHECKTEXT "แสดงคำแนะนำอีกครั้ง"
+    IDS_CLOSETEXT "ออกจากโปรแกรม"
 END
 
 /* Topic buttons */
@@ -25,13 +26,6 @@ BEGIN
     IDS_TOPICBUTTON0 "ติดตั้ง ReactOS"
     IDS_TOPICBUTTON1 "ดูรายละเอียดของแผ่นซีดีนี้"
     IDS_TOPICBUTTON2 "ออกจากโปรแกรม"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -40,13 +34,6 @@ BEGIN
     IDS_TOPICTITLE0 "ติดตั้ง ReactOS"
     IDS_TOPICTITLE1 "ดูรายละเอียดของแผ่นซีดีนี้"
     IDS_TOPICTITLE2 "ออกจากโปรแกรม"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -55,11 +42,4 @@ BEGIN
     IDS_TOPICDESC0 "คุณต้องการติดตั้ง ReactOS ลงในเครื่องคอมพิวเตอร์ของคุณ\n\nหรือต้องการปรับแต่งเพิ่มเติมจากที่มีอยู่เดิม."
     IDS_TOPICDESC1 "ดูรายละเอียดของแผ่นซีดีนี้."
     IDS_TOPICDESC2 "กดเลือกที่นี่เพื่อต้องการออกจากการติดตั้ง."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/tr-TR.rc b/reactos/base/setup/welcome/lang/tr-TR.rc
index b465fc2ea6a..fe46fb368ae 100644
--- a/reactos/base/setup/welcome/lang/tr-TR.rc
+++ b/reactos/base/setup/welcome/lang/tr-TR.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Hoş Geldiniz"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "ReactOS İşletim Dizgesi'ne hoş geldiniz.\n\nSolda bir konuya tıklayınız."
-//    IDS_CHECKTEXT "Bu iletiyi yine göster."
-//    IDS_CLOSETEXT "Çıkış"
+
+    IDS_CHECKTEXT "Bu iletiyi yine göster."
+    IDS_CLOSETEXT "Çıkış"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "ReactOS'u Kur"
     IDS_TOPICBUTTON1 "Bu CD'yi Araştır"
     IDS_TOPICBUTTON2 "Çıkış"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "ReactOS'u Kur"
     IDS_TOPICTITLE1 "Bu CD'yi Araştır"
     IDS_TOPICTITLE2 "Çıkış"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Bilgisayarınıza yeni bir ReactOS yükleyiniz ya da var olan bir yüklemeyi yükseltiniz."
     IDS_TOPICDESC1 "CD'yi araştır."
     IDS_TOPICDESC2 "Bu uygulamadan çıkmak için tıklayınız."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/uk-UA.rc b/reactos/base/setup/welcome/lang/uk-UA.rc
index 32a7ba02560..bb36eef7f2d 100644
--- a/reactos/base/setup/welcome/lang/uk-UA.rc
+++ b/reactos/base/setup/welcome/lang/uk-UA.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - Ласкаво просимо"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "Ласкаво просимо до операційної системи ReactOS.\n\nКлацніть по темі ліворуч"
-//    IDS_CHECKTEXT "Показувати цей діалог знов"
-//    IDS_CLOSETEXT "Вихід"
+
+    IDS_CHECKTEXT "Показувати цей діалог знов"
+    IDS_CLOSETEXT "Вихід"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "Встановлення ReactOS"
     IDS_TOPICBUTTON1 "Огляд цього CD"
     IDS_TOPICBUTTON2 "Вихід"
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "Встановлення ReactOS"
     IDS_TOPICTITLE1 "Огляд цього CD"
     IDS_TOPICTITLE2 "Вихід"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "Створення нової інсталяції ReactOS на Вашому комп'ютері чи оновлення існуючої інсталяції."
     IDS_TOPICDESC1 "Проглянути CD."
     IDS_TOPICDESC2 "Натисніть для виходу з цієї програми."
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/zh-CN.rc b/reactos/base/setup/welcome/lang/zh-CN.rc
index a22b0d86190..553231e149e 100644
--- a/reactos/base/setup/welcome/lang/zh-CN.rc
+++ b/reactos/base/setup/welcome/lang/zh-CN.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - 欢迎"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "欢迎使用 ReactOS 操作系统。\n\n 请点击左边的主题。"
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "安装 ReactOS"
     IDS_TOPICBUTTON1 "浏览 CD"
     IDS_TOPICBUTTON2 "退出 "
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "安装 ReactOS"
     IDS_TOPICTITLE1 "浏览 CD"
     IDS_TOPICTITLE2 "退出"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "重新安装 ReactOS 或 更新你的ReactOS 。"
     IDS_TOPICDESC1 "浏览 CD 的内容。"
     IDS_TOPICDESC2 "点击退出应用程序。"
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/lang/zh-TW.rc b/reactos/base/setup/welcome/lang/zh-TW.rc
index 9390be7adab..51a5adaedaa 100644
--- a/reactos/base/setup/welcome/lang/zh-TW.rc
+++ b/reactos/base/setup/welcome/lang/zh-TW.rc
@@ -10,8 +10,9 @@ BEGIN
     IDS_APPTITLE "ReactOS - 歡迎"
     IDS_DEFAULTTOPICTITLE "ReactOS"
     IDS_DEFAULTTOPICDESC "歡迎使用 ReactOS 作業系統。\n\n 請點選左邊的主題。"
-//    IDS_CHECKTEXT "Show this dialog again"
-//    IDS_CLOSETEXT "Exit"
+
+    IDS_CHECKTEXT "Show this dialog again"
+    IDS_CLOSETEXT "Exit"
 END
 
 /* Topic buttons */
@@ -20,13 +21,6 @@ BEGIN
     IDS_TOPICBUTTON0 "安裝 ReactOS"
     IDS_TOPICBUTTON1 "瀏覽 CD"
     IDS_TOPICBUTTON2 "退出 "
-//    IDS_TOPICBUTTON3 "Empty Topic 3"
-//    IDS_TOPICBUTTON4 "Empty Topic 4"
-//    IDS_TOPICBUTTON5 "Empty Topic 5"
-//    IDS_TOPICBUTTON6 "Empty Topic 6"
-//    IDS_TOPICBUTTON7 "Empty Topic 7"
-//    IDS_TOPICBUTTON8 "Empty Topic 8"
-//    IDS_TOPICBUTTON9 "Empty Topic 9"
 END
 
 /* Topic titles */
@@ -35,13 +29,6 @@ BEGIN
     IDS_TOPICTITLE0 "安裝 ReactOS"
     IDS_TOPICTITLE1 "瀏覽 CD"
     IDS_TOPICTITLE2 "退出"
-//    IDS_TOPICTITLE3 "Empty Topic Title 3"
-//    IDS_TOPICTITLE4 "Empty Topic Title 4"
-//    IDS_TOPICTITLE5 "Empty Topic Title 5"
-//    IDS_TOPICTITLE6 "Empty Topic Title 6"
-//    IDS_TOPICTITLE7 "Empty Topic Title 7"
-//    IDS_TOPICTITLE8 "Empty Topic Title 8"
-//    IDS_TOPICTITLE9 "Empty Topic Title 9"
 END
 
 /* Topic descriptions */
@@ -50,11 +37,4 @@ BEGIN
     IDS_TOPICDESC0 "重新安裝 ReactOS 或 更新你的ReactOS 。"
     IDS_TOPICDESC1 "瀏覽 CD 的內容。"
     IDS_TOPICDESC2 "點選退出應用程式。"
-//    IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here."
-//    IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here."
-//    IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here."
-//    IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here."
-//    IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here."
-//    IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here."
-//    IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here."
 END
diff --git a/reactos/base/setup/welcome/resource.h b/reactos/base/setup/welcome/resource.h
index b2f61ac04df..788379aa926 100644
--- a/reactos/base/setup/welcome/resource.h
+++ b/reactos/base/setup/welcome/resource.h
@@ -10,72 +10,30 @@
 #define IDS_TOPICBUTTON0 1010
 #define IDS_TOPICBUTTON1 1011
 #define IDS_TOPICBUTTON2 1012
-#define IDS_TOPICBUTTON3 1013
-#define IDS_TOPICBUTTON4 1014
-#define IDS_TOPICBUTTON5 1015
-#define IDS_TOPICBUTTON6 1016
-#define IDS_TOPICBUTTON7 1017
-#define IDS_TOPICBUTTON8 1018
-#define IDS_TOPICBUTTON9 1019
 
 #define IDS_TOPICTITLE0 1020
 #define IDS_TOPICTITLE1 1021
 #define IDS_TOPICTITLE2 1022
-#define IDS_TOPICTITLE3 1023
-#define IDS_TOPICTITLE4 1024
-#define IDS_TOPICTITLE5 1025
-#define IDS_TOPICTITLE6 1026
-#define IDS_TOPICTITLE7 1027
-#define IDS_TOPICTITLE8 1028
-#define IDS_TOPICTITLE9 1029
 
 #define IDS_TOPICDESC0 1030
 #define IDS_TOPICDESC1 1031
 #define IDS_TOPICDESC2 1032
-#define IDS_TOPICDESC3 1033
-#define IDS_TOPICDESC4 1034
-#define IDS_TOPICDESC5 1035
-#define IDS_TOPICDESC6 1036
-#define IDS_TOPICDESC7 1037
-#define IDS_TOPICDESC8 1038
-#define IDS_TOPICDESC9 1039
 
 #define IDS_TOPICACTION0 1040
 #define IDS_TOPICACTION1 1041
 #define IDS_TOPICACTION2 1042
-#define IDS_TOPICACTION3 1043
-#define IDS_TOPICACTION4 1044
-#define IDS_TOPICACTION5 1045
-#define IDS_TOPICACTION6 1046
-#define IDS_TOPICACTION7 1047
-#define IDS_TOPICACTION8 1048
-#define IDS_TOPICACTION9 1049
 
-#define IDS_TOPICOPTION0 1050
-#define IDS_TOPICOPTION1 1051
-#define IDS_TOPICOPTION2 1052
-#define IDS_TOPICOPTION3 1053
-#define IDS_TOPICOPTION4 1054
-#define IDS_TOPICOPTION5 1055
-#define IDS_TOPICOPTION6 1056
-#define IDS_TOPICOPTION7 1057
-#define IDS_TOPICOPTION8 1058
-#define IDS_TOPICOPTION9 1059
+// #define IDS_TOPICOPTION0 1050
+// #define IDS_TOPICOPTION1 1051
+// #define IDS_TOPICOPTION2 1052
 
 /* Bitmaps */
 #define IDB_TITLEBITMAP        101
 #define IDB_DEFAULTTOPICBITMAP 102
 
-#define IDB_TOPICBITMAP0 110
-#define IDB_TOPICBITMAP1 111
-#define IDB_TOPICBITMAP2 112
-#define IDB_TOPICBITMAP3 113
-#define IDB_TOPICBITMAP4 114
-#define IDB_TOPICBITMAP5 115
-#define IDB_TOPICBITMAP6 116
-#define IDB_TOPICBITMAP7 117
-#define IDB_TOPICBITMAP8 118
-#define IDB_TOPICBITMAP9 119
+// #define IDB_TOPICBITMAP0 110
+// #define IDB_TOPICBITMAP1 111
+// #define IDB_TOPICBITMAP2 112
 
 #define IDC_CLOSEBUTTON 2000
 #define IDC_CHECKBUTTON 2001
diff --git a/reactos/base/setup/welcome/welcome.c b/reactos/base/setup/welcome/welcome.c
index 9c053c99e88..a0b5a4b8ce0 100644
--- a/reactos/base/setup/welcome/welcome.c
+++ b/reactos/base/setup/welcome/welcome.c
@@ -22,42 +22,34 @@
  * FILE:        base/setup/welcome/welcome.c
  * PROGRAMMERS: Eric Kohl
  *              Casper S. Hornstrup (chorns@users.sourceforge.net)
+ *              Hermes Belusca-Maito
  *
  * NOTE:
- *   This utility can be customized by modifying the resources.
- *   Please do NOT change the source code in order to customize this
- *   utility but change the resources!
- *
- * TODO: Use instead a XML file!
+ *   This utility can be customized by using localized INI configuration files.
+ *   The default strings are stored in the utility's resources.
  */
 
 #include <stdarg.h>
+#include <tchar.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
+#include <winnls.h>
 #include <winuser.h>
 #include <shellapi.h>
+#include <strsafe.h>
+
 #include <reactos/version.h>
-#include <tchar.h>
-#include <winnls.h>
 
 #include "resource.h"
 
-#define LIGHT_BLUE 0x00F7EFD6
-#define DARK_BLUE  0x008C7B6B
+#define LIGHT_BLUE RGB(214, 239, 247)
+#define DARK_BLUE  RGB(107, 123, 140)
 
 #define TITLE_WIDTH  480
 #define TITLE_HEIGHT  93
 
-#define MAX_NUMBER_TOPICS   10
-#define TOPIC_DESC_LENGTH   1024
-
-/*
- * Disable this define if you want to revert back to the old behaviour, i.e.
- * opening files with CreateProcess. This defines uses ShellExecute instead.
- */
-#define USE_SHELL_EXECUTE
-
 /* GLOBALS ******************************************************************/
 
 TCHAR szFrameClass[] = TEXT("WelcomeWindowClass");
@@ -70,20 +62,43 @@ HWND hWndDefaultTopic = NULL;
 
 HDC hdcMem = NULL;
 
-int nTopic = -1;
-int nDefaultTopic = -1;
-
 ULONG ulInnerWidth = TITLE_WIDTH;
 ULONG ulInnerHeight = (TITLE_WIDTH * 3) / 4;
 ULONG ulTitleHeight = TITLE_HEIGHT + 3;
 
 HBITMAP hTitleBitmap = NULL;
 HBITMAP hDefaultTopicBitmap = NULL;
-HBITMAP hTopicBitmap[MAX_NUMBER_TOPICS];
-HWND hWndTopicButton[MAX_NUMBER_TOPICS];
 HWND hWndCloseButton = NULL;
 HWND hWndCheckButton = NULL;
 
+/* TODO: Retrieve the preferences from a configuration file */
+BOOL bDisplayCheckBox = FALSE; // FIXME!
+BOOL bDisplayExitBtn  = TRUE;
+
+#define BUFFER_SIZE 1024
+
+#define TOPIC_TITLE_LENGTH  80
+#define TOPIC_DESC_LENGTH   1024
+
+typedef struct _TOPIC
+{
+    HBITMAP hBitmap;
+    HWND hWndButton;
+    TCHAR szText[80];
+    TCHAR szTitle[TOPIC_TITLE_LENGTH];
+    TCHAR szDesc[TOPIC_DESC_LENGTH];
+    TCHAR szAction[512];
+} TOPIC, *PTOPIC;
+
+DWORD dwNumberTopics = 0;
+PTOPIC* pTopics = NULL;
+
+TCHAR szDefaultTitle[TOPIC_TITLE_LENGTH];
+TCHAR szDefaultDesc[TOPIC_DESC_LENGTH];
+
+INT nTopic = -1;        // Active (focused) topic
+INT nDefaultTopic = -1; // Default selected topic
+
 HFONT hFontTopicButton;
 HFONT hFontTopicTitle;
 HFONT hFontTopicDescription;
@@ -106,7 +121,280 @@ MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* FUNCTIONS ****************************************************************/
 
-#ifndef USE_SHELL_EXECUTE
+INT GetLocaleName(LCID Locale, LPTSTR lpLCData, SIZE_T cchData)
+{
+    INT ret, ret2;
+
+    /* Try to retrieve the locale language name (LOCALE_SNAME is supported on Vista+) */
+    ret = GetLocaleInfo(Locale, LOCALE_SNAME, lpLCData, cchData);
+    if (ret || (GetLastError() != ERROR_INVALID_FLAGS))
+        return ret;
+
+    /*
+     * We failed because LOCALE_SNAME was unrecognized, so try to manually build
+     * a language name in the form xx-YY (WARNING: this method has its limitations).
+     */
+    ret = GetLocaleInfo(Locale, LOCALE_SISO639LANGNAME, lpLCData, cchData);
+    if (ret <= 1)
+        return ret;
+
+    lpLCData += (ret - 1);
+    cchData -= (ret - 1);
+    if (cchData <= 1)
+        return ret;
+
+    /* Try to get the second part; we add the '-' separator only if we succeed */
+    ret2 = GetLocaleInfo(Locale, LOCALE_SISO3166CTRYNAME, lpLCData + 1, cchData - 1);
+    if (ret2 <= 1)
+        return ret;
+    ret += ret2; // 'ret' already counts '-'.
+
+    *lpLCData = _T('-');
+
+    return ret;
+}
+
+VOID TranslateEscapes(IN OUT LPTSTR lpString)
+{
+    LPTSTR pEscape = NULL; // Next backslash escape sequence.
+
+    while (lpString && *lpString)
+    {
+        /* Find the next backslash escape sequence */
+        pEscape = _tcschr(lpString, _T('\\'));
+        if (!pEscape)
+            break;
+
+        /* Go past the escape backslash */
+        lpString = pEscape + 1;
+
+        /* Find which sequence it is */
+        switch (*lpString)
+        {
+            case _T('\0'):
+                // *pEscape = _T('\0'); // Enable if one wants to convert \<NULL> into <NULL>.
+                // lpString = pEscape + 1; // Loop will stop at the next iteration.
+                break;
+
+            case _T('n'): case _T('r'):
+            // case _T('\\'): // others?
+            // So far we only need to deal with the newlines.
+            {
+                if (*lpString == _T('n'))
+                    *pEscape = _T('\n');
+                else if (*lpString == _T('r'))
+                    *pEscape = _T('\r');
+
+                memmove(lpString, lpString + 1, (_tcslen(lpString + 1) + 1) * sizeof(TCHAR));
+                break;
+            }
+
+            /* Unknown escape sequence, ignore it */
+            default:
+                lpString++;
+                break;
+        }
+    }
+}
+
+BOOL LoadTopicsFromINI(LCID Locale)
+{
+    DWORD dwRet;
+    DWORD dwSize;
+    TCHAR szBuffer[LOCALE_NAME_MAX_LENGTH];
+    TCHAR szIniPath[MAX_PATH];
+    LPTSTR lpszSections = NULL, lpszSection = NULL;
+    PTOPIC pTopic, *pTopicsTmp;
+
+    /* Retrieve the locale name (on which the INI file name is based) */
+    dwRet = (DWORD)GetLocaleName(Locale, szBuffer, ARRAYSIZE(szBuffer));
+    if (!dwRet)
+    {
+        /* Fall back to english (US) */
+        StringCchCopy(szBuffer, ARRAYSIZE(szBuffer), TEXT("en-US"));
+    }
+
+    /* Build the INI file name */
+    GetCurrentDirectory(ARRAYSIZE(szIniPath), szIniPath);
+    StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\"));
+    StringCchCat(szIniPath, ARRAYSIZE(szIniPath), szBuffer);
+    StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT(".ini"));
+
+    /* Verify that the file exists, otherwise fall back to english (US) */
+    if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES)
+    {
+        StringCchCopy(szBuffer, ARRAYSIZE(szBuffer), TEXT("en-US"));
+
+        GetCurrentDirectory(ARRAYSIZE(szIniPath), szIniPath);
+        StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT("\\"));
+        StringCchCat(szIniPath, ARRAYSIZE(szIniPath), szBuffer);
+        StringCchCat(szIniPath, ARRAYSIZE(szIniPath), TEXT(".ini"));
+    }
+
+    /* Verify that the file exists, otherwise fall back to internal (localized) resource */
+    if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES)
+        return FALSE; // TODO: For localized resource, see the general function.
+
+    /* Try to load the default localized strings */
+    if (!GetPrivateProfileString(TEXT("Defaults"), TEXT("DefaultTopicTitle"), NULL /* default */,
+                                 szDefaultTitle, ARRAYSIZE(szDefaultTitle), szIniPath))
+    {
+        *szDefaultTitle = 0;
+    }
+    if (!GetPrivateProfileString(TEXT("Defaults"), TEXT("DefaultTopicDescription"), NULL /* default */,
+                                 szDefaultDesc, ARRAYSIZE(szDefaultDesc), szIniPath))
+    {
+        *szDefaultDesc = 0;
+    }
+    else
+    {
+        TranslateEscapes(szDefaultDesc);
+    }
+
+    /* Allocate a buffer big enough to hold all the section names */
+    for (dwSize = BUFFER_SIZE; ; dwSize += BUFFER_SIZE)
+    {
+        lpszSections = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(TCHAR));
+        if (!lpszSections)
+            return TRUE; // FIXME!
+        dwRet = GetPrivateProfileSectionNames(lpszSections, dwSize, szIniPath);
+        if (dwRet < dwSize - 2)
+            break;
+        HeapFree(GetProcessHeap(), 0, lpszSections);
+    }
+
+    dwNumberTopics = 0;
+    pTopics = NULL;
+
+    /* Loop over the sections and load the topics */
+    lpszSection = lpszSections;
+    for (; lpszSection && *lpszSection; lpszSection += (_tcslen(lpszSection) + 1))
+    {
+        if (_tcsnicmp(lpszSection, TEXT("Topic"), 5) == 0)
+        {
+            /* Allocate (or reallocate) the list of topics */
+            if (!pTopics)
+                pTopicsTmp = HeapAlloc(GetProcessHeap(), 0, (dwNumberTopics + 1) * sizeof(*pTopics));
+            else
+                pTopicsTmp = HeapReAlloc(GetProcessHeap(), 0, pTopics, (dwNumberTopics + 1) * sizeof(*pTopics));
+            if (!pTopicsTmp)
+                break; // Cannot reallocate more
+            pTopics = pTopicsTmp;
+
+            /* Allocate a new topic */
+            pTopic = HeapAlloc(GetProcessHeap(), 0, sizeof(*pTopic));
+            if (!pTopic)
+                break; // Cannot reallocate more
+            pTopics[dwNumberTopics++] = pTopic;
+
+            /* Retrieve the information */
+            if (!GetPrivateProfileString(lpszSection, TEXT("Button"), NULL /* default */,
+                                         pTopic->szText, ARRAYSIZE(pTopic->szText), szIniPath))
+            {
+                *pTopic->szText = 0;
+            }
+            if (!GetPrivateProfileString(lpszSection, TEXT("Title"), NULL /* default */,
+                                         pTopic->szTitle, ARRAYSIZE(pTopic->szTitle), szIniPath))
+            {
+                *pTopic->szTitle = 0;
+            }
+            if (!GetPrivateProfileString(lpszSection, TEXT("Description"), NULL /* default */,
+                                         pTopic->szDesc, ARRAYSIZE(pTopic->szDesc), szIniPath))
+            {
+                *pTopic->szDesc = 0;
+            }
+            else
+            {
+                TranslateEscapes(pTopic->szDesc);
+            }
+            if (!GetPrivateProfileString(lpszSection, TEXT("Action"), NULL /* default */,
+                                         pTopic->szAction, ARRAYSIZE(pTopic->szAction), szIniPath))
+            {
+                *pTopic->szAction = 0;
+            }
+            else
+            {
+                TranslateEscapes(pTopic->szAction);
+            }
+        }
+    }
+
+    HeapFree(GetProcessHeap(), 0, lpszSections);
+
+    return TRUE;
+}
+
+BOOL LoadTopics(VOID)
+{
+#define MAX_NUMBER_INTERNAL_TOPICS  3
+
+    UINT i;
+    PTOPIC pTopic, *pTopicsTmp;
+
+    dwNumberTopics = 0;
+    pTopics = NULL;
+
+    /*
+     * First, try to load the default internal (localized) strings.
+     * They can be redefined by the localized INI files.
+     */
+    if (!LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szDefaultTitle, ARRAYSIZE(szDefaultTitle)))
+        *szDefaultTitle = 0;
+    if (!LoadString(hInstance, IDS_DEFAULTTOPICDESC, szDefaultDesc, ARRAYSIZE(szDefaultDesc)))
+        *szDefaultDesc = 0;
+
+    /* Try to load the topics from INI file */
+    if (LoadTopicsFromINI(LOCALE_USER_DEFAULT))
+        return TRUE;
+
+    /* We failed, fall back to internal (localized) resource */
+    for (i = 0; i < MAX_NUMBER_INTERNAL_TOPICS; ++i)
+    {
+        /* Allocate (or reallocate) the list of topics */
+        if (!pTopics)
+            pTopicsTmp = HeapAlloc(GetProcessHeap(), 0, (dwNumberTopics + 1) * sizeof(*pTopics));
+        else
+            pTopicsTmp = HeapReAlloc(GetProcessHeap(), 0, pTopics, (dwNumberTopics + 1) * sizeof(*pTopics));
+        if (!pTopicsTmp)
+            break; // Cannot reallocate more
+        pTopics = pTopicsTmp;
+
+        /* Allocate a new topic */
+        pTopic = HeapAlloc(GetProcessHeap(), 0, sizeof(*pTopic));
+        if (!pTopic)
+            break; // Cannot reallocate more
+        pTopics[dwNumberTopics++] = pTopic;
+
+        /* Retrieve the information */
+        if (!LoadString(hInstance, IDS_TOPICBUTTON0 + i, pTopic->szText, ARRAYSIZE(pTopic->szText)))
+            *pTopic->szText = 0;
+        if (!LoadString(hInstance, IDS_TOPICTITLE0 + i, pTopic->szTitle, ARRAYSIZE(pTopic->szTitle)))
+            *pTopic->szTitle = 0;
+        if (!LoadString(hInstance, IDS_TOPICDESC0 + i, pTopic->szDesc, ARRAYSIZE(pTopic->szDesc)))
+            *pTopic->szDesc = 0;
+        if (!LoadString(hInstance, IDS_TOPICACTION0 + i, pTopic->szAction, ARRAYSIZE(pTopic->szAction)))
+            *pTopic->szAction = 0;
+    }
+
+    return TRUE;
+}
+
+VOID FreeTopics(VOID)
+{
+    if (!pTopics)
+        return;
+
+    while (dwNumberTopics--)
+    {
+        if (pTopics[dwNumberTopics])
+            HeapFree(GetProcessHeap(), 0, pTopics[dwNumberTopics]);
+    }
+    HeapFree(GetProcessHeap(), 0, pTopics);
+    pTopics = NULL;
+    dwNumberTopics = 0;
+}
+
+#if 0
 static VOID
 ShowLastWin32Error(HWND hWnd)
 {
@@ -141,10 +429,8 @@ _tWinMain(HINSTANCE hInst,
 {
     WNDCLASSEX wndclass;
     MSG msg;
-    int xPos;
-    int yPos;
-    int xWidth;
-    int yHeight;
+    INT xPos, yPos;
+    INT xWidth, yHeight;
     RECT rcWindow;
     HICON hMainIcon;
     HMENU hSystemMenu;
@@ -224,8 +510,10 @@ _tWinMain(HINSTANCE hInst,
     rcRightPanel.left = rcLeftPanel.right;
     rcRightPanel.right = ulInnerWidth - 1;
 
-    if (!LoadString(hInstance, (UINT_PTR)MAKEINTRESOURCE(IDS_APPTITLE), szAppTitle, ARRAYSIZE(szAppTitle)))
-        _tcscpy(szAppTitle, TEXT("ReactOS Welcome"));
+    if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle)))
+        StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS Welcome"));
+
+    LoadTopics();
 
     /* Create main window */
     hWndMain = CreateWindow(szFrameClass,
@@ -241,7 +529,7 @@ _tWinMain(HINSTANCE hInst,
                             NULL);
 
     hSystemMenu = GetSystemMenu(hWndMain, FALSE);
-    if(hSystemMenu)
+    if (hSystemMenu)
     {
         RemoveMenu(hSystemMenu, SC_SIZE, MF_BYCOMMAND);
         RemoveMenu(hSystemMenu, SC_MAXIMIZE, MF_BYCOMMAND);
@@ -256,6 +544,8 @@ _tWinMain(HINSTANCE hInst,
         DispatchMessage(&msg);
     }
 
+    FreeTopics();
+
     return msg.wParam;
 }
 
@@ -281,26 +571,21 @@ ButtonSubclassWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 
 static BOOL
-RunApplication(int nTopic)
+RunAction(INT nTopic)
 {
-#ifndef USE_SHELL_EXECUTE
-    PROCESS_INFORMATION ProcessInfo;
-    STARTUPINFO StartupInfo;
-    TCHAR CurrentDir[256];
-#else
+    // TCHAR CurrentDir[MAX_PATH];
     TCHAR Parameters[2];
-#endif
-    TCHAR AppName[512];
-    int nLength;
+    TCHAR AppName[MAX_PATH];
 
     InvalidateRect(hWndMain, NULL, TRUE);
 
-#ifndef USE_SHELL_EXECUTE
-    GetCurrentDirectory(ARRAYSIZE(CurrentDir), CurrentDir);
-#endif
+    if (nTopic < 0)
+        return TRUE;
 
-    nLength = LoadString(hInstance, IDS_TOPICACTION0 + nTopic, AppName, ARRAYSIZE(AppName));
-    if (nLength == 0)
+    // GetCurrentDirectory(ARRAYSIZE(CurrentDir), CurrentDir);
+
+    StringCchCopy(AppName, ARRAYSIZE(AppName), pTopics[nTopic]->szAction);
+    if (!*AppName)
         return TRUE;
 
     if (!_tcsicmp(AppName, TEXT("<exit>")))
@@ -314,39 +599,16 @@ RunApplication(int nTopic)
 
     if (_tcsicmp(AppName, TEXT("explorer.exe")) == 0)
     {
-#ifndef USE_SHELL_EXECUTE
-        _tcscat(AppName, TEXT(" "));
-        _tcscat(AppName, CurrentDir);
-#else
+        // StringCchCat(AppName, ARRAYSIZE(AppName), TEXT(" "));
+        // StringCchCat(AppName, ARRAYSIZE(AppName), CurrentDir);
         _tcscpy(Parameters, TEXT("\\"));
-#endif
     }
-#ifdef USE_SHELL_EXECUTE
     else
     {
         *Parameters = 0;
     }
-#endif
 
-#ifndef USE_SHELL_EXECUTE
-    ZeroMemory(&StartupInfo, sizeof(StartupInfo));
-    StartupInfo.cb = sizeof(StartupInfo);
-    StartupInfo.lpTitle = TEXT("Test");
-    StartupInfo.dwFlags = STARTF_USESHOWWINDOW;
-    StartupInfo.wShowWindow = SW_SHOWNORMAL;
-
-    if (!CreateProcess(NULL, AppName, NULL, NULL, FALSE, CREATE_NEW_CONSOLE,
-                       NULL, CurrentDir, &StartupInfo, &ProcessInfo))
-    {
-        ShowLastWin32Error(hWndMain);
-        return TRUE;
-    }
-
-    CloseHandle(ProcessInfo.hProcess);
-    CloseHandle(ProcessInfo.hThread);
-#else
     ShellExecute(NULL, NULL, AppName, Parameters, NULL, SW_SHOWDEFAULT);
-#endif
 
     return TRUE;
 }
@@ -385,7 +647,8 @@ static LRESULT
 OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
     TCHAR szText[80];
-    int i,nLength;
+    UINT i;
+    INT nLength;
     HDC ScreenDC;
     DWORD dwTop;
     DWORD dwHeight = 0;
@@ -395,7 +658,7 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 
     hbrLightBlue = CreateSolidBrush(LIGHT_BLUE);
     hbrDarkBlue = CreateSolidBrush(DARK_BLUE);
-    hbrRightPanel = CreateSolidBrush(0x00FFFFFF);
+    hbrRightPanel = CreateSolidBrush(RGB(255, 255, 255));
 
     /* Topic title font */
     hFontTopicTitle = CreateFont(-18, 0, 0, 0, FW_NORMAL,
@@ -433,105 +696,112 @@ OnCreate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 
     /* Load topic bitmaps */
     hDefaultTopicBitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DEFAULTTOPICBITMAP));
-    for (i = 0; i < ARRAYSIZE(hTopicBitmap); i++)
+    for (i = 0; i < dwNumberTopics; i++)
     {
-        hTopicBitmap[i] = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TOPICBITMAP0 + i));
+        // FIXME: Not implemented yet!
+        // pTopics[i]->hBitmap = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TOPICBITMAP0 + i));
+        pTopics[i]->hBitmap = NULL;
     }
 
     ScreenDC = GetWindowDC(hWnd);
     hdcMem = CreateCompatibleDC(ScreenDC);
     ReleaseDC(hWnd, ScreenDC);
 
-    /* load and create buttons */
+    /* Load and create buttons */
     dwTop = rcLeftPanel.top;
-    for (i = 0; i < ARRAYSIZE(hWndTopicButton); i++)
+    for (i = 0; i < dwNumberTopics; i++)
     {
-        nLength = LoadString(hInstance, IDS_TOPICBUTTON0 + i, szText, ARRAYSIZE(szText));
-        if (nLength > 0)
+        if (*pTopics[i]->szText)
         {
             dwHeight = GetButtonHeight(hdcMem,
                                        hFontTopicButton,
-                                       szText,
+                                       pTopics[i]->szText,
                                        rcLeftPanel.right - rcLeftPanel.left);
 
-            hWndTopicButton[i] = CreateWindow(TEXT("BUTTON"),
-                                              szText,
-                                              WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_MULTILINE | BS_OWNERDRAW,
-                                              rcLeftPanel.left,
-                                              dwTop,
-                                              rcLeftPanel.right - rcLeftPanel.left,
-                                              dwHeight,
-                                              hWnd,
-                                              (HMENU)IntToPtr(i),
-                                              hInstance,
-                                              NULL);
-            hWndDefaultTopic = hWndTopicButton[i];
+            pTopics[i]->hWndButton = CreateWindow(TEXT("BUTTON"),
+                                                  pTopics[i]->szText,
+                                                  WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | BS_MULTILINE | BS_OWNERDRAW,
+                                                  rcLeftPanel.left,
+                                                  dwTop,
+                                                  rcLeftPanel.right - rcLeftPanel.left,
+                                                  dwHeight,
+                                                  hWnd,
+                                                  (HMENU)IntToPtr(i),
+                                                  hInstance,
+                                                  NULL);
+            hWndDefaultTopic = pTopics[i]->hWndButton;
             nDefaultTopic = i;
-            SubclassButton(hWndTopicButton[i]);
-            SendMessage(hWndTopicButton[i], WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0));
+            SubclassButton(pTopics[i]->hWndButton);
+            SendMessage(pTopics[i]->hWndButton, WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0));
         }
         else
         {
-            hWndTopicButton[i] = NULL;
+            pTopics[i]->hWndButton = NULL;
         }
 
         dwTop += dwHeight;
     }
 
-    /* Create exit button */
-    nLength = LoadString(hInstance, IDS_CLOSETEXT, szText, ARRAYSIZE(szText));
-    if (nLength > 0)
+    /* Create "Exit" button */
+    if (bDisplayExitBtn)
     {
-        hWndCloseButton = CreateWindow(TEXT("BUTTON"),
-                                       szText,
-                                       WS_VISIBLE | WS_CHILD | BS_FLAT,
-                                       rcRightPanel.right - 10 - 57,
-                                       rcRightPanel.bottom - 10 - 21,
-                                       57,
-                                       21,
-                                       hWnd,
-                                       (HMENU)IDC_CLOSEBUTTON,
-                                       hInstance,
-                                       NULL);
-        hWndDefaultTopic = NULL;
-        nDefaultTopic = -1;
-        SendMessage(hWndCloseButton, WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0));
-    }
-    else
-    {
-        hWndCloseButton = NULL;
+        nLength = LoadString(hInstance, IDS_CLOSETEXT, szText, ARRAYSIZE(szText));
+        if (nLength > 0)
+        {
+            hWndCloseButton = CreateWindow(TEXT("BUTTON"),
+                                           szText,
+                                           WS_VISIBLE | WS_CHILD | BS_FLAT,
+                                           rcRightPanel.right - 10 - 57,
+                                           rcRightPanel.bottom - 10 - 21,
+                                           57,
+                                           21,
+                                           hWnd,
+                                           (HMENU)IDC_CLOSEBUTTON,
+                                           hInstance,
+                                           NULL);
+            hWndDefaultTopic = NULL;
+            nDefaultTopic = -1;
+            SendMessage(hWndCloseButton, WM_SETFONT, (WPARAM)hFontTopicButton, MAKELPARAM(TRUE, 0));
+        }
+        else
+        {
+            hWndCloseButton = NULL;
+        }
     }
 
     /* Create checkbox */
-    nLength = LoadString(hInstance, IDS_CHECKTEXT, szText, ARRAYSIZE(szText));
-    if (nLength > 0)
+    if (bDisplayCheckBox)
     {
-        hFontCheckButton = CreateFont(-10, 0, 0, 0, FW_THIN,
-                                      FALSE, FALSE, FALSE,
-                                      ANSI_CHARSET,
-                                      OUT_DEFAULT_PRECIS,
-                                      CLIP_DEFAULT_PRECIS,
-                                      DEFAULT_QUALITY,
-                                      FF_DONTCARE,
-                                      TEXT("Tahoma"));
+        nLength = LoadString(hInstance, IDS_CHECKTEXT, szText, ARRAYSIZE(szText));
+        if (nLength > 0)
+        {
+            hFontCheckButton = CreateFont(-10, 0, 0, 0, FW_THIN,
+                                          FALSE, FALSE, FALSE,
+                                          ANSI_CHARSET,
+                                          OUT_DEFAULT_PRECIS,
+                                          CLIP_DEFAULT_PRECIS,
+                                          DEFAULT_QUALITY,
+                                          FF_DONTCARE,
+                                          TEXT("Tahoma"));
 
-        hWndCheckButton = CreateWindow(TEXT("BUTTON"),
-                                       szText,
-                                       WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX,
-                                       rcLeftPanel.left + 8,
-                                       rcLeftPanel.bottom - 8 - 13,
-                                       rcLeftPanel.right - rcLeftPanel.left - 16,
-                                       13,
-                                       hWnd,
-                                       (HMENU)IDC_CHECKBUTTON,
-                                       hInstance,
-                                       NULL);
-        SendMessage(hWndCheckButton, WM_SETFONT, (WPARAM)hFontCheckButton, MAKELPARAM(TRUE, 0));
-    }
-    else
-    {
-        hWndCheckButton = NULL;
-        hFontCheckButton = NULL;
+            hWndCheckButton = CreateWindow(TEXT("BUTTON"),
+                                           szText,
+                                           WS_VISIBLE | WS_CHILD | BS_AUTOCHECKBOX /**/| BS_FLAT/**/,
+                                           rcLeftPanel.left + 8,
+                                           rcLeftPanel.bottom - 8 - 13,
+                                           rcLeftPanel.right - rcLeftPanel.left - 16,
+                                           13,
+                                           hWnd,
+                                           (HMENU)IDC_CHECKBUTTON,
+                                           hInstance,
+                                           NULL);
+            SendMessage(hWndCheckButton, WM_SETFONT, (WPARAM)hFontCheckButton, MAKELPARAM(TRUE, 0));
+        }
+        else
+        {
+            hFontCheckButton = NULL;
+            hWndCheckButton = NULL;
+        }
     }
 
     return 0;
@@ -547,11 +817,12 @@ OnCommand(HWND hWnd, WPARAM wParam, LPARAM lParam)
     {
         DestroyWindow(hWnd);
     }
-    else if ((LOWORD(wParam) < MAX_NUMBER_TOPICS))
+    else if ((LOWORD(wParam) < dwNumberTopics))
     {
-        if (RunApplication(LOWORD(wParam)) == FALSE)
-            DestroyWindow(hWnd);
+        if (RunAction(LOWORD(wParam)) == FALSE)
+            DestroyWindow(hWnd); // Corresponds to a <exit> action.
     }
+
     return 0;
 }
 
@@ -596,11 +867,9 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
     HBRUSH hOldBrush;
     HFONT hOldFont;
     RECT rcTitle, rcDescription;
-    TCHAR szTopicTitle[80];
-    TCHAR szTopicDesc[TOPIC_DESC_LENGTH];
-    int nLength;
     BITMAP bmpInfo;
     TCHAR version[50];
+    LPTSTR lpTitle = NULL, lpDesc = NULL;
 
     UNREFERENCED_PARAMETER(wParam);
     UNREFERENCED_PARAMETER(lParam);
@@ -653,10 +922,10 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
                0,
                SRCCOPY);
     }
-    else if ((nTopic != -1) && (hTopicBitmap[nTopic] != NULL))
+    else if ((nTopic != -1) && (pTopics[nTopic]->hBitmap != NULL))
     {
-        GetObject(hTopicBitmap[nTopic], sizeof(BITMAP), &bmpInfo);
-        hOldBitmap = (HBITMAP)SelectObject(hdcMem, hTopicBitmap[nTopic]);
+        GetObject(pTopics[nTopic]->hBitmap, sizeof(BITMAP), &bmpInfo);
+        hOldBitmap = (HBITMAP)SelectObject(hdcMem, pTopics[nTopic]->hBitmap);
         BitBlt(hdc,
                rcRightPanel.right - bmpInfo.bmWidth,
                rcRightPanel.bottom - bmpInfo.bmHeight,
@@ -670,24 +939,13 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
 
     if (nTopic == -1)
     {
-        nLength = LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szTopicTitle, ARRAYSIZE(szTopicTitle));
+        lpTitle = szDefaultTitle;
+        lpDesc  = szDefaultDesc;
     }
     else
     {
-        nLength = LoadString(hInstance, IDS_TOPICTITLE0 + nTopic, szTopicTitle, ARRAYSIZE(szTopicTitle));
-        if (nLength == 0)
-            nLength = LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szTopicTitle, ARRAYSIZE(szTopicTitle));
-    }
-
-    if (nTopic == -1)
-    {
-        nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, ARRAYSIZE(szTopicDesc));
-    }
-    else
-    {
-        nLength = LoadString(hInstance, IDS_TOPICDESC0 + nTopic, szTopicDesc, ARRAYSIZE(szTopicDesc));
-        if (nLength == 0)
-            nLength = LoadString(hInstance, IDS_DEFAULTTOPICDESC, szTopicDesc, ARRAYSIZE(szTopicDesc));
+        lpTitle = pTopics[nTopic]->szTitle;
+        lpDesc  = pTopics[nTopic]->szDesc;
     }
 
     SetBkMode(hdc, TRANSPARENT);
@@ -713,10 +971,10 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
     rcTitle.top = rcRightPanel.top + 8;
     rcTitle.bottom = rcTitle.top + 57;
     hOldFont = (HFONT)SelectObject(hdc, hFontTopicTitle);
-    DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP | DT_CALCRECT);
+    DrawText(hdc, lpTitle, -1, &rcTitle, DT_TOP | DT_CALCRECT);
 
     SetTextColor(hdc, DARK_BLUE);
-    DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP);
+    DrawText(hdc, lpTitle, -1, &rcTitle, DT_TOP);
 
     /* Draw topic description */
     rcDescription.left = rcRightPanel.left + 12;
@@ -725,8 +983,8 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
     rcDescription.bottom = rcRightPanel.bottom - 20;
 
     SelectObject(hdc, hFontTopicDescription);
-    SetTextColor(hdc, 0x00000000);
-    DrawText(hdc, szTopicDesc, -1, &rcDescription, DT_TOP | DT_WORDBREAK);
+    SetTextColor(hdc, RGB(0, 0, 0));
+    DrawText(hdc, lpDesc, -1, &rcDescription, DT_TOP | DT_WORDBREAK);
 
     SetBkMode(hdc, OPAQUE);
     SelectObject(hdc, hOldFont);
@@ -746,8 +1004,8 @@ OnDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
     LPDRAWITEMSTRUCT lpDis = (LPDRAWITEMSTRUCT)lParam;
     HPEN hPen, hOldPen;
     HBRUSH hOldBrush;
+    INT iBkMode;
     TCHAR szText[80];
-    int iBkMode;
 
     UNREFERENCED_PARAMETER(hWnd);
     UNREFERENCED_PARAMETER(wParam);
@@ -784,7 +1042,7 @@ OnDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
         InflateRect(&lpDis->rcItem, -10, -4);
         OffsetRect(&lpDis->rcItem, 0, 1);
         GetWindowText(lpDis->hwndItem, szText, ARRAYSIZE(szText));
-        SetTextColor(lpDis->hDC, 0x00000000);
+        SetTextColor(lpDis->hDC, RGB(0, 0, 0));
         iBkMode = SetBkMode(lpDis->hDC, TRANSPARENT);
         DrawText(lpDis->hDC, szText, -1, &lpDis->rcItem, DT_TOP | DT_LEFT | DT_WORDBREAK);
         SetBkMode(lpDis->hDC, iBkMode);
@@ -832,9 +1090,9 @@ OnActivate(HWND hWnd, WPARAM wParam, LPARAM lParam)
     UNREFERENCED_PARAMETER(hWnd);
     UNREFERENCED_PARAMETER(wParam);
     UNREFERENCED_PARAMETER(lParam);
+
     nTopic = -1;
     InvalidateRect(hWndMain, &rcRightPanel, TRUE);
-
     return 0;
 }
 
@@ -842,16 +1100,16 @@ OnActivate(HWND hWnd, WPARAM wParam, LPARAM lParam)
 static LRESULT
 OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
-    int i;
+    UINT i;
 
     UNREFERENCED_PARAMETER(hWnd);
     UNREFERENCED_PARAMETER(wParam);
     UNREFERENCED_PARAMETER(lParam);
 
-    for (i = 0; i < ARRAYSIZE(hWndTopicButton); i++)
+    for (i = 0; i < dwNumberTopics; i++)
     {
-        if (hWndTopicButton[i] != NULL)
-            DestroyWindow(hWndTopicButton[i]);
+        if (pTopics[i]->hWndButton != NULL)
+            DestroyWindow(pTopics[i]->hWndButton);
     }
 
     if (hWndCloseButton != NULL)
@@ -865,10 +1123,10 @@ OnDestroy(HWND hWnd, WPARAM wParam, LPARAM lParam)
     /* Delete bitmaps */
     DeleteObject(hDefaultTopicBitmap);
     DeleteObject(hTitleBitmap);
-    for (i = 0; i < ARRAYSIZE(hTopicBitmap); i++)
+    for (i = 0; i < dwNumberTopics; i++)
     {
-        if (hTopicBitmap[i] != NULL)
-            DeleteObject(hTopicBitmap[i]);
+        if (pTopics[i]->hBitmap != NULL)
+            DeleteObject(pTopics[i]->hBitmap);
     }
 
     DeleteObject(hFontTopicTitle);
diff --git a/reactos/base/setup/welcome/welcome.rc b/reactos/base/setup/welcome/welcome.rc
index 818096e406d..6b687933309 100644
--- a/reactos/base/setup/welcome/welcome.rc
+++ b/reactos/base/setup/welcome/welcome.rc
@@ -15,20 +15,10 @@ IDI_MAIN ICON "res/welcome.ico"
 /* Bitmaps */
 IDB_TITLEBITMAP BITMAP "res/title.bmp"
 
-/*
-IDB_DEFAULTTOPICBITMAP BITMAP "res/default.bmp"
-
-IDB_TOPICBITMAP0 BITMAP "res/topic0.bmp"
-IDB_TOPICBITMAP1 BITMAP "res/topic1.bmp"
-IDB_TOPICBITMAP2 BITMAP "res/topic2.bmp"
-IDB_TOPICBITMAP3 BITMAP "res/topic3.bmp"
-IDB_TOPICBITMAP4 BITMAP "res/topic4.bmp"
-IDB_TOPICBITMAP5 BITMAP "res/topic5.bmp"
-IDB_TOPICBITMAP6 BITMAP "res/topic6.bmp"
-IDB_TOPICBITMAP7 BITMAP "res/topic7.bmp"
-IDB_TOPICBITMAP8 BITMAP "res/topic8.bmp"
-IDB_TOPICBITMAP9 BITMAP "res/topic9.bmp"
-*/
+// IDB_DEFAULTTOPICBITMAP BITMAP "res/default.bmp"
+// IDB_TOPICBITMAP0 BITMAP "res/topic0.bmp"
+// IDB_TOPICBITMAP1 BITMAP "res/topic1.bmp"
+// IDB_TOPICBITMAP2 BITMAP "res/topic2.bmp"
 
 /* Topic actions */
 STRINGTABLE
@@ -36,15 +26,6 @@ BEGIN
     IDS_TOPICACTION0 "reactos.exe"
     IDS_TOPICACTION1 "explorer.exe"
     IDS_TOPICACTION2 "<exit>"  /* this quits the app */
-/*
-    IDS_TOPICACTION3 "..."
-    IDS_TOPICACTION4 "..."
-    IDS_TOPICACTION5 "..."
-    IDS_TOPICACTION6 "..."
-    IDS_TOPICACTION7 "..."
-    IDS_TOPICACTION8 "..."
-    IDS_TOPICACTION9 "..."
-*/
 END
 
 /* UTF-8 */
@@ -139,4 +120,4 @@ END
 #endif
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
-#endif
\ No newline at end of file
+#endif