diff --git a/Contrib/Modern UI/Language files/Arabic.nsh b/Contrib/Modern UI/Language files/Arabic.nsh
index 6d26e957..927f0a3a 100644
--- a/Contrib/Modern UI/Language files/Arabic.nsh	
+++ b/Contrib/Modern UI/Language files/Arabic.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "ááÅÓÊãÑÇÑ ÅÖÛØ ÇáÊÇáí"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "ÅÖÛØ ÊäÕíÈ ááÈÏÁ Ýí ÊäÕíÈ ÇáÈÑäÇãÌ"
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "${MUI_PRODUCT} ãÑÍÈÇ Èß Ýí ãäÕÈ ÈÑäÇãÌ"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Åä ÔÇÁ Çááå ÓíÊã ÊäÕíÈ ÇáÈÑäÇãÌ ${MUI_PRODUCT}.\r\n\r\nãä ÇáãÝÖá ÅÛáÇÞ ÌãíÚ ÇáÈÑÇãÌ ÞÈá ÇáÊäÕíÈ.åÐÇ ÓíÓÇÚÏ Ýí ÊÌÏíÏ ãáÝÇÊ ÇáäÙÇã ãä Ïæä ÇáÍÇÌÉ áÅÚÇÏÉ ÊÔÛíá ÇáäÙÇã ãä ÌÏíÏ.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "${MUI_PRODUCT} ãÑÍÈÇ Èß Ýí ãäÕÈ ÈÑäÇãÌ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Åä ÔÇÁ Çááå ÓíÊã ÊäÕíÈ ÇáÈÑäÇãÌ ${MUI_PRODUCT}.\r\n\r\nãä ÇáãÝÖá ÅÛáÇÞ ÌãíÚ ÇáÈÑÇãÌ ÞÈá ÇáÊäÕíÈ.åÐÇ ÓíÓÇÚÏ Ýí ÊÌÏíÏ ãáÝÇÊ ÇáäÙÇã ãä Ïæä ÇáÍÇÌÉ áÅÚÇÏÉ ÊÔÛíá ÇáäÙÇã ãä ÌÏíÏ.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "ÇÊÝÇÞíÉþ ÇáÊÑÎíÕ"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "ÇáÑÌÇÁ ãÑÇÌÚÉ ÇÊÝÇÞíÉþ ÇáÊÑÎíÕ ÞÈá ÊäÕíÈ ${MUI_PRODUCT}."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "ÇáÍãÏááå Êã ÈäÌÇÍ ÊäÕíÈ ÇáÈÑäÇãÌ"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE "Êã :"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&ÅäåÇÁ"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} ÈäÌÇÍ Êã ÊäÕíÈ\r\nÅÖÛØ ÅäåÇÁ áÅÎÑÇÌß ãä ÇáãäÕÈ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} ÈäÌÇÍ Êã ÊäÕíÈ\r\nÅÖÛØ ÅäåÇÁ áÅÎÑÇÌß ãä ÇáãäÕÈ"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "${MUI_PRODUCT}íÌÈ ÅÚÇÏÉ ÊÔÛíá ÇáäÙÇã áíßÊãá ÊäÕíÈ ÇáÈÑäÇãÌ . åá ÊÑíÏ ÇáÅÚÇÏÉ ÇáÂä¿"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "ÃÚÏ ÇáÊÔÛíá ÇáÂä"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "ÃÑÛÈ Ýí ÅÚÇÏÉ ÊÔÛíá ÇáäÙÇã Ýí æÞÊ ÂÎÑ."
diff --git a/Contrib/Modern UI/Language files/Czech.nsh b/Contrib/Modern UI/Language files/Czech.nsh
index 6fd1a02e..35ad8b74 100644
--- a/Contrib/Modern UI/Language files/Czech.nsh	
+++ b/Contrib/Modern UI/Language files/Czech.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Kliknìte na Další pro pokraèování."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Kliknìte na Instalovat pro spuštìní instalace."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Vítejte v prùvodci instalace programu ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Chystáte se nainstalovat ${MUI_PRODUCT} na svùj poèítaè.\r\n\r\nPøed zaèátkem instalace je doporuèeno zavøít všechny ostatní aplikace. Tímto umožníte instalátoru aktualizovat pøípadné systémové soubory bez nutnosti restartovat systém.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Vítejte v prùvodci instalace programu ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Chystáte se nainstalovat ${MUI_PRODUCT} na svùj poèítaè.\r\n\r\nPøed zaèátkem instalace je doporuèeno zavøít všechny ostatní aplikace. Tímto umožníte instalátoru aktualizovat pøípadné systémové soubory bez nutnosti restartovat systém.\r\n\r\n"
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licenèní ujednání"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Pøed instalací programu ${MUI_PRODUCT}, prosím, prostudujte licenèní podmínky."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Instalace probìhla v poøádku."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": dokonèeno"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Dokonèit"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "Právì jste nainstalovali program ${MUI_PRODUCT} do svého systému.\r\nKliknìte na Dokonèit pro uzavøení tohoto prùvodce."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "Právì jste nainstalovali program ${MUI_PRODUCT} do svého systému.\r\nKliknìte na Dokonèit pro uzavøení tohoto prùvodce."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Pro úplné dokonèení instalace programu ${MUI_PRODUCT} je nutné provést restart Vašeho systému. Chcete restartovat ihned?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Restartovat ihned"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Restartovat ruènì pozdìji"
diff --git a/Contrib/Modern UI/Language files/Danish.nsh b/Contrib/Modern UI/Language files/Danish.nsh
index c0da3aa6..f84a49bd 100644
--- a/Contrib/Modern UI/Language files/Danish.nsh	
+++ b/Contrib/Modern UI/Language files/Danish.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Tryk næste for at fortsætte."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Klik installer for at installere."
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Velkommen til ${MUI_PRODUCT} setup guide"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Dette vil installere ${MUI_PRODUCT} på din computer.\r\n\r\ndet foretrækkes at du lukker alle kørende programmer inden start af guiden . Dette vil tillade guiden at opdatere bestemte systemfiler uden genstart af dit system.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Velkommen til ${MUI_PRODUCT} setup guide"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Dette vil installere ${MUI_PRODUCT} på din computer.\r\n\r\ndet foretrækkes at du lukker alle kørende programmer inden start af guiden . Dette vil tillade guiden at opdatere bestemte systemfiler uden genstart af dit system.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licens Aftale"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Læs venligst licens reglerne før du installerer ${MUI_PRODUCT}."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Setup-guiden blev afsluttet med success."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Færdig"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Færdig"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} er blevet installeret på din computer.\r\nklik færdig for at lukke denne guide."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} er blevet installeret på din computer.\r\n\r\nKlik færdig for at lukke denne guide."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Dit system skal genstartes før installeringen af ${MUI_PRODUCT} er færdig. Vil du genstarte nu?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Genstart"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Jeg genstarter selv på andet tidspunkt"
diff --git a/Contrib/Modern UI/Language files/Dutch.nsh b/Contrib/Modern UI/Language files/Dutch.nsh
index b2e4b2d5..b080f5c2 100644
--- a/Contrib/Modern UI/Language files/Dutch.nsh	
+++ b/Contrib/Modern UI/Language files/Dutch.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Klik op Volgende om verder te gaan."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Klik op Installeren om de installatie te starten."
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Welkom bij de ${MUI_PRODUCT} Setup Wizard"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Deze programma zal ${MUI_PRODUCT} op uw systeem installeren.\r\n\r\nHet is aanbevolen dat u alle andere programma's afsluit voordat u Setup start. Dit zorgt ervoor dat Setup bepaalde systeembestanden kan bijwerken zonder uw system te herstarten.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Welkom bij de ${MUI_PRODUCT} Setup Wizard"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Deze programma zal ${MUI_PRODUCT} op uw systeem installeren.\r\n\r\nHet is aanbevolen dat u alle andere programma's afsluit voordat u Setup start. Dit zorgt ervoor dat Setup bepaalde systeembestanden kan bijwerken zonder uw system te herstarten.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licentie Overeenkomst"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Lees de licentie overeenkomst voordat u ${MUI_PRODUCT} installeerd."
@@ -39,9 +39,10 @@
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_TITLE "Installatie Voltooid"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "De installatie is succesvol verlopen."
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Voltooid"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Voltooien"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Voltooien"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} is geinstalleerd op uw systeem. Klik op Voltooien om deze wizard te sluiten."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TITLE "Voltooien van de ${MUI_PRODUCT} Setup Wizard"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} is geinstalleerd op uw systeem.\r\n\r\nKlik op Voltooien om deze wizard te sluiten."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Uw system moet worden herstart om de installatie van ${MUI_PRODUCT} te voltooien. Wilt u nu herstarten?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Nu herstarten"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Ik wil later handmatig herstarten"
diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh
index cca26268..1e8ca581 100644
--- a/Contrib/Modern UI/Language files/English.nsh	
+++ b/Contrib/Modern UI/Language files/English.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Click Next to continue."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Click Install to start the installation."
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Welcome to the ${MUI_PRODUCT} Setup Wizard"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "This will install ${MUI_PRODUCT} on your computer.\r\n\r\nIt is recommended that you close all other applications before starting Setup. This will allow Setup to update certain system files without rebooting your system.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Welcome to the ${MUI_PRODUCT} Setup Wizard"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "This will install ${MUI_PRODUCT} on your computer.\r\n\r\nIt is recommended that you close all other applications before starting Setup. This will allow Setup to update certain system files without rebooting your system.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "License Agreement"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Please review the license terms before installing ${MUI_PRODUCT}."
@@ -39,9 +39,10 @@
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_TITLE "Installation Complete"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Setup was completed successfully."
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Finished"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Completing"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Finish"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} has been installed on your system.\r\nClick Finish to close this wizard."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TITLE "Completing the ${MUI_PRODUCT} Setup Wizard"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} has been installed on your system.\r\n\r\nClick Finish to close this wizard."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Your system must be restarted in order to complete the installation of ${MUI_PRODUCT}. Do you want to reboot now?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Reboot now"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "I want to manually reboot later"
diff --git a/Contrib/Modern UI/Language files/French.nsh b/Contrib/Modern UI/Language files/French.nsh
index 6c892a8d..4a3245b3 100644
--- a/Contrib/Modern UI/Language files/French.nsh	
+++ b/Contrib/Modern UI/Language files/French.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Cliquez sur Suivant pour continuer." 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Cliquez sur Installer pour démarrer l'installation."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Bienvenue dans le programme d'installation de ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Vous êtes sur le point d'installer ${MUI_PRODUCT} sur votre ordinateur.\r\n\r\nAvant de débuter l'installation, il est recommander de fermer toutes les autres applications. Cela permettra au programme d'installation de mettre à jour certains fichiers système sans avoir besoin de redémarrer votre ordinateur.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Bienvenue dans le programme d'installation de ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Vous êtes sur le point d'installer ${MUI_PRODUCT} sur votre ordinateur.\r\n\r\nAvant de débuter l'installation, il est recommander de fermer toutes les autres applications. Cela permettra au programme d'installation de mettre à jour certains fichiers système sans avoir besoin de redémarrer votre ordinateur.\r\n\r\n"
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licence utilisateur"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Veuillez examiner les termes de la licence avant d'installer ${MUI_PRODUCT}."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "L'installation s'est terminée avec succès."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE " : Installation terminée"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Terminer"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} a été installé sur votre ordinateur.\r\nCliquez sur Terminer pour quitter le programme d'installation."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} a été installé sur votre ordinateur.\r\n\r\nCliquez sur Terminer pour quitter le programme d'installation."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Votre ordinateur doit être redémarré afin de compléter l'installation de ${MUI_PRODUCT}. Souhaitez-vous redémarrer maintenant ?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Redémarrer maintenant"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Je souhaite redémarrer moi-même plus tard"
diff --git a/Contrib/Modern UI/Language files/German.nsh b/Contrib/Modern UI/Language files/German.nsh
index 43a44f09..112eb60d 100644
--- a/Contrib/Modern UI/Language files/German.nsh	
+++ b/Contrib/Modern UI/Language files/German.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Klicken Sie auf Weiter um fortzufahren."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Klicken Sie auf Installieren um mit der Installation zu beginnen."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Willkommen beim Installations-\r\n\Assistenten für ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "${MUI_PRODUCT} wird auf ihrem Computer installiert.\r\n\r\nEs wird empfohlen alle anderen Programme zu schließen bevor Sie mit der Installation beginnen, damit bestimmte Systemdateien ohne Neustart ersetzt werden können.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Willkommen beim Installations-\r\n\Assistenten für ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "${MUI_PRODUCT} wird auf ihrem Computer installiert.\r\n\r\nEs wird empfohlen alle anderen Programme zu schließen bevor Sie mit der Installation beginnen, damit bestimmte Systemdateien ohne Neustart ersetzt werden können.\r\n\r\n"
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Lizenzabkommen"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Bitte lesen Sie die Lizenzbedingungen durch, bevor Sie mit der Installation fortfahren."
@@ -37,11 +37,11 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installiere..."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Bitte warten Sie, während ${MUI_PRODUCT} installiert wird."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_TITLE "Die Installation ist vollständig."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_TITLE "Die Installation ist vollständig"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Die Installation wurde erfolgreich abgeschlossen."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Fertig"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Fertig stellen"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} wurde auf ihrem Computer installiert.\r\nKlicken Sie auf Fertig um den Installations-Assistenten zu schließen."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} wurde auf ihrem Computer installiert.\r\n\r\nKlicken Sie auf Fertig um den Installations-Assistenten zu schließen."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Windows muss neu gestartet werden um die Installation von ${MUI_PRODUCT} zu vervollständigen. Möchten Sie Windows jetzt neu starten?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Jetzt neu starten"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Windows später selbst neu starten"
diff --git a/Contrib/Modern UI/Language files/Greek.nsh b/Contrib/Modern UI/Language files/Greek.nsh
index 0529ccdb..b3d7b0cc 100644
--- a/Contrib/Modern UI/Language files/Greek.nsh	
+++ b/Contrib/Modern UI/Language files/Greek.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "ÊÜíôå êëéê óôï Åðüìåíï ãéá íá óõíå÷ßóåôå."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "ÊÜíôå êëéê óôï ÅãêáôÜóôáóç ãéá íá áñ÷ßóåôå ôçí åãêáôÜóôáóç."
     
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Êáëþò Þëèáôå óôçí ÅãêáôÜóôáóç ôïõ '${MUI_PRODUCT}'"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Ôï ðñüãñáììá áõôü èá åãêáôáóôÞóåé ôï '${MUI_PRODUCT}' óôïí õðïëïãéóôÞ óáò.\r\n\r\nÓõíéóôÜôáé íá êëåßóåôå üëåò ôéò Üëëåò åöáñìïãÝò ðñéí îåêéíÞóåôå ôçí ÅãêáôÜóôáóç. Áõôü èá åðéôñÝøåé óôçí ÅãêáôÜóôáóç íá åíçìåñþóåé ïñéóìÝíá áñ÷åßá óõóôÞìáôïò ÷ùñßò ôçí åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Êáëþò Þëèáôå óôçí ÅãêáôÜóôáóç ôïõ '${MUI_PRODUCT}'"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Ôï ðñüãñáììá áõôü èá åãêáôáóôÞóåé ôï '${MUI_PRODUCT}' óôïí õðïëïãéóôÞ óáò.\r\n\r\nÓõíéóôÜôáé íá êëåßóåôå üëåò ôéò Üëëåò åöáñìïãÝò ðñéí îåêéíÞóåôå ôçí ÅãêáôÜóôáóç. Áõôü èá åðéôñÝøåé óôçí ÅãêáôÜóôáóç íá åíçìåñþóåé ïñéóìÝíá áñ÷åßá óõóôÞìáôïò ÷ùñßò ôçí åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Óõìöùíßá ¢äåéáò ×ñÞóçò"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "ÅëÝãîôå ôïõò üñïõò ôçò Üäåéáò ÷ñÞóçò ðñéí åãêáôáóôÞóåôå ôï '${MUI_PRODUCT}'."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Ç åãêáôÜóôáóç ïëïêëçñþèçêå åðéôõ÷þò."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Ïëïêëçñþèçêå"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&ÔÝëïò"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "Ôï '${MUI_PRODUCT}' åãêáôáóôÜèçêå óôïí õðïëïãéóôÞ óáò.\r\nÊÜíôå êëéê óôï ÔÝëïò ãéá íá êëåßóåôå áõôüí ôïí ïäçãü."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "Ôï '${MUI_PRODUCT}' åãêáôáóôÜèçêå óôïí õðïëïãéóôÞ óáò.\r\nÊÜíôå êëéê óôï ÔÝëïò ãéá íá êëåßóåôå áõôüí ôïí ïäçãü."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "ÐñÝðåé íá ãßíåé åðáíåêêßíçóç ôïõ õðïëïãéóôÞ óáò ãéá íá ïëïêëçñùèåß ç åãêáôÜóôáóç ôïõ '${MUI_PRODUCT}'. ÈÝëåôå íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò ôþñá;"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Íá ãßíåé åðáíåêêßíçóç ôþñá"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Èá åðáíåêêéíÞóù ôïí õðïëïãéóôÞ ìïõ áñãüôåñá"
diff --git a/Contrib/Modern UI/Language files/Hungarian.nsh b/Contrib/Modern UI/Language files/Hungarian.nsh
index 4dca80e4..3c7e355c 100644
--- a/Contrib/Modern UI/Language files/Hungarian.nsh	
+++ b/Contrib/Modern UI/Language files/Hungarian.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "A folytatáshoz nyomja meg a Tovább gombot."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "A Telepítés gomb megnyomásával indíthatja a folyamatot."
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Üdvözli a(z) ${MUI_PRODUCT} Telepítõ Varázsló"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "A(z) ${MUI_PRODUCT} telepítése következik a számítógépre.\r\n\r\nJavasoljuk, hogy indítás elõtt zárja be a futó alkalmazásokat. Így a telepítõ a rendszer újraindítása nélkül tudja frissíteni a szükséges rendszerfájlokat.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Üdvözli a(z) ${MUI_PRODUCT} Telepítõ Varázsló"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "A(z) ${MUI_PRODUCT} telepítése következik a számítógépre.\r\n\r\nJavasoljuk, hogy indítás elõtt zárja be a futó alkalmazásokat. Így a telepítõ a rendszer újraindítása nélkül tudja frissíteni a szükséges rendszerfájlokat.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licencszerzõdés"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "A(z) ${MUI_PRODUCT} telepítése elõtt tekintse át a szerzõdés feltételeit."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "A telepítés sikeresen befejezõdött."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Befejezés"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Befejezés"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "A(z) ${MUI_PRODUCT} telepítése megtörtént.\r\nA Befejezés gomb megnyomásával zárja be a varázslót."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "A(z) ${MUI_PRODUCT} telepítése megtörtént.\r\n\r\nA Befejezés gomb megnyomásával zárja be a varázslót."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "A(z) ${MUI_PRODUCT} telepítésének befejezéséhez újra kell indítani a rendszert. Most akarja újraindítani?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Most indítom újra"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Késõbb fogom újraindítani"
diff --git a/Contrib/Modern UI/Language files/Italian.nsh b/Contrib/Modern UI/Language files/Italian.nsh
index cbb0764c..37a1e1b8 100644
--- a/Contrib/Modern UI/Language files/Italian.nsh	
+++ b/Contrib/Modern UI/Language files/Italian.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Seleziona Seguente per continuare." 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Seleziona Installa per iniziare l'installazione."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Benvenuto nel progamma di installazione di ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Questo programma installerà ${MUI_PRODUCT} nel vostro computer.\r\n\r\nSi raccomanda di chiudere la vostre applicazioni, prima di iniziare l'installazione. Questo permetterà al programma di installazione di aggiornare i parametri di sistema senza dover riavviare il vostro computer.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Benvenuto nel progamma di installazione di ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Questo programma installerà ${MUI_PRODUCT} nel vostro computer.\r\n\r\nSi raccomanda di chiudere la vostre applicazioni, prima di iniziare l'installazione. Questo permetterà al programma di installazione di aggiornare i parametri di sistema senza dover riavviare il vostro computer.\r\n\r\n"
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licenza d'uso"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Per favore esamina i termini della licenza d'uso prima di installare ${MUI_PRODUCT}."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "L'installazione è stata completata con successo."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE " : Installazione completata"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Fine"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} è stato installato sul vostro computer.\r\nSelezionate Fine per chiudere il programma di installazione."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} è stato installato sul vostro computer.\r\n\r\nSelezionate Fine per chiudere il programma di installazione."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Il vostro computer deve essere riavviato per completare l'installazione di ${MUI_PRODUCT}. Desiderate riavviarlo ora ?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Riavvio immediato"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Preferisco riavviarlo più tardi"
diff --git a/Contrib/Modern UI/Language files/Japanese.nsh b/Contrib/Modern UI/Language files/Japanese.nsh
index 69fb6e3f..34494d07 100644
--- a/Contrib/Modern UI/Language files/Japanese.nsh	
+++ b/Contrib/Modern UI/Language files/Japanese.nsh	
@@ -1,5 +1,5 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.5
+;Compatible with Modern UI 1.4 and Basic Modern UI 1.6 scripts (needs te be updated!)
 
 ;Language: Japanese (1041)
 ;By Dnanako
diff --git a/Contrib/Modern UI/Language files/Polish.nsh b/Contrib/Modern UI/Language files/Polish.nsh
index 6eeb6a50..ccceb445 100644
--- a/Contrib/Modern UI/Language files/Polish.nsh	
+++ b/Contrib/Modern UI/Language files/Polish.nsh	
@@ -1,5 +1,5 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.5
+;Compatible with Modern UI 1.4 and Basic Modern UI 1.6 scripts (needs te be updated!)
 
 ;Language: Polish (1045)
 ;By Piotr Murawski & Rafa³ Lampe; www.lomsel.prv.pl mailto:ppiter@skrzynka.pl
diff --git a/Contrib/Modern UI/Language files/PortugueseBR.nsh b/Contrib/Modern UI/Language files/PortugueseBR.nsh
index 23e88968..6f0bb9a6 100644
--- a/Contrib/Modern UI/Language files/PortugueseBR.nsh	
+++ b/Contrib/Modern UI/Language files/PortugueseBR.nsh	
@@ -1,5 +1,5 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.5
+;Compatible with Modern UI 1.4 and Basic Modern UI 1.6 scripts (needs te be updated!)
 
 ;Language: 'Portuguese (Brasil)' (1046)
 ;By Layout do Brasil www.layoutdobrasil.com
diff --git a/Contrib/Modern UI/Language files/Russian.nsh b/Contrib/Modern UI/Language files/Russian.nsh
index 2f44da59..57d682c0 100644
--- a/Contrib/Modern UI/Language files/Russian.nsh	
+++ b/Contrib/Modern UI/Language files/Russian.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Íàæìèòå Äàëåå äëÿ ïðîäîëæåíèÿ."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Íàæìèòå Óñòàíîâèòü äëÿ íà÷àëà èíñòàëÿöèè."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Äîáðî ïîæàëîâàòü â ${MUI_PRODUCT} Ìàñòåð Óñòàíîâêè"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Ýòà ïðîãðàììà óñòàíîâèò ${MUI_PRODUCT} íà Âàø êîìïüþòåð.\r\n\r\nÐåêîìåíäîâàíî çàêðûòü âñå îñòàëüíûå ïðèëîæåíèÿ ïåðåä íà÷àëîì óñòàíîâêè. Ýòî ïîçâîëèò ïðîãðàìå Óñòàíîâêè îáíîâèòü ñèñòåìíûå ôàéëû áåç ïåðåçàãðóçêè.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Äîáðî ïîæàëîâàòü â ${MUI_PRODUCT} Ìàñòåð Óñòàíîâêè"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Ýòà ïðîãðàììà óñòàíîâèò ${MUI_PRODUCT} íà Âàø êîìïüþòåð.\r\n\r\nÐåêîìåíäîâàíî çàêðûòü âñå îñòàëüíûå ïðèëîæåíèÿ ïåðåä íà÷àëîì óñòàíîâêè. Ýòî ïîçâîëèò ïðîãðàìå Óñòàíîâêè îáíîâèòü ñèñòåìíûå ôàéëû áåç ïåðåçàãðóçêè.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Ëèöåíçèîííîå Ñîãëàøåíèå"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Ïðîñìîòðèòå óñëîâèÿ Ñîãëàøåíèÿ ïåðåä èíñòàëÿöèåé ${MUI_PRODUCT}."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Óñòàíîâêà óñïåøíî çàâåðøåíà."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Çàâåðøåíà"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Çàêðûòü"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} áûë óñòàíîâëåí íà âàøó ñèñòåìó.\r\nÍàæìèòå Çàêðûòü ÷òîáû çàâåðøèòü äàííûé Ìàñòåð Óñòàíîâêè."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} áûë óñòàíîâëåí íà âàøó ñèñòåìó.\r\nÍàæìèòå Çàêðûòü ÷òîáû çàâåðøèòü äàííûé Ìàñòåð Óñòàíîâêè."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Âàøà ñèñòåìà äîëæíà áûòü ïåðåçàïóùåíà ñ öåëüþ çàâåðøåíèÿ èíñòàëÿöèè ${MUI_PRODUCT}. Âû õîòèòå ïåðåçàãðóçèòüñÿ ñåé÷àñ?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Ïåðåçàãðóçèòüñÿ ñåé÷àñ"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "ß õî÷ó ïåðåçàãðóçèòüñÿ âðó÷íóþ ïîçæå"
diff --git a/Contrib/Modern UI/Language files/SimpChinese.nsh b/Contrib/Modern UI/Language files/SimpChinese.nsh
index 3d13b780..2e18b516 100644
--- a/Contrib/Modern UI/Language files/SimpChinese.nsh	
+++ b/Contrib/Modern UI/Language files/SimpChinese.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "µ¥»÷ [ÏÂÒ»²½(N)] ¼ÌÐø¡£"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "µ¥»÷ [°²×°(I)] ¿ªÊ¼°²×°¹ý³Ì¡£"
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "»¶Ó­Ê¹Óà ${MUI_PRODUCT} °²×°Ïòµ¼"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Õ⽫ÔÚÄãµÄ¼ÆËã»ú°²×° ${MUI_PRODUCT} ¡£\r\n\r\nÔÚ¿ªÊ¼°²×°Ö®Ç°£¬½¨ÒéÄúÏȹرÕÆäËûËùÓÐÓ¦ÓóÌÐò¡£Õ⽫ÔÊÐí°²×°³ÌÐò¸üÐÂÌض¨µÄϵͳÎļþ£¬¶ø²»ÐèÒªÖØÐÂÆô¶¯ÄãµÄϵͳ¡£\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "»¶Ó­Ê¹Óà ${MUI_PRODUCT} °²×°Ïòµ¼"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Õ⽫ÔÚÄãµÄ¼ÆËã»ú°²×° ${MUI_PRODUCT} ¡£\r\n\r\nÔÚ¿ªÊ¼°²×°Ö®Ç°£¬½¨ÒéÄúÏȹرÕÆäËûËùÓÐÓ¦ÓóÌÐò¡£Õ⽫ÔÊÐí°²×°³ÌÐò¸üÐÂÌض¨µÄϵͳÎļþ£¬¶ø²»ÐèÒªÖØÐÂÆô¶¯ÄãµÄϵͳ¡£\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "ÊÚȨºÏÔ¼"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "ÔÚ°²×° ${MUI_PRODUCT} ֮ǰ£¬Çë¼ìÔÄÊÚȨÌõ¿î¡£"
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "°²×°³ÌÐòÒѳɹ¦µØÔËÐÐÍê³É¡£"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": ÒÑÍê³É"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "Íê³É(&F)"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} ÒÑÔÚÄãµÄϵͳ°²×°¡£\r\nµ¥»÷ [Íê³É(F)] ¹Ø±Õ´ËÏòµ¼¡£"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} ÒÑÔÚÄãµÄϵͳ°²×°¡£\r\nµ¥»÷ [Íê³É(F)] ¹Ø±Õ´ËÏòµ¼¡£"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "ÄãµÄϵͳÐèÒªÖØÐÂÆô¶¯£¬ÒÔ±ãÍê³É ${MUI_PRODUCT} µÄ°²×°¹ý³Ì¡£ÏÖÔÚÒªÖØÐÂÆô¶¯Âð£¿"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "ÏÖÔÚÖØÐÂÆô¶¯"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "ÉÔºóÖØÐÂÆô¶¯"
diff --git a/Contrib/Modern UI/Language files/Spanish.nsh b/Contrib/Modern UI/Language files/Spanish.nsh
index 271ea8ed..421d9872 100644
--- a/Contrib/Modern UI/Language files/Spanish.nsh	
+++ b/Contrib/Modern UI/Language files/Spanish.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Presione Siguiente para continuar."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Presione Instalar para iniciar la instalación."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Bienvenido al Asistente de Instalación de ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Este programa instalará ${MUI_PRODUCT} en su ordenador.\r\n\r\nSe recomienda que cierre todas las demás aplicaciones antes de iniciar la Instalación. Esto permitirá a la Instalación actualizar ciertos archivos del sistema sin reiniciar su ordenador.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Instalación de ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Este programa instalará ${MUI_PRODUCT} en su ordenador.\r\n\r\nSe recomienda que cierre todas las demás aplicaciones antes de iniciar la Instalación. Esto permitirá a la Instalación actualizar ciertos archivos del sistema sin reiniciar su ordenador.\r\n\r\n"
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Acuerdo de licencia"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Por favor revise los términos de la licencia antes de instalar ${MUI_PRODUCT}."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "La instalación se ha completado correctamente."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Completado"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&Terminar"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} ha sido instalado en su sistema.\r\nPresione Terminar para cerrar este asistente."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} ha sido instalado en su sistema.\r\n\r\nPresione Terminar para cerrar este asistente."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Su sistema debe ser reiniciado para que pueda completarse la instalación de ${MUI_PRODUCT}. ¿Desea reinicar ahora?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Reiniciar ahora"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Deseo reiniciar manualmente más tarde"
diff --git a/Contrib/Modern UI/Language files/TradChinese.nsh b/Contrib/Modern UI/Language files/TradChinese.nsh
index 4603a995..b7235473 100644
--- a/Contrib/Modern UI/Language files/TradChinese.nsh	
+++ b/Contrib/Modern UI/Language files/TradChinese.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "«ö¤@¤U [¤U¤@¨B(N)] Ä~Äò¡C"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "«ö¤@¤U [¦w¸Ë(I)] ¶}©l¦w¸Ë¹Lµ{¡C"
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Åwªï¨Ï¥Î ${MUI_PRODUCT} ¦w¸ËºëÆF"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "³o±N¦b§Aªº¹q¸£¦w¸Ë ${MUI_PRODUCT} ¡C\r\n\r\n¦b¶}©l¦w¸Ë¤§«e¡A«Øij±z¥ýÃö³¬¨ä¥L©Ò¦³À³¥Îµ{¦¡¡C³o±N¤¹³\\¦w¸Ëµ{¦¡§ó·s¯S©wªº¨t²ÎÀɮסA¦Ó¤£»Ý­n­«·s±Ò°Ê§Aªº¨t²Î¡C\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Åwªï¨Ï¥Î ${MUI_PRODUCT} ¦w¸ËºëÆF"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "³o±N¦b§Aªº¹q¸£¦w¸Ë ${MUI_PRODUCT} ¡C\r\n\r\n¦b¶}©l¦w¸Ë¤§«e¡A«Øij±z¥ýÃö³¬¨ä¥L©Ò¦³À³¥Îµ{¦¡¡C³o±N¤¹³\\¦w¸Ëµ{¦¡§ó·s¯S©wªº¨t²ÎÀɮסA¦Ó¤£»Ý­n­«·s±Ò°Ê§Aªº¨t²Î¡C\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "±ÂÅv¦X¬ù"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "¦b¦w¸Ë ${MUI_PRODUCT} ¤§«e¡A½ÐÀ˾\±ÂÅv±ø´Ú¡C"
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "¦w¸Ëµ{¦¡¤w¦¨¥\¦a°õ¦æ§¹¦¨¡C"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": ¤w§¹¦¨"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "§¹¦¨(&F)"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} ¤w¦b§Aªº¨t²Î¦w¸Ë¡C\r\n«ö¤@¤U [§¹¦¨(F)] Ãö³¬¦¹ºëÆF¡C"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} ¤w¦b§Aªº¨t²Î¦w¸Ë¡C\r\n«ö¤@¤U [§¹¦¨(F)] Ãö³¬¦¹ºëÆF¡C"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "§Aªº¨t²Î»Ý­n­«·s±Ò°Ê¡A¥H«K§¹¦¨ ${MUI_PRODUCT} ªº¦w¸Ë¹Lµ{¡C²{¦b­n­«·s±Ò°Ê¶Ü¡H"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "²{¦b­«·s±Ò°Ê"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "µy«á­«·s±Ò°Ê"
diff --git a/Contrib/Modern UI/Language files/Ukrainian.nsh b/Contrib/Modern UI/Language files/Ukrainian.nsh
index 34247eed..902bf67d 100644
--- a/Contrib/Modern UI/Language files/Ukrainian.nsh	
+++ b/Contrib/Modern UI/Language files/Ukrainian.nsh	
@@ -15,8 +15,8 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Íàòèñí³òü Äàë³ äëÿ ïðîäîâæåííÿ."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Íàòèñí³òü Âñòàíîâèòè äëÿ ïîñàòêó óñòàíîâêè."
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_TITLE "Ëàñêàâî ïðîñèìî äî ${MUI_PRODUCT} Ìàéñòðó Óñòàíîâêè"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO "Äàíà óñòàíîâêà âñòàíîâèòü ${MUI_PRODUCT} íà âàø êîìï'þòåð.\r\n\r\nÐåêîìåíäîâàíî çàêðèòè âñ³ ïðîãðàìè ïåðåä ïî÷àòêîì ³íñòàëÿö³¿. Öå äîçâîëèòü óñòàíîâö³ îíîâèòè ñèñòåìí³ ôàéëè áåç ïåðåçàâàíòàæåííÿ ñèñòåìè.\r\n\r\n"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Ëàñêàâî ïðîñèìî äî ${MUI_PRODUCT} Ìàéñòðó Óñòàíîâêè"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Äàíà óñòàíîâêà âñòàíîâèòü ${MUI_PRODUCT} íà âàø êîìï'þòåð.\r\n\r\nÐåêîìåíäîâàíî çàêðèòè âñ³ ïðîãðàìè ïåðåä ïî÷àòêîì ³íñòàëÿö³¿. Öå äîçâîëèòü óñòàíîâö³ îíîâèòè ñèñòåìí³ ôàéëè áåç ïåðåçàâàíòàæåííÿ ñèñòåìè.\r\n\r\n"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "˳öåíç³éíà Óãîäà"  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Áóäü-ëàñêà ïåðåãëÿíüòå ë³öåíç³þ ïåðåä óñòàíîâêîþ ${MUI_PRODUCT}."
@@ -41,7 +41,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SUBTITLE "Óñòàíîâêà óñïiøíî çàâåðøåíà."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_WINDOWTITLE ": Çàâåðøåíî"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_BUTTON "&ʳíåöü"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO "${MUI_PRODUCT} âñòàíîâëåíî íà âàø êîìï'þòåð.\r\nÍàòèñí³òü ʳíåöü äëÿ âèõîäó."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_PRODUCT} âñòàíîâëåíî íà âàø êîìï'þòåð.\r\nÍàòèñí³òü ʳíåöü äëÿ âèõîäó."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_INFO_REBOOT "Âàøà ñèñòåìà ìóñèòü ïåðåçàâàíòàæèòèñÿ äëÿ ïîâíî¿ óñòàíîâêè ${MUI_PRODUCT}. Do you want to reboot now?"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTNOW "Ïåðåçàâàíòàæèòè"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_REBOOTLATER "Ïåðåçàâàíòàæèòè ϳçí³øå"
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 9cd7528f..04a79827 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -2,7 +2,8 @@
 ;Macro System
 ;Written by Joost Verburg
 
-;See the scripts in the 'Examples\Modern UI' directory for examples of usage.
+;Have a look the scripts in the 'Examples\Modern UI'
+;directory for examples of usage.
 
 ;--------------------------------
 !verbose 3
@@ -342,8 +343,8 @@
   
   ;Write Welcome text
   !ifdef MUI_WELCOMEPAGE
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_TITLE)"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO)"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_WELCOME_INFO_TITLE)"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_WELCOME_INFO_TEXT)"
   !endif
   
 !macroend
@@ -953,8 +954,8 @@
     GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1045
     ShowWindow ${MUI_TEMP1} ${SW_NORMAL}
     
-     ;Write Finish text
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_FINISH_TITLE)"
+    ;Write Finish text
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 2" "Text" "$(MUI_TEXT_FINISH_INFO_TITLE)"
     
     !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Bottom" "150"
     
@@ -987,12 +988,10 @@
       
       !endif
        
-        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO)"
+        !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 3" "Text" "$(MUI_TEXT_FINISH_INFO_TEXT)"
       
         !ifdef MUI_FINISHPAGE_RUN
         
-          !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 4" "Text" "$(MUI_TEXT_FINISH_INFO)"
-        
           !ifndef MUI_FINISHPAGE_SHOWREADME
             !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "Numfields" "4"
           !endif
@@ -1018,9 +1017,7 @@
             
           !endif
 
-        !endif
-        
-        !ifndef MUI_FINISHPAGE_RUN
+        !else
         
           !ifdef MUI_FINISHPAGE_SHOWREADME
             
@@ -1084,9 +1081,7 @@
               
             !endif
           
-          !endif
-          
-          !ifndef MUI_FINISHPAGE_RUN
+          !else
           
             !ifdef MUI_FINISHPAGE_SHOWREADME
             
@@ -1145,9 +1140,7 @@
                
            !endif
              
-        !endif
-        
-        !ifndef MUI_FINISHPAGE_RUN
+        !else
         
           !ifdef MUI_FINISHPAGE_SHOWREADME
           
@@ -1407,24 +1400,34 @@
   
 !macroend
 
+!macro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF NAME VALUE
+
+  LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
+  
+!macroend
+
 !macro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE NAME VALUE INSTALLBUTTON
 
   !ifndef "${INSTALLBUTTON}"
+  
     !ifdef MUI_TEXT_CONTINUE_NEXT
       LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}${MUI_TEXT_CONTINUE_NEXT}"
     !endif
     !ifndef MUI_TEXT_CONTINUE_NEXT
       LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
     !endif
+    
   !endif
   
-  !ifdef "${INSTALLBUTTON}"
+  !ifndef "${INSTALLBUTTON}"
+  
     !ifdef MUI_TEXT_CONTINUE_INSTALL
       LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}${MUI_TEXT_CONTINUE_INSTALL}"
     !endif
     !ifndef MUI_TEXT_CONTINUE_INSTALL
       LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
     !endif
+    
   !endif
 
   !undef "${NAME}"
@@ -1455,21 +1458,24 @@
 !macro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE COMMAND NAME VALUE INSTALLBUTTON
 
   !ifndef "${INSTALLBUTTON}"
+  
     !ifdef MUI_TEXT_CONTINUE_NEXT
       "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE} ${MUI_TEXT_CONTINUE_NEXT}"
-    !endif
-    !ifndef MUI_TEXT_CONTINUE_NEXT
+    !else
       "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
     !endif
+    
   !endif
 
   !ifdef "${INSTALLBUTTON}"
+  
     !ifdef MUI_TEXT_CONTINUE_INSTALL
       "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE} ${MUI_TEXT_CONTINUE_INSTALL}"
     !endif
     !ifndef MUI_TEXT_CONTINUE_INSTALL
       "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
     !endif
+    
   !endif
   
   !undef "${NAME}"
@@ -1492,8 +1498,8 @@
   !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND Name MUI_NAME "${MUI_NAME}"
 
   !ifdef MUI_WELCOMEPAGE
-    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_WELCOME_TITLE" "${MUI_TEXT_WELCOME_TITLE}"
-    !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_TEXT_WELCOME_INFO" "${MUI_TEXT_WELCOME_INFO}" "MUI_INSTALLBUTTON_WELCOME"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_WELCOME_INFO_TITLE" "${MUI_TEXT_WELCOME_INFO_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_TEXT_WELCOME_INFO_TEXT" "${MUI_TEXT_WELCOME_INFO_TEXT}" "MUI_INSTALLBUTTON_WELCOME"
   !endif
 
   !ifdef MUI_LICENSEPAGE
@@ -1529,13 +1535,24 @@
   !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE" "${MUI_TEXT_INSTALLING_TITLE}"
   !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_SUBTITLE" "${MUI_TEXT_INSTALLING_SUBTITLE}"
   
-  !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE" "${MUI_TEXT_FINISH_TITLE}"
+  !ifdef MUI_TEXT_FINISH_INFO_TITLE
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE" "${MUI_TEXT_FINISH_TITLE}"
+  !else
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF "MUI_TEXT_FINISH_TITLE" "${MUI_TEXT_FINISH_TITLE}"
+  !endif
   !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE" "${MUI_TEXT_FINISH_SUBTITLE}"
   
   !ifdef MUI_FINISHPAGE
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE" "${MUI_TEXT_FINISH_WINDOWTITLE}"
     !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" "" "${MUI_TEXT_FINISH_BUTTON}"'
-    !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO "${MUI_TEXT_FINISH_INFO}"
+    !ifndef MUI_TEXT_FINISH_INFO_TITLE
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF MUI_TEXT_FINISH_INFO_TITLE "${MUI_TEXT_FINISH_TITLE}"
+      !undef MUI_TEXT_FINISH_TITLE
+    !endif
+    !ifdef MUI_TEXT_FINISH_INFO_TITLE
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO_TITLE "${MUI_TEXT_FINISH_INFO_TITLE}"
+    !endif
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_TEXT_FINISH_INFO_TEXT}"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO_REBOOT "${MUI_TEXT_FINISH_INFO_REBOOT}"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_REBOOTNOW "${MUI_TEXT_FINISH_REBOOTNOW}"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_REBOOTLATER "${MUI_TEXT_FINISH_REBOOTLATER}"