diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index cd113898..5d5df68c 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,12 +1,15 @@ NSIS Modern User Interface - VERSION HISTORY -1.67 - October 27, 2003 +1.67 - November 7, 2003 * Support for uninstaller Welcome- and Finish pages * Renamed a few settings * Default header image * Support for uninstaller abort warning * Setting for 3 line text on Welcome- and Finish page * Langauge file backwards compatibility: English for missing strings +* Support for different uninstaller header image +* Language selection dialog not displayed if installer is silent +* Cancel button on Finish page when there are options 1.66 - October 7, 2003 * New system for page settings and custom pages diff --git a/Contrib/Modern UI/Readme.gif b/Contrib/Modern UI/Readme.gif new file mode 100644 index 00000000..f8810d30 Binary files /dev/null and b/Contrib/Modern UI/Readme.gif differ diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 8f56a374..580037d4 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -12,17 +12,18 @@ body { padding: 10px; background-color: #F0F0F0; + font-size: 0.8em; font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10pt; font-weight: normal; } p { - font-size: 10pt; + font-size: 100%; + margin: 20px; } -center +.center { text-align: center; } @@ -43,17 +44,6 @@ table { margin: 20px; } - -.text - { - margin: 20px; - } - -.bold - { - font-weight: bold; - color: #303030; - } .parameter { @@ -61,34 +51,40 @@ table color: #6586AC; } -.header +h1 { - font-size: 16pt; + font-size: 165%; color: #7A7272; + font-weight: normal; } -.subheader +h2 { - margin: 20px; - font-size: 14pt; + font-size: 150%; font-weight: bold; color: #303030; + margin: 20px; } -.sub2header +h3 { + font-size: 125%; margin: 20px; - font-size: 12pt; font-weight: bold; color: #2B5885; } +pre { + font-size: 115%; + margin: 20px; + } + .footer { - margin: 5px 5px 5px 5px; + font-size: 75%; text-align: right; - font-size: 8pt; color: #909090; + margin: 5px; } a:link, a:visited, a:active @@ -100,7 +96,7 @@ a:link, a:visited, a:active a:hover { color: #182634; - text-decoration: none; + text-decoration: underline; } @@ -114,227 +110,234 @@ a:hover - +
-

Introduction

-

NSIS 2 makes it is possible to create installers +

Introduction

+

NSIS 2 makes it is possible to create installers with a custom user interface. The Modern UI is an interface with a style like the wizards of recent Windows versions.

-

This new interface also features new pages +

This new interface also features new pages (Welcome, Finish, Start Menu) and a description area on the components page. The interface and the graphics can be customized using the provided settings.

-

Using the Modern UI macros and language files, +

Using the Modern UI macros and language files, writing scripts with a modern interface is easy. This document contains information about writing Modern UI scripts and a reference of all settings.

-

Important: Because the Modern +

Important: Because the Modern UI has its own macro system, its own default settings and a lot of new features, the interface configuration works differently. So you should not use commands like Icon, CheckBitmap, InstallColors etc.

-

Screenshots

-

-

-

How to use

-

The Modern UI has a macro system, so all the code to +

Screenshots

+

+

+

How to use

+

The Modern UI has a macro system, so all the code to control the interface has already been written for you.

-

If you want to start a new Modern UI script or upgrade +

If you want to start a new Modern UI script or upgrade an older script with the Classic UI, follow the steps below.

-

Taking a look at the example scripts +

Taking a look at the example scripts will also help you to learn more about the Modern UI.

-

Syntax

-

Some defines (i.e. MUI_COMPONENTSPAGE_SMALLDESC) don't need a value, they are true/false settings. +

Syntax

+

Some defines (i.e. MUI_COMPONENTSPAGE_SMALLDESC) don't need a value, they are true/false settings. Others (i.e. MUI_UI) can be used to define a specific value.

-

Parameters are specified in this format: +

Parameters are specified in this format: required (option1 | option2) [optional]

-

You should put all parameters in one string.

-
+  
You should put all parameters in one string.

+
 !define MUI_STARTMENUPAGE_NODISABLE ;No value
 !define MUI_FINISHPAGE_RUN "$INSTDIR\Application.exe" ;Value
 !define MUI_LICENSEPAGE_TEXT '"Text"' ;Text
 !define MUI_LICENSEPAGE_TEXT '"Text" "Buttontext"' ;Multiple texts
 !define MUI_INSTFILESPAGE_COLORS "FFFFFF 000000" ;Multiple settings
 

-  
If you want a certain value (i.e. a text) to be language-specific, set a language string (using LangString)
+  
If you want a certain value (i.e. a text) to be language-specific, set a language string (using LangString)
   and define $(STRINGNAME) as value. Use a license language string (LicenseLangString) for the license text.

-  
When adding " to a Modern UI string, you should always escape it ($\"),
+  
When adding " to a Modern UI string, you should always escape it ($\"),
   because the Modern UI macros use " to separate parameters. If you want to set texts like above you have to
   escape both " and ' (using $\" and $\').

-  
1. Header file

-  
!include "MUI.nsh"

-  
MUI.nsh is in the Include directory, so you don't have
+  
1. Header file

+  
!include "MUI.nsh"

+  
MUI.nsh is in the Include directory, so you don't have
   to specify a path.

-  
2. Interface Settings

-  
Page interface settings apply to all pages of a certain type.

-  
General Interface Settings

+  
2. Interface Settings

+  
Page interface settings apply to all pages of a certain type.

+  
General Interface Settings

   

-  
For UI elements that are enabled by default, the default value will be used when a setting
+  
For UI elements that are enabled by default, the default value will be used when a setting
   has not been defined.

-  
MUI_ICON icon_file

+  
MUI_ICON icon_file

   The icon of the installer.
Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico

-  
MUI_UNICON icon_file

+  
MUI_UNICON icon_file

   The icon of the uninstaller.
Default: ${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico

-  
MUI_HEADERIMAGE

-  Display an image on the header of page.

+  
MUI_HEADERIMAGE

+  Display an image on the header of a page.

   

-  
MUI_HEADERIMAGE_BITMAP bmp_file

-  Bitmap image to display on the header of the page (recommended size: 150x57 pixels).

+  
MUI_HEADERIMAGE_BITMAP bmp_file

+  Bitmap image to display on the header of installers pages (recommended size: 150x57 pixels).

   Default: ${NSISDIR}\Contrib\Graphics\Header\nsis.bmp

-  
MUI_HEADERIMAGE_RIGHT

-  Display the header image on the right side instead of the left side.

-  
MUI_HEADERIMAGE_NOSTRETCH

-  Do not stretch the header bitmap to fit the size of the field. Use this option only if you have an
+  
MUI_HEADERIMAGE_UNBITMAP bmp_file

+  Bitmap image to display on the header of uninstaller pages (recommended size: 150x57 pixels).

+  Default: Installer header bitmap

+  
MUI_HEADERIMAGE_NOSTRETCH

+  Do not stretch the installer header bitmap to fit the size of the field. Use this option only if you have an
   image that does not use the whole space. If you have a full size bitmap that fits exactly, you should
   not use this option because the size of the field will be different if the user has a custom DPI setting.

+  
MUI_HEADERIMAGE_UNNOSTRETCH

+  Do not stretch the uninstaller header bitmap to fit the size of the field. Use this option only if you have an
+  image that does not use the whole space. If you have a full size bitmap that fits exactly, you should
+  not use this option because the size of the field will be different if the user has a custom DPI setting.

+  
MUI_HEADERIMAGE_RIGHT

+  Display the header image on the right side instead of the left side.

   

-  
MUI_BGCOLOR (color: RRGGBBR hexadecimal)

+  
MUI_BGCOLOR (color: RRGGBBR hexadecimal)

   Background color for the header, Welcome- and Finish page.
Default: FFFFFF

   

-  
Interface Resource Settings

+  
Interface Resource Settings

   

-  
MUI_UI ui_file

+  
MUI_UI ui_file

   The interface file with the dialog resources. Change this if you have made your own customized UI.

   Default: ${NSISDIR}\Contrib\UIs\modern.exe

-  
MUI_UI_HEADERIMAGE ui_file

+  
MUI_UI_HEADERIMAGE ui_file

   The interface files with the dialog resource IDD_INST that contains a bitmap control and space for
   the header bitmap.

   Default: ${NSISDIR}\Contrib\UIs\modern-headerbmp.exe

-  
MUI_UI_HEADERIMAGE_RIGHT ui_file

+  
MUI_UI_HEADERIMAGE_RIGHT ui_file

   The interface files with the dialog resource IDD_INST that contains a bitmap control and space for
   the header bitmap on the right side.

   Default: ${NSISDIR}\Contrib\UIs\modern-headerbmpr.exe

-  
MUI_UI_COMPONENTSPAGE_SMALLDESC ui_file

+  
MUI_UI_COMPONENTSPAGE_SMALLDESC ui_file

   The interface files with a customized dialog resource IDD_SELCOM with a small description area.

   Default: {NSISDIR}\Contrib\UIs\modern-smalldesc.exe

-  
MUI_UI_COMPONENTSPAGE_NODESC ui_file

+  
MUI_UI_COMPONENTSPAGE_NODESC ui_file

   The interface files with a customized dialog resource IDD_SELCOM without a description area.

   Default: {NSISDIR}\Contrib\UIs\modern-nodesc.exe

   

-  
Welcome/Finish Page Interface Settings

+  
Welcome/Finish Page Interface Settings

   

-  
MUI_WELCOMEFINISHPAGE_3LINES

+  
MUI_WELCOMEFINISHPAGE_3LINES

   Create a bigger area for the title on the Welcome- and Finish page, to allow displaying 3 lines of text
   (with the default font).

-  
MUI_WELCOMEFINISHPAGE_BITMAP bmp_file

+  
MUI_WELCOMEFINISHPAGE_BITMAP bmp_file

   Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).

   Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp

   

-  
MUI_WELCOMEFINISHPAGE_NOSTRETCH

+  
MUI_WELCOMEFINISHPAGE_NOSTRETCH

   Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field.
   Use this option only if you have an image that does not use the whole space. If you have a full size
   bitmap that fits exactly, you should not use this option because the size of the field will be different
   if the user has a custom DPI setting.

   

   

-  
Welcome/Finish Page InstallOptions INI Settings

+  
Welcome/Finish Page InstallOptions INI Settings

   

-  
MUI_WELCOMEFINISHPAGE_INI ini_file

+  
MUI_WELCOMEFINISHPAGE_INI ini_file

   InstallOptions INI file for the Welcome- and Finish page.

   Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

-  
MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file

+  
MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file

   InstallOptions INI file for the Welcome- and Finish page with space for 3 lines of title text (with the default font).

   Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini

   

-  
Uninstaller Welcome/Finish Page InstallOptions INI Settings

+  
Uninstaller Welcome/Finish Page InstallOptions INI Settings

   

-  
MUI_UNWELCOMEFINISHPAGE_3LINES

+  
MUI_UNWELCOMEFINISHPAGE_3LINES

   Create a bigger area for the title on the uninstaller Welcome- and Finish page, to allow displaying 3 lines of text
   (with the default font).

-  
MUI_UNWELCOMEFINISHPAGE_BITMAP bmp_file

+  
MUI_UNWELCOMEFINISHPAGE_BITMAP bmp_file

   Bitmap for the Welcome- and Finish page (recommended size: 164x314 pixels).

   Default: ${NSISDIR}\Contrib\Graphics\Wizard\win.bmp

   

-  
MUI_UNWELCOMEFINISHPAGE_NOSTRETCH

+  
MUI_UNWELCOMEFINISHPAGE_NOSTRETCH

   Do not stretch the bitmap for the Welcome and Finish page to fit the size of the field.
   Use this option only if you have an image that does not use the whole space. If you have a full size
   bitmap that fits exactly, you should not use this option because the size of the field will be different
   if the user has a custom DPI setting.

   

   

-  
Uninstaller Welcome/Finish Page Interface INI File Settings

+  
Uninstaller Welcome/Finish Page Interface INI File Settings

   

-  
MUI_UNWELCOMEFINISHPAGE_INI ini_file

+  
MUI_UNWELCOMEFINISHPAGE_INI ini_file

   InstallOptions INI file for the uninstaller Welcome- and Finish page.

   Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial.ini

-  
MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file

+  
MUI_WELCOMEFINISHPAGE_INI_3LINES ini_file

   InstallOptions INI file for the Welcome- and Finish page with space for 3 lines of title text (with the default font).

   Default: ${NSISDIR}\Contrib\Modern UI\ioSpecial3.ini

   

-  
License Page Interface Settings

+  
License Page Interface Settings

   

-  
MUI_LICENSEPAGE_BGCOLOR 
+  
MUI_LICENSEPAGE_BGCOLOR 
   (/windows | /grey | (color: RRGGBB hexadecimal))

   The background color for the license textbox. Use /windows for the default text background (usually white).
   Use the /grey for the standard window background (usually grey).
Default: /windows

   

-  
Components Page Interface Settings

+  
Components Page Interface Settings

   

-  
MUI_COMPONENTSPAGE_CHECKBITMAP bitmap_file

+  
MUI_COMPONENTSPAGE_CHECKBITMAPbitmap_file

   The bitmap with images for the checks of the component select treeview.

   Default: ${NSISDIR}\Contrib\Graphics\Checks\modern.bmp

-  
MUI_COMPONENTSPAGE_SMALLDESC

+  
MUI_COMPONENTSPAGE_SMALLDESC

   A small description area on the bottom of the page. Use this layout
   if you have a lot of sections and don't need large descriptions.

-  
MUI_COMPONENTSPAGE_NODESC

+  
MUI_COMPONENTSPAGE_NODESC

   No description area.

   

-  
Installation Page Interface Settings

+  
Installation Page Interface Settings

   

-  
MUI_INSTFILESPAGE_COLORS (/windows |
+  
MUI_INSTFILESPAGE_COLORS (/windows |
   (foreground color: RRGGBB hexadecimal) (background color: RRGGBB hexadecimal))

   The colors of the details screen.

   Default: /windows

-  
MUI_INSTFILESPAGE_PROGRESSBAR ("" | colored | smooth)

+  
MUI_INSTFILESPAGE_PROGRESSBAR ("" | colored | smooth)

   The style of the progress bar. Colored makes it use the MUI_INSTALLCOLORS.

   Default: smooth

   

-  
Installer Finish Page Interface Settings

+  
Installer Finish Page Interface Settings

   

-  
MUI_FINISHPAGE_NOAUTOCLOSE

+  
MUI_FINISHPAGE_NOAUTOCLOSE

   Do not automatically jump to the finish page, to allow the user to
   check the install log.

   

-  
Uninstaller Finish Page Interface Settings

+  
Uninstaller Finish Page Interface Settings

   

-  
MUI_UNFINISHPAGE_NOAUTOCLOSE

+  
MUI_UNFINISHPAGE_NOAUTOCLOSE

   Do not automatically jump to the finish page, to allow the user to
   check the uninstall log.

   

-  
Abort Warning Settings

+  
Abort Warning Settings

   

-  
MUI_ABORTWARNING

+  
MUI_ABORTWARNING

   Show a message box with a warning when the user wants to close the installer.

   

-  
MUI_ABORTWARNING_TEXT text 

+  
MUI_ABORTWARNING_TEXT text 

   Texts to display on the abort warning messagebox.

   

   

-  
Uninstaller Abort Warning Settings

+  
Uninstaller Abort Warning Settings

   

-  
MUI_UNABORTWARNING

+  
MUI_UNABORTWARNING

   Show a message box with a warning when the user wants to close the uninstaller.

   

-  
MUI_UNABORTWARNING_TEXT text 

+  
MUI_UNABORTWARNING_TEXT text 

   Texts to display on the abort warning messagebox.

   

   

-  
3. Pages

-  
Insert the following macros to set the pages you want to use.
+  
3. Pages

+  
Insert the following macros to set the pages you want to use.
   The pages will appear in the order you insert them in your script.
   You can also insert custom Page commands between the macros to add custom pages.
   More info about custom pages...

-  
You can add multiple pages of certain types (for example, if you
+  
You can add multiple pages of certain types (for example, if you
   want the user to specify multiple folders).

-  
Examples:

-  
+  
Examples:

+  
 !insertmacro MUI_PAGE_LICENSE "License.rtf"
 !insertmacro MUI_PAGE_COMPONENTS

-  

-  Installer Pages

+  

+  Installer Pages

   MUI_PAGE_WELCOME

   MUI_PAGE_LICENSE text/rtf_file

   MUI_PAGE_COMPONENTS

@@ -343,8 +346,8 @@ will also help you to learn more about the Modern UI.

   MUI_PAGE_INSTFILES

   MUI_PAGE_FINISH
   

-  

-  Uninstaller Pages

+  

+  Uninstaller Pages

   MUI_UNPAGE_WELCOME

   MUI_UNPAGE_CONFIRM

   MUI_UNPAGE_LICENSE text/rtf_file

@@ -353,217 +356,217 @@ will also help you to learn more about the Modern UI.

   MUI_UNPAGE_INSTFILES

   MUI_UNPAGE_FINISH

   

-  
Page Settings

+  
Page Settings

   

-  
To configure a page, you can define the page settings before inserting a page macro.

-  
General Page Settings

+  
To configure a page, you can define the page settings before inserting a page macro.

+  
General Page Settings

   

-  
MUI_PAGE_HEADER_TEXT text 

+  
MUI_PAGE_HEADER_TEXT text 

   Text to display on the header of the page.

-  
MUI_PAGE_HEADER_SUBTEXT text 

+  
MUI_PAGE_HEADER_SUBTEXT text 

   Subtext to display on the header of the page.

   

-  
Welcome Page Settings

+  
Welcome Page Settings

   

-  
MUI_WELCOMEPAGE_TITLE title 

+  
MUI_WELCOMEPAGE_TITLE title 

   Title to display on the welcome page.

-  
MUI_WELCOMEPAGE_TEXT text 

+  
MUI_WELCOMEPAGE_TEXT text 

   Texts to display on the welcome page. Use \r\n for a newline.

   

-  
License Page Settings

+  
License Page Settings

   

-  
MUI_LICENSEPAGE_TEXT text [buttontext]

+  
MUI_LICENSEPAGE_TEXT text [buttontext]

   Texts to display on the license page. See syntax information about setting multiple texts.

-  
MUI_LICENSEPAGE_TEXT_TOP text

+  
MUI_LICENSEPAGE_TEXT_TOP text

   Text to display on the top of the license page.

-  
MUI_LICENSEPAGE_CHECKBOX

+  
MUI_LICENSEPAGE_CHECKBOX

   Display a checkbox the user has to check to agree with the license terms.

   

-  
MUI_LICENSEPAGE_CHECKBOX_TEXT text 

+  
MUI_LICENSEPAGE_CHECKBOX_TEXT text 

   Text to display next to the checkbox to agree with the license terms.

   

-  
MUI_LICENSEPAGE_RADIOBUTTONS

+  
MUI_LICENSEPAGE_RADIOBUTTONS

   Display two radiobuttons to allow the user to choose between accepting the
   license terms or not.

   

-  
MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT text 

+  
MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT text 

   Text to display next to the checkbox to accept the license terms.

-  
MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE text 

+  
MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE text 

   Text to display next to the checkbox to dicline the license terms.

   

   

-  
Components Page Settings

+  
Components Page Settings

   

-  
MUI_COMPONENTSPAGE_TEXT text [subtext] [subtext2]

+  
MUI_COMPONENTSPAGE_TEXT text [subtext] [subtext2]

   Texts to display on the components page. See syntax information about setting multiple texts.

-  
MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_TITLE text

+  
MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_TITLE text

   Text to display on the of the top of the description box.

- 
MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO text

+ 
MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO text

   Text to display inside the description box when no section is selected.

   

-  
Directory Page Settings

+  
Directory Page Settings

   

-  
MUI_DIRECTORYPAGE_TEXT text [subtext]

+  
MUI_DIRECTORYPAGE_TEXT text [subtext]

   Texts to display on the directory page. See syntax information about setting multiple texts.

-  
MUI_DIRECTORYPAGE_VARIABLE variable

+  
MUI_DIRECTORYPAGE_VARIABLE variable

   Variable in which to store the selected folder

   Default: $INSTDIR

   

-    
Start Menu Folder Page Settings

+  
Start Menu Folder Page Settings

   

-  
Put the code to write the shortcuts (using CreateShortcut) between this macros:

-
+  
Put the code to write the shortcuts (using CreateShortcut) between this macros:

+
 !insertmacro MUI_STARTMENU_WRITE_BEGIN
   ...create the shortcuts...
 !insertmacro MUI_STARTMENU_WRITE_END
 

-  
When using multiple Start Menu Folder pages, you should also undefine previous StartMenu page
+  
When using multiple Start Menu Folder pages, you should also undefine previous StartMenu page
   defines and define the values of the page of which you want to write the value, before inserting the
   MUI_STARTMENU_WRITE_BEGIN macro.

-  
MUI_STARTMENUPAGE_TEXT text 

+  
MUI_STARTMENUPAGE_TEXT text 

   Text to display on the Start Menu folder page.

-  
MUI_STARTMENUPAGE_TEXT_CHECKBOX text 

+  
MUI_STARTMENUPAGE_TEXT_CHECKBOX text 

   Text to display next to the checkbox to disable the Start Menu folder creation.

-  
MUI_STARTMENUPAGE_VARIABLE variable

+  
MUI_STARTMENUPAGE_VARIABLE variable

   Variable to store the current Start Menu Folder. Default is $MUI_STARTMENU_FOLDER.
   You cannot use this variable in your script (or you should Push/Pop it).

-  
MUI_STARTMENUPAGE_DEFAULTFOLDER folder

+  
MUI_STARTMENUPAGE_DEFAULTFOLDER folder

   The default Start Menu Folder.

-  
MUI_STARTMENUPAGE_NODISABLE

+  
MUI_STARTMENUPAGE_NODISABLE

   Do not display the checkbox to disable the creation of Start Menu
   shortcuts.

-  
MUI_STARTMENUPAGE_REGISTRY_ROOT root

-  MUI_STARTMENUPAGE_REGISTRY_KEY key

-  MUI_STARTMENUPAGE_REGISTRY_VALUENAME value_name

+  
MUI_STARTMENUPAGE_REGISTRY_ROOT root

+  MUI_STARTMENUPAGE_REGISTRY_KEY key

+  MUI_STARTMENUPAGE_REGISTRY_VALUENAME value_name

   The registry key to store the Start Menu folder. The page will use it to
   remember the users preference. You should also use it in the uninstaller to
   remove the Start Menu folders. Don't forget to remove this key in the
   uninstaller.

-  
In the uninstaller, use the MUI_STARTMENU_GETFOLDER macro to get the Start Menu folder:

-
+  
In the uninstaller, use the MUI_STARTMENU_GETFOLDER macro to get the Start Menu folder:

+
 !insertmacro MUI_STARTMENU_GETFOLDER $R0 ;You can also use another var
   Delete "$SMPROGRAMS\$R0\Your Shortcut.lnk"
 

-  
When using multiple Start Menu Folder pages, you should also undefine previous StartMenu page
+  
When using multiple Start Menu Folder pages, you should also undefine previous StartMenu page
   defines and define the values of the page of which you want to get the value, before inserting the
   MUI_STARTMENU_GETFOLDER macro.

   

-  
Installation Page Settings

+  
Installation Page Settings

   

-  
MUI_INSTFILESPAGE_FINISHHEADER_TEXT text 

+  
MUI_INSTFILESPAGE_FINISHHEADER_TEXT text 

   Text to display on the header of the installation page when the installation has been completed (won't be displayed when using
   a Finish page without MUI_FINISHPAGE_NOAUTOCLOSE).

-  
MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT text 

+  
MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT text 

   Subext to display on the header of the installation page when the installation has been completed (won't be displayed when using
   a Finish page without MUI_FINISHPAGE_NOAUTOCLOSE).

-  
MUI_INSTFILESPAGE_ABORTHEADER_TEXT text 

+  
MUI_INSTFILESPAGE_ABORTHEADER_TEXT text 

   Text to display on the header of the installation page when the installation has been aborted.

-  
MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT text 

+  
MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT text 

   Subext to display on the header of the installation page when the installation has been aborted.

   

-  
Finish Page Settings

+  
Finish Page Settings

   

-  
MUI_FINISHPAGE_TITLE title 

+  
MUI_FINISHPAGE_TITLE title 

   Title to display on the finish page.

-  
MUI_FINISHPAGE_TEXT text 

+  
MUI_FINISHPAGE_TEXT text 

   Texts to display on the finish page. Use \r\n for a newline.

-  
MUI_FINISHPAGE_BUTTON text 

+  
MUI_FINISHPAGE_BUTTON text 

   Text to display on the Finish button.

-  
MUI_FINISHPAGE_TEXT_REBOOT text 

+  
MUI_FINISHPAGE_TEXT_REBOOT text 

   Text to display on the finish page when asking for a sytem reboot. Use \r\n for a newline.

-  
MUI_FINISHPAGE_TEXT_REBOOTNOW text 

+  
MUI_FINISHPAGE_TEXT_REBOOTNOW text 

   Text to display next to the 'Reboot now' option button.

-  
MUI_FINISHPAGE_TEXT_REBOOTLATER text 

+  
MUI_FINISHPAGE_TEXT_REBOOTLATER text 

   Text to display next to the 'Reboot later' option button.

-  
MUI_FINISHPAGE_RUN exe_file

+  
MUI_FINISHPAGE_RUN exe_file

   Application which the user can select to run using a checkbox.
   You don't need to put quotes around the filename when it contains spaces.

   

-  
MUI_FINISHPAGE_RUN_TEXT text 

+  
MUI_FINISHPAGE_RUN_TEXT text 

   Texts to display next to the 'Run program' checkbox.

-  
MUI_FINISHPAGE_RUN_PARAMETERS parameters

+  
MUI_FINISHPAGE_RUN_PARAMETERS parameters

   Parameters for the application to run. Don't forget to escape double
   quotes in the value (use $\").

-  
MUI_FINISHPAGE_RUN_NOTCHECKED

+  
MUI_FINISHPAGE_RUN_NOTCHECKED

   Do not check the 'Run program' checkbox by default

-  
MUI_FINISHPAGE_RUN_FUNCTION function_name

+  
MUI_FINISHPAGE_RUN_FUNCTION function_name

   Call a function instead of executing an application (define MUI_FINISHPAGE_RUN without parameters).
   You can use the function to exectute multiple applications or you can change the checkbox name and
   use it for other things.

   

-  
MUI_FINISHPAGE_SHOWREADME file/url

+  
MUI_FINISHPAGE_SHOWREADME file/url

   File or website which the user can select to view using a checkbox.
   You don't need to put quotes around the filename when it contains spaces.

   

-  
MUI_FINISHPAGE_SHOWREADME_TEXT text 

+  
MUI_FINISHPAGE_SHOWREADME_TEXT text 

   Texts to display next to the 'Show Readme' checkbox.

-  
MUI_FINISHPAGE_SHOWREADME_NOTCHECKED

+  
MUI_FINISHPAGE_SHOWREADME_NOTCHECKED

   Do not check the 'Show Readme' checkbox by default

-  
MUI_FINISHPAGE_SHOWREADME_FUNCTION function_name

+  
MUI_FINISHPAGE_SHOWREADME_FUNCTION function_name

   Call a function instead of showing a file (define MUI_FINISHPAGE_SHOWREADME without parameters).
   You can use the function to show multiple files or you can change the checkbox name and
   use it for other things.

   

-  
MUI_FINISHPAGE_LINK link_text

+  
MUI_FINISHPAGE_LINK link_text

   Text for a link on the which the user can click to view a website or file.

   

-  
MUI_FINISHPAGE_LINK_LOCATION file/url

+  
MUI_FINISHPAGE_LINK_LOCATION file/url

   Website or file which the user can select to view using the link.
   You don't need to put quotes around the filename when it contains spaces.

-  
MUI_FINISHPAGE_LINK_COLOR (color: 0xBBGGRR hexadecimal)

+  
MUI_FINISHPAGE_LINK_COLOR (color: 0xBBGGRR hexadecimal)

   Text color for the link on the Finish page.
Default: 0x800000

   

-  
MUI_FINISHPAGE_NOREBOOTSUPPORT

+  
MUI_FINISHPAGE_NOREBOOTSUPPORT

   Disables support for the page that allows the user to reboot the system.
   Define this option to save some space if you are not using the /REBOOTOK
   flag or SetRebootFlag.

   

-  
Uninstall Confirm Page Settings

+  
Uninstall Confirm Page Settings

   

-  
MUI_UNCONFIRMPAGE_TEXT text [subtext]

+  
MUI_UNCONFIRMPAGE_TEXT text [subtext]

   Texts to display on the uninstall confirm page. See syntax information about setting multiple texts.

   

-  
Advanced Page Settings

+  
Advanced Page Settings

   

-  
You can add your custom code to the page functions of Modern UI pages.
+  
You can add custom code to the page functions of your Modern UI pages.
   More info...

   

   

-  
4. Custom functions

-  
If you want add your own code to functions inserted by the
+  
4. Custom functions

+  
If you want add your own code to functions inserted by the
   Modern UI (i.e. the .onGUIInit function and the page functions), create your
   own function and let the Modern UI functions call them.

-  
More info...

-  
5. Language files

-  
Insert the Modern UI language files for the languages to want to include.

-  
!insertmacro MUI_LANGUAGE "English"

-  
The Modern UI language files load the NLF language files,
+  
More info...

+  
5. Language files

+  
Insert the Modern UI language files for the languages to want to include.

+  
!insertmacro MUI_LANGUAGE "English"

+  
The Modern UI language files load the NLF language files,
   so you should not use LoadLanguageFile.

-  
Language Selection Dialog

+  
Language Selection Dialog

   

-  
If you want the installer to display a  language selection dialog
+  
If you want the installer to display a  language selection dialog
   (have a look at the 
   MultiLanguage.nsi example), insert the MUI_LANGDLL_DISPLAY macro in the .onInit function.

-
+
 Function .onInit
 
   !insertmacro MUI_LANGDLL_DISPLAY
 
 FunctionEnd
 

-  
Language Selection Dialog Settings

+  
Language Selection Dialog Settings

   

-  
To remember to users preference, you can define a registry key.

-  Note: These defines should be set before inserting the instfiles page macro.

-  
MUI_LANGDLL_REGISTRY_ROOT root

-  MUI_LANGDLL_REGISTRY_KEY key

-  MUI_LANGDLL_REGISTRY_VALUENAME value_name

+  
To remember to users preference, you can define a registry key.

+  Note: These defines should be set before inserting the instfiles page macro.

+  
MUI_LANGDLL_REGISTRY_ROOT root

+  MUI_LANGDLL_REGISTRY_KEY key

+  MUI_LANGDLL_REGISTRY_VALUENAME value_name

   The registry key to store the language. The users preference will be remembered.
   You can also use it in the uninstaller to display the right language. Don't forget
   to remove this key in the uninstaller.

-  
In the uninstaller, insert the MUI_UNGETLANGUAGE macro in un.onInit to get the stored language
+  
In the uninstaller, insert the MUI_UNGETLANGUAGE macro in un.onInit to get the stored language
   preference.

-
+
 Function un.onInit
 
   !insertmacro MUI_UNGETLANGUAGE
@@ -571,48 +574,48 @@ Function un.onInit
 FunctionEnd
 

   

-  
Language Selection Dialog Interface Settings

+  
Language Selection Dialog Interface Settings

   

-  
To customize the language selection dialog interface, use these defines before inserting
+  
To customize the language selection dialog interface, use these defines before inserting
   the MUI_LANGDLL_DISPLAY macro.

-  
MUI_LANGDLL_WINDOWTITLE text

+  
MUI_LANGDLL_WINDOWTITLE text

   The window title of the language selection dialog.

-  
MUI_LANGDLL_INFO text

+  
MUI_LANGDLL_INFO text

   The text to display on the language selection dialog.

-  
MUI_LANGDLL_ALWAYSSHOW

+  
MUI_LANGDLL_ALWAYSSHOW

   Always show the language selection dialog, even if a language has been stored in the registry.
   The language stored in the registry will be selected by default.

   

   

-  
6. Reserve files

-  
If you are using BZIP2 (solid) compression, it's important that
+  
6. Reserve files

+  
If you are using BZIP2 (solid) compression, it's important that
 files which are being extracted in init- or page functions function are located
 before other files in the data block, because this will make your installer faster.

-
If there are File commands in your sections or functions above
+
If there are File commands in your sections or functions above
 the init- or page functions, add the reserve file macros above your sections and
 functions.

-
ReserveFile "ioFile.ini" ;Your own InstallOptions INI files
+
ReserveFile "ioFile.ini" ;Your own InstallOptions INI files
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ;InstallOptions plug-in
 !insertmacro MUI_RESERVEFILE_LANGDLL ;Language selection dialog
 

-  
7. Your own sections and functions

-  
Add your installer sections and functions.
+  
7. Your own sections and functions

+  
Add your installer sections and functions.
   See the NSIS Users Manual for details.

-  
8. Descriptions for the sections

-  
The descriptions of sections will be displayed on the
+  
8. Descriptions for the sections

+  
The descriptions of sections will be displayed on the
   components page, when the user hovers the mouse over a section.
   If you don't want to use descriptions, use the MUI_COMPONENTSPAGE_NODESC
   setting.

-  
To set a description for a section, you have to add an
+  
To set a description for a section, you have to add an
   additional parameter to the Section commmand with a name for the define
   that should contain the section number.

-
+
 Section "Section Name 1" Section1
    ...
 SectionEnd
 

-
Use these macros to set the descriptions:

-
+
Use these macros to set the descriptions:

+
 LangString DESC_Section1 ${LANG_ENGLISH} "Description of section 1."
 LangString DESC_Section2 ${LANG_ENGLISH} "Description of section 2."
 
@@ -621,9 +624,9 @@ LangString DESC_Section2 ${LANG_ENGLISH} "Description of section 2."
   !insertmacro MUI_DESCRIPTION_TEXT ${Section2} $(DESC_Section2)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 

-
For the uninstaller, use the MUI_UNFUNCTION_DESCRIPTION_BEGIN
+
For the uninstaller, use the MUI_UNFUNCTION_DESCRIPTION_BEGIN
 and MUI_UNFUNCTIONS_DESCRIPTION_END macros

-
+
 ReserveFile "ioFile.ini" ;Your own InstallOptions INI files
 ReserveFile "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp" ;Your header bitmap
 
@@ -631,11 +634,11 @@ ReserveFile "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp" ;Your header bitmap
 !insertmacro MUI_RESERVEFILE_LANGDLL ;LangDLL (language selection dialog)
 !insertmacro MUI_RESERVEFILE_STARTMENU ;Start Menu Folder page
 

-
Custom pages

-
Custom page commands

-
If you want add custom pages to your installer, you should insert your
+
Custom pages

+
Custom page commands

+
If you want add custom pages to your installer, you should insert your
 own page commands between the page macros.

-
+
 !insertmacro MUI_PAGE_WELCOME
 Page custom FunctionName ;Custom page
 !insertmacro MUI_PAGE_COMPONENTS
@@ -645,30 +648,30 @@ Page custom FunctionName ;Custom page
 UninstPage custom un.FunctionName ;Custom page
 !insertmacro MUI_UNPAGE_INSTFILES
 

-
Call InstallOptions

-
InstallOptions is a plug-in that displays custom pages that you can create
+
Call InstallOptions

+
InstallOptions is a plug-in that displays custom pages that you can create
 using INI files.

-
Have a look at the 
+
Have a look at the 
 InstallOptions documentation for info about creating InstallOptions INI files.

-
First, you have to extract your InstallOptions INI File in the .onInit function
+
First, you have to extract your InstallOptions INI File in the .onInit function
 (un.onInit for the uninstaller) using the MUI_INSTALLOPTIONS_EXTRACT macro.

-
+
 Function .onInit
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioFile.ini"
 FunctionEnd
 

-
If your INI File is located in another directory, use MUI_INSTALLOPTIONS_EXTRACT_AS.
+
If your INI File is located in another directory, use MUI_INSTALLOPTIONS_EXTRACT_AS.
 The second parameter is the filename for the temporary plug-ins directory, use this filename as
 parameter for the other InstallOptions macros.

-
+
 Function .onInit
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "..\ioFile.ini" "ioFile.ini"
 FunctionEnd
 

-
You can call Instal Options in the function defined with the Page
+
You can call Instal Options in the function defined with the Page
 or UninstPage command using the MUI_INSTALLOPTIONS_DISPLAY macro.
 Use the MUI_HEADER_TEXT macro to set the text in the white box.

-
+
 LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page Title"
 LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "A subtitle"
 
@@ -677,9 +680,9 @@ Function FunctionName ;FunctionName defined with Page command
   !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioFile.ini"
 FunctionEnd
 

-
For custom fonts and colors, macros for the initDialog and show
+
For custom fonts and colors, macros for the initDialog and show
 functions of InstallOptions are also available.

-
+
 Var HWND
 Var DLGITEM
 Var FONT
@@ -704,47 +707,47 @@ Function FunctionName ;FunctionName defined with Page command
 
 FunctionEnd
 

-
If you need the InstallOptions return value (success, back, cancel, error),
+
If you need the InstallOptions return value (success, back, cancel, error),
 use the MUI_INSTALLOPTIONS_DISPLAY_RETURN or MUI_INSTALLOPTIONS_SHOW_RETURN macro. The
 return value will be added to the stack, so you can use the Pop command to get it.

-
Use these macros to read or write INI file values.

-
+
Use these macros to read or write INI file values.

+
 !insertmacro MUI_INSTALLOPTIONS_READ $VAR "ioFile.ini" "Field #" "Value Name"
 !insertmacro MUI_INSTALLOPTIONS_WRITE "ioFile.ini" "Field #" "Value Name" "Value"
 

-
For example, you can use the MUI_INSTALLOPTIONS_READ macro in a section
+
For example, you can use the MUI_INSTALLOPTIONS_READ macro in a section
 to get the user input:

-
!insertmacro MUI_INSTALLOPTIONS_READ $R0 "ioFile.ini" "Field 1" "State"

-
For more details about InstallOptions, validation of user input etc., check the
+
!insertmacro MUI_INSTALLOPTIONS_READ $R0 "ioFile.ini" "Field 1" "State"

+
For more details about InstallOptions, validation of user input etc., check the
 InstallOptions documentation.

-
Examples

-
Basic: Basic.nsi

+
Examples

+
Basic: Basic.nsi

   Welcome/Finish page: WelcomeFinish.nsi

   Multilanguage: MultiLanguage.nsi

-  Header bitmap: HeaderBitmap.nsi

+  Header image: HeaderBitmap.nsi

   Custom pages: InstallOptions.nsi

   Start Menu Folder page: StartMenu.nsi

   

-
Customize the dialogs

-  
To change elements on the dialogs, use customized UI resource files
+
Customize the dialogs

+  
To change elements on the dialogs, use customized UI resource files
   (see Interface settings). You can change your copies of the original files (in the
   Contrib\UIs folder) by using an application such as
   Resource Hacker.

-  
The 'Please wait while Setup is loading...' text on the splash
+  
The 'Please wait while Setup is loading...' text on the splash
   screen that is being displayed while the installer is starting (Verifying installer,
   Unpacking data) can be changed by using a customized UI resource file (MUI_UI setting)
   with a modified dialog 111.

   The 'Verifying installer' and 'Unpacking data' texts are defined in the language header
   file of the NSIS exehead (Source\exehead\lang.h). To change them, you have to edit this
   file and recompile NSIS.

-  
To modify the Welcome- and Finish dialog, use a custom INI file
+  
To modify the Welcome- and Finish dialog, use a custom INI file
   (MUI_SPECIALINI setting) or write to the INI file in the custom page functions.

-  
Customize Modern UI Functions

-  
If you want add your own code to functions
+  
Customize Modern UI Functions

+  
If you want add your own code to functions
   inserted by the Modern UI, such as the .onGUIInit function and the Page functions,
   create your own function and let the Modern UI functions call them. Use the defines
   to define the name of your functions.

- 
Example:

+ 
Example:

 
 !define MUI_CUSTOMFUNCTION_GUIINIT myGuiInit
 
@@ -752,21 +755,21 @@ Function myGUIInit
   ...your own code...
 FunctionEnd
 

-  
General Custom Functions

+  
General Custom Functions

   

-  
These defines should be set before inserting a the language macros.

-  
MUI_CUSTOMFUNCTION_GUIINIT function 

-  MUI_CUSTOMFUNCTION_UNGUIINIT function 

-  MUI_CUSTOMFUNCTION_ABORT function 

-  MUI_CUSTOMFUNCTION_UNABORT function 

+  
These defines should be set before inserting a the language macros.

+  
MUI_CUSTOMFUNCTION_GUIINIT function 

+  MUI_CUSTOMFUNCTION_UNGUIINIT function 

+  MUI_CUSTOMFUNCTION_ABORT function 

+  MUI_CUSTOMFUNCTION_UNABORT function 

   

-  
Page Custom Functions

+  
Page Custom Functions

   

-  
These defines should be set before inserting a page macro.

-  
MUI_PAGE_CUSTOMFUNCTION_PRE function 

-  MUI_PAGE_CUSTOMFUNCTION_SHOW function 

-  MUI_PAGE_CUSTOMFUNCTION_LEAVE function 

-  
Notes:

+  
These defines should be set before inserting a page macro.

+  
MUI_PAGE_CUSTOMFUNCTION_PRE function 

+  MUI_PAGE_CUSTOMFUNCTION_SHOW function 

+  MUI_PAGE_CUSTOMFUNCTION_LEAVE function 

+  
Notes:

   
    
   
  • The StartMenu page does not have a Show function
    • 
   
  • In the Pre function of the Welcome- and Finish page, you can write to the InstallOptions INI file
@@ -774,9 +777,9 @@ FunctionEnd
   
  • In the Show function of Welcome- and Finish page, $MUI_HWND contains the HWND of the inner dialog
    • 
   

   

-
Version history

+
Version history

 
    
-
  • 1.67 - October 27, 2003
+
  • 1.67 - November 7, 2003
   
      
     
    • Support for uninstaller Welcome- and Finish pages
      • 
     
    • Renamed a few settings
      • 
@@ -784,6 +787,9 @@ FunctionEnd
     
    • Support for uninstaller abort warning
      • 
     
    • Setting for 3 line text on Welcome- and Finish page
      • 
     
    • Langauge file backwards compatibility: English for missing strings
      • 
+    
    • Support for different uninstaller header image
      • 
+    
    • Language selection dialog not displayed if installer is silent
      • 
+    
    • Cancel button on Finish page when there are options
      • 
   
    • 
 

 
    
@@ -820,7 +826,7 @@ FunctionEnd
     when mouse is outside box, disabled style
   

 
-

+

 
    
 
  • 1.64 - April 27, 2003
   
      
@@ -836,17 +842,17 @@ FunctionEnd
     
    • More texts can be customized
      • 
   
    • 
 

-  
Complete version history

-  
Credits

-  
Made by Joost Verburg.

+  
Complete version history

+
Credits

+  
Made by Joost Verburg.

     Icons designed by Nikos Adamamas, aka adni18.

     Thanks to Amir Szekely, aka KiCHiK, for his work on NSIS 
     to make this possible.

-  
Help

-  
Please post questions at the
+
Help

+  
Please post questions at the
   NSIS Forum.

-  
License

-
Copyright © 2002-2003 Joost Verburg
+
License

+
Copyright © 2002-2003 Joost Verburg
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
diff --git a/Contrib/Modern UI/Readme.jpg b/Contrib/Modern UI/Readme.jpg
deleted file mode 100644
index 62837d14..00000000
Binary files a/Contrib/Modern UI/Readme.jpg and /dev/null differ
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 857f4a42..3d190fa6 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -11,26 +11,54 @@
 !echo "NSIS Modern User Interface version 1.67 - © 2002-2003 Joost Verburg"
 
 ;--------------------------------
-;DECLARES
 
-!ifndef MUI_MANUALVERBOSE
-  !verbose 3
-!endif
+!verbose 3
 
 !ifndef MUI_INCLUDED
 
 !define MUI_INCLUDED
 
+;--------------------------------
+;HEADER FILES, DECLARATIONS
+
 !include "WinMessages.nsh"
 
 Var MUI_TEMP1
 Var MUI_TEMP2
 
 ;--------------------------------
-;INTERFACE
+;INSERT CODE
+
+!macro MUI_INSERT
+  
+  !ifdef MUI_PRODUCT | MUI_VERSION
+    !warning "The MUI_PRODUCT and MUI_VERSION defines have been removed. Use a normal Name command now."
+  !endif
+  
+  !ifndef MUI_INSERT_INTERFACE
+    !insertmacro MUI_INTERFACE
+    !define MUI_INSERT_INTERFACE
+  !endif
+  
+  !insertmacro MUI_FUNCTION_GUIINIT
+  !insertmacro MUI_FUNCTION_ABORTWARNING
+  
+  !ifdef MUI_UNINSTALLER
+    !insertmacro MUI_UNFUNCTION_GUIINIT
+    !insertmacro MUI_FUNCTION_UNABORTWARNING
+  !endif
+  
+!macroend
+
+;--------------------------------
+;INTERFACE - COMPILE TIME SETTINGS
 
 !macro MUI_INTERFACE
   
+  !ifdef MUI_INSERT_NSISCONF
+    !insertmacro MUI_NSISCONF
+  !endif
+  
   !ifndef MUI_UI
     !define MUI_UI "${NSISDIR}\Contrib\UIs\modern.exe"
   !endif
@@ -107,6 +135,14 @@ Var MUI_TEMP2
     !ifndef MUI_HEADERIMAGE_BITMAP
       !define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
     !endif
+    !ifndef MUI_HEADERIMAGE_UNBITMAP
+      !define MUI_HEADERIMAGE_UNBITMAP "${MUI_HEADERIMAGE_BITMAP}"
+      !ifdef MUI_HEADERIMAGE_NOSTRETCH
+        !ifndef MUI_HEADERIMAGE_UNNOSTRETCH
+          !define MUI_HEADERIMAGE_UNNOSTRETCH
+        !endif
+      !endif
+    !endif
   !endif
 
   XPStyle On
@@ -135,6 +171,9 @@ Var MUI_TEMP2
   
 !macroend
 
+;--------------------------------
+;INTERFACE - RUN-TIME
+
 !macro MUI_INNERDIALOG_TEXT CONTROL TEXT
 
   !verbose push
@@ -288,8 +327,8 @@ Var MUI_TEMP2
 
 !macro MUI_GUIINIT
   
-  !insertmacro MUI_WELCOMEFINISHPAGE_INIT
-  !insertmacro MUI_HEADERIMAGE_INIT
+  !insertmacro MUI_WELCOMEFINISHPAGE_INIT ""
+  !insertmacro MUI_HEADERIMAGE_INIT ""
 
   !insertmacro MUI_GUIINIT_BASIC
   
@@ -297,10 +336,10 @@ Var MUI_TEMP2
 
 !macro MUI_UNGUIINIT
 
-  !insertmacro MUI_UNWELCOMEFINISHPAGE_INIT
-  !insertmacro MUI_HEADERIMAGE_INIT
+  !insertmacro MUI_WELCOMEFINISHPAGE_INIT "UN"
+  !insertmacro MUI_HEADERIMAGE_INIT "UN"
 
-  !insertmacro MUI_UNGUIINIT_BASIC
+  !insertmacro MUI_GUIINIT_BASIC
   
   !ifndef MUI_UNFINISHPAGE_NOAUTOCLOSE
     SetAutoClose true
@@ -332,44 +371,20 @@ Var MUI_TEMP2
 
 !macroend
 
-!macro MUI_UNGUIINIT_BASIC
+!macro MUI_WELCOMEFINISHPAGE_INIT UNINSTALLER
 
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037
-  CreateFont $MUI_TEMP2 "$(MUI_FONT)" "$(MUI_FONTSIZE)" "700"
-  SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
-  SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
-
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1038
-  SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
-
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1034
-  SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
-
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1039
-  SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
-  
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
-  SetCtlColors $MUI_TEMP1 /BRANDING
-  GetDlgItem $MUI_TEMP1 $HWNDPARENT 1256
-  SetCtlColors $MUI_TEMP1 /BRANDING
-  SendMessage $MUI_TEMP1 ${WM_SETTEXT} 0 "STR:$(^Branding) "
-
-!macroend
-
-!macro MUI_WELCOMEFINISHPAGE_INIT
-
-  !ifdef MUI_WELCOMEPAGE | MUI_FINISHPAGE
+  !ifdef MUI_${UNINSTALLER}WELCOMEPAGE | MUI_${UNINSTALLER}FINISHPAGE
   
     !ifndef MUI_WELCOMEFINISHPAGE_3LINES
-      !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
+      !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
     !else
-      !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_WELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini"
+      !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini"
     !endif
-    File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_WELCOMEFINISHPAGE_BITMAP}"
+    File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_${UNINSTALLER}WELCOMEFINISHPAGE_BITMAP}"
     
     !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
     
-    !ifdef MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
+    !ifdef MUI_${UNINSTALLER}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
       !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Flags" ""
     !endif
     
@@ -377,53 +392,155 @@ Var MUI_TEMP2
 
 !macroend
 
-!macro MUI_UNWELCOMEFINISHPAGE_INIT
-
-  !ifdef MUI_UNWELCOMEPAGE | UNMUI_FINISHPAGE
-
-    !ifndef MUI_UNWELCOMEFINISHPAGE_3LINES
-      !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI}" "ioSpecial.ini"
-    !else
-      !insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "${MUI_UNWELCOMEFINISHPAGE_INI_3LINES}" "ioSpecial.ini"
-    !endif
-    File "/oname=$PLUGINSDIR\modern-wizard.bmp" "${MUI_UNWELCOMEFINISHPAGE_BITMAP}"
-    
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Text" "$PLUGINSDIR\modern-wizard.bmp"
-    
-    !ifdef MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH
-      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Field 1" "Flags" ""
-    !endif
-    
-  !endif
-
-!macroend
-
-
-!macro MUI_HEADERIMAGE_INIT
+!macro MUI_HEADERIMAGE_INIT UNINSTALLER
 
   !ifdef MUI_HEADERIMAGE
+  
     InitPluginsDir
-    File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_BITMAP}"
-    !ifndef MUI_HEADERIMAGE_NOSTRETCH
+    File "/oname=$PLUGINSDIR\modern-header.bmp" "${MUI_HEADERIMAGE_${UNINSTALLER}BITMAP}"
+    
+    !ifndef MUI_HEADERIMAGE_${UNINSTALLER}NOSTRETCH
       SetBrandingImage /IMGID=1046 /RESIZETOFIT "$PLUGINSDIR\modern-header.bmp"
     !else
       SetBrandingImage /IMGID=1046 "$PLUGINSDIR\modern-header.bmp"
     !endif
+    
   !endif
 
 !macroend
 
-!macro MUI_LANGUAGE LANGUAGE
+;--------------------------------
+;INTERFACE - FUNCTIONS
+
+!macro MUI_FUNCTION_GUIINIT
+
+  Function .onGUIInit
+     
+    !insertmacro MUI_GUIINIT
+    
+    !ifdef MUI_CUSTOMFUNCTION_GUIINIT
+      Call "${MUI_CUSTOMFUNCTION_GUIINIT}"
+    !endif
+
+  FunctionEnd
+
+!macroend
+
+!macro MUI_FUNCTION_DESCRIPTION_BEGIN
 
   !verbose push
   !verbose 3
   
-  !include "${NSISDIR}\Contrib\Modern UI\Language files\${LANGUAGE}.nsh"
+  !ifndef MUI_VAR_TEXT
+    Var MUI_TEXT
+    !define MUI_VAR_TEXT
+  !endif
+
+  Function .onMouseOverSection
+    !insertmacro MUI_DESCRIPTION_BEGIN
   
   !verbose pop
   
 !macroend
 
+!macro MUI_FUNCTION_DESCRIPTION_END
+
+  !verbose push
+  !verbose 3
+
+    !insertmacro MUI_DESCRIPTION_END
+  FunctionEnd
+
+  !verbose pop
+  
+!macroend
+
+!macro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+
+  !verbose push
+  !verbose 3
+
+  Function un.onMouseOverSection
+    !insertmacro MUI_DESCRIPTION_BEGIN
+  
+  !verbose pop
+  
+!macroend
+
+!macro MUI_UNFUNCTION_DESCRIPTION_END
+
+  !verbose push
+  !verbose 3
+
+    !insertmacro MUI_DESCRIPTION_END
+  FunctionEnd
+
+  !verbose pop
+  
+!macroend
+
+!macro MUI_FUNCTION_ABORTWARNING
+
+  Function .onUserAbort
+    !ifdef MUI_ABORTWARNING
+      !insertmacro MUI_ABORTWARNING
+    !endif
+    !ifdef MUI_CUSTOMFUNCTION_ABORT
+      Call "${MUI_CUSTOMFUNCTION_ABORT}"
+    !endif
+  FunctionEnd
+
+!macroend
+
+!macro MUI_FUNCTION_UNABORTWARNING
+
+  Function un.onUserAbort
+    !ifdef MUI_UNABORTWARNING
+      !insertmacro MUI_UNABORTWARNING
+    !endif
+    !ifdef MUI_CUSTOMFUNCTION_UNABORT
+      Call "${MUI_CUSTOMFUNCTION_UNABORT}"
+    !endif
+  FunctionEnd
+
+!macroend
+
+!macro MUI_UNFUNCTION_GUIINIT
+  
+  Function un.onGUIInit
+  
+  !insertmacro MUI_UNGUIINIT
+  
+  !ifdef MUI_CUSTOMFUNCTION_UNGUIINIT
+    Call "${MUI_CUSTOMFUNCTION_UNGUIINIT}"
+  !endif
+  
+  FunctionEnd
+
+!macroend
+
+!macro MUI_FUNCTIONS_DESCRIPTION_BEGIN
+
+  ;1.65 compatibility
+
+  !warning "Modern UI macro name has changed. Please change MUI_FUNCTIONS_DESCRIPTION_BEGIN to MUI_FUNCTION_DESCRIPTION_BEGIN."
+
+  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  
+!macroend
+
+!macro MUI_FUNCTIONS_DESCRIPTION_END
+
+  ;1.65 compatibility
+
+  !warning "Modern UI macro name has changed. Please change MUI_FUNCTIONS_DESCRIPTION_END to MUI_FUNCTION_DESCRIPTION_END."
+
+  !insertmacro MUI_FUNCTION_DESCRIPTION_END
+  
+!macroend
+
+;--------------------------------
+;START MENU FOLDER
 
 !macro MUI_STARTMENU_GETFOLDER VAR
 
@@ -483,89 +600,8 @@ Var MUI_TEMP2
 
 !macroend
 
-!macro MUI_LANGDLL_DISPLAY
-
-  !verbose push
-  !verbose 3
-
-  !ifdef NSIS_CONFIG_SILENT_SUPPORT
-    IfSilent mui.langdll_done
-  !endif
-
-  !ifndef MUI_LANGDLL_WINDOWTITLE
-    !define MUI_LANGDLL_WINDOWTITLE "Installer Language"
-  !endif
-
-  !ifndef MUI_LANGDLL_INFO
-    !define MUI_LANGDLL_INFO "Please select a language."
-  !endif
-  
-  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
-    
-    ReadRegStr $MUI_TEMP1 "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
-    StrCmp $MUI_TEMP1 "" mui.langdll_show
-      StrCpy $LANGUAGE $MUI_TEMP1
-      !ifndef MUI_LANGDLL_ALWAYSSHOW
-        Goto mui.langdll_done
-      !endif
-    mui.langdll_show:
-  
-  !endif
-  
-  LangDLL::LangDialog "${MUI_LANGDLL_WINDOWTITLE}" "${MUI_LANGDLL_INFO}" A ${MUI_LANGDLL_PUSHLIST} ""
-
-  Pop $LANGUAGE
-  StrCmp $LANGUAGE "cancel" 0 +2
-    Abort
-  
-  !ifdef NSIS_CONFIG_SILENT_SUPPORT
-    mui.langdll_done:
-  !else ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
-    mui.langdll_done:
-  !endif
-    
-  !verbose pop
-    
-!macroend
-
-!macro MUI_LANGDLL_SAVELANGUAGE
-
-  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
-    WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
-  !endif
-  
-!macroend
-
-!macro MUI_UNGETLANGUAGE
-
-  !verbose pop
-
-  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
-  
-    ReadRegStr $MUI_TEMP1 "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
-    StrCmp $MUI_TEMP1 "" 0 mui.ungetlanguage_setlang
-  
-  !endif
-    
-  !insertmacro MUI_LANGDLL_DISPLAY
-      
-  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
-  
-    Goto mui.ungetlanguage_done
-   
-    mui.ungetlanguage_setlang:
-      StrCpy $LANGUAGE $MUI_TEMP1
-        
-    mui.ungetlanguage_done:
-
-  !endif
-  
-  !verbose pop
-
-!macroend
-
 ;--------------------------------
-;PAGE COMMANDS
+;PAGES
 
 !macro MUI_PAGE_INIT
 
@@ -967,121 +1003,9 @@ Var MUI_TEMP2
 !macroend
 
 ;--------------------------------
-;INSTALL OPTIONS
+;PAGE FUNCTIONS
 
-!macro MUI_INSTALLOPTIONS_EXTRACT FILE
-
-  !verbose push
-  !verbose 3
-
-  InitPluginsDir
-
-  File "/oname=$PLUGINSDIR\${FILE}" "${FILE}"
-  
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "RTL" "$(^RTL)"
-
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_EXTRACT_AS FILE FILENAME
-
-  !verbose push
-  !verbose 3
-
-  InitPluginsDir
-
-  File "/oname=$PLUGINSDIR\${FILENAME}" "${FILE}"
-  
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILENAME}" "Settings" "RTL" "$(^RTL)"
-  
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_DISPLAY FILE
-
-  !verbose push
-  !verbose 3
-  
-  InstallOptions::dialog "$PLUGINSDIR\${FILE}"
-  Pop $MUI_TEMP1
-
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_DISPLAY_RETURN FILE
-
-  !verbose push
-  !verbose 3
-  
-  InstallOptions::dialog "$PLUGINSDIR\${FILE}"
-
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_INITDIALOG FILE
-
-  !verbose push
-  !verbose 3
-  
-  InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\${FILE}"
-
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_SHOW
-
-  !verbose push
-  !verbose 3
-
-  InstallOptions::show
-  Pop $MUI_TEMP1
-
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_SHOW_RETURN
-
-  !verbose push
-  !verbose 3
-  
-  InstallOptions::show
-
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_READ VAR FILE SECTION KEY
-
-  !verbose push
-  !verbose 3
-
-  ReadIniStr ${VAR} "$PLUGINSDIR\${FILE}" "${SECTION}" "${KEY}"
-
-  !verbose pop
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_WRITE FILE SECTION KEY VALUE
-
-  !verbose push
-  !verbose 3
-
-  WriteIniStr "$PLUGINSDIR\${FILE}" "${SECTION}" "${KEY}" "${VALUE}"
-
-  !verbose pop
-
-!macroend
-
-;--------------------------------
-;FUNCTIONS
-
-!macro MUI_FUNCTION_CUSTOM TYPE
+!macro MUI_PAGE_FUNCTION_CUSTOM TYPE
 
   !ifdef MUI_PAGE_CUSTOMFUNCTION_${TYPE}
     Call "${MUI_PAGE_CUSTOMFUNCTION_${TYPE}}"
@@ -1090,20 +1014,6 @@ Var MUI_TEMP2
   
 !macroend
 
-!macro MUI_FUNCTION_GUIINIT
-
-  Function .onGUIInit
-     
-    !insertmacro MUI_GUIINIT
-    
-    !ifdef MUI_CUSTOMFUNCTION_GUIINIT
-      Call "${MUI_CUSTOMFUNCTION_GUIINIT}"
-    !endif
-
-  FunctionEnd
-
-!macroend
-
 !macro MUI_FUNCTION_WELCOMEPAGE PRE LEAVE
 
   !ifndef MUI_VAR_HWND
@@ -1130,7 +1040,7 @@ Var MUI_TEMP2
       !undef MUI_WELCOMEPAGE_TEXT
     !endif
 
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
     
     GetDlgItem $MUI_TEMP1 $HWNDPARENT 1028
     ShowWindow $MUI_TEMP1 ${SW_HIDE}
@@ -1166,7 +1076,7 @@ Var MUI_TEMP2
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1200
     SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
 
-    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
   
     !insertmacro MUI_INSTALLOPTIONS_SHOW
      
@@ -1192,7 +1102,7 @@ Var MUI_TEMP2
   
   Function "${LEAVE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
   
   FunctionEnd
   
@@ -1202,7 +1112,7 @@ Var MUI_TEMP2
 
   Function "${PRE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
     !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_LICENSE_TITLE) $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_LICENSE_SUBTITLE)
     
   FunctionEnd
@@ -1215,13 +1125,13 @@ Var MUI_TEMP2
       !insertmacro MUI_INNERDIALOG_TEXT 1040 "${MUI_LICENSEPAGE_TEXT_TOP}"
       !undef MUI_LICENSEPAGE_TEXT_TOP
     !endif
-    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
     
   FunctionEnd
   
   Function "${LEAVE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
     
   FunctionEnd
 
@@ -1235,7 +1145,7 @@ Var MUI_TEMP2
   !endif
 
   Function "${PRE}"
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
     !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_COMPONENTS_TITLE) $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_COMPONENTS_SUBTITLE)
   FunctionEnd
 
@@ -1260,13 +1170,13 @@ Var MUI_TEMP2
       !insertmacro MUI_INNERDIALOG_TEXT 1043 "$(MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO)"
       StrCpy $MUI_TEXT "$(MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO)"
     !endif
-    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
    
   FunctionEnd
 
   Function "${LEAVE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
     
   FunctionEnd
     
@@ -1275,16 +1185,16 @@ Var MUI_TEMP2
 !macro MUI_FUNCTION_DIRECTORYPAGE PRE SHOW LEAVE
 
   Function "${PRE}"
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
     !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_DIRECTORY_TITLE) $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_DIRECTORY_SUBTITLE)
   FunctionEnd
 
   Function "${SHOW}"
-    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
   FunctionEnd
   
   Function "${LEAVE}"
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
   FunctionEnd
 
 !macroend
@@ -1302,7 +1212,7 @@ Var MUI_TEMP2
   
   Function "${PRE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
 
      !ifdef MUI_STARTMENUPAGE_REGISTRY_ROOT & MUI_STARTMENUPAGE_REGISTRY_KEY & MUI_STARTMENUPAGE_REGISTRY_VALUENAME
 
@@ -1361,7 +1271,7 @@ Var MUI_TEMP2
 
   Function "${LEAVE}"
 
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
 
   FunctionEnd
 
@@ -1371,20 +1281,20 @@ Var MUI_TEMP2
 
   Function "${PRE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
     !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_${MUI_PAGE_UNINSTALLER}INSTALLING_TITLE) $(MUI_${MUI_PAGE_UNINSTALLER}TEXT_${MUI_PAGE_UNINSTALLER}INSTALLING_SUBTITLE)
     
   FunctionEnd
 
   Function "${SHOW}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
     
   FunctionEnd
 
   Function "${LEAVE}"
     
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
       
     !insertmacro MUI_FINISHHEADER
     !insertmacro MUI_LANGDLL_SAVELANGUAGE
@@ -1625,7 +1535,7 @@ Var MUI_TEMP2
        mui.finish_load:
     !endif
       
-    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
     
     !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "ioSpecial.ini"
     Pop $MUI_HWND
@@ -1688,7 +1598,7 @@ Var MUI_TEMP2
       mui.finish_show:
     !endif
 
-    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
     
     !ifdef MUI_FINISHPAGE_ABORTWARNINGCHECK
       StrCpy $MUI_NOABORTWARNING "1"
@@ -1722,7 +1632,7 @@ Var MUI_TEMP2
   
   Function "${LEAVE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
     
     !ifndef MUI_FINISHPAGE_NOREBOOTSUPPORT
     
@@ -1816,115 +1726,115 @@ Var MUI_TEMP2
   
 !macroend
 
-!macro MUI_FUNCTION_DESCRIPTION_BEGIN
+;--------------------------------
+;INSTALL OPTIONS (CUSTOM PAGES)
 
-  !verbose push
-  !verbose 3
-  
-  !ifndef MUI_VAR_TEXT
-    Var MUI_TEXT
-    !define MUI_VAR_TEXT
-  !endif
-
-  Function .onMouseOverSection
-    !insertmacro MUI_DESCRIPTION_BEGIN
-  
-  !verbose pop
-  
-!macroend
-
-!macro MUI_FUNCTION_DESCRIPTION_END
+!macro MUI_INSTALLOPTIONS_EXTRACT FILE
 
   !verbose push
   !verbose 3
 
-    !insertmacro MUI_DESCRIPTION_END
-  FunctionEnd
+  InitPluginsDir
+
+  File "/oname=$PLUGINSDIR\${FILE}" "${FILE}"
+  
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "RTL" "$(^RTL)"
 
   !verbose pop
-  
+
 !macroend
 
-!macro MUI_FUNCTIONS_DESCRIPTION_BEGIN
-
-  ;1.65 compatibility
-
-  !warning "Modern UI macro name has changed. Please change MUI_FUNCTIONS_DESCRIPTION_BEGIN to MUI_FUNCTION_DESCRIPTION_BEGIN."
-
-  !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  
-!macroend
-
-!macro MUI_FUNCTIONS_DESCRIPTION_END
-
-  ;1.65 compatibility
-
-  !warning "Modern UI macro name has changed. Please change MUI_FUNCTIONS_DESCRIPTION_END to MUI_FUNCTION_DESCRIPTION_END."
-
-  !insertmacro MUI_FUNCTION_DESCRIPTION_END
-  
-!macroend
-
-!macro MUI_UNFUNCTION_DESCRIPTION_BEGIN
+!macro MUI_INSTALLOPTIONS_EXTRACT_AS FILE FILENAME
 
   !verbose push
   !verbose 3
 
-  Function un.onMouseOverSection
-    !insertmacro MUI_DESCRIPTION_BEGIN
+  InitPluginsDir
+
+  File "/oname=$PLUGINSDIR\${FILENAME}" "${FILE}"
+  
+  !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILENAME}" "Settings" "RTL" "$(^RTL)"
   
   !verbose pop
-  
+
 !macroend
 
-!macro MUI_UNFUNCTION_DESCRIPTION_END
+!macro MUI_INSTALLOPTIONS_DISPLAY FILE
+
+  !verbose push
+  !verbose 3
+  
+  InstallOptions::dialog "$PLUGINSDIR\${FILE}"
+  Pop $MUI_TEMP1
+
+  !verbose pop
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_DISPLAY_RETURN FILE
+
+  !verbose push
+  !verbose 3
+  
+  InstallOptions::dialog "$PLUGINSDIR\${FILE}"
+
+  !verbose pop
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_INITDIALOG FILE
+
+  !verbose push
+  !verbose 3
+  
+  InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\${FILE}"
+
+  !verbose pop
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_SHOW
 
   !verbose push
   !verbose 3
 
-    !insertmacro MUI_DESCRIPTION_END
-  FunctionEnd
+  InstallOptions::show
+  Pop $MUI_TEMP1
 
   !verbose pop
-  
-!macroend
-
-!macro MUI_FUNCTION_ABORTWARNING
-
-  Function .onUserAbort
-    !ifdef MUI_ABORTWARNING
-      !insertmacro MUI_ABORTWARNING
-    !endif
-    !ifdef MUI_CUSTOMFUNCTION_ABORT
-      Call "${MUI_CUSTOMFUNCTION_ABORT}"
-    !endif
-  FunctionEnd
 
 !macroend
 
-!macro MUI_FUNCTION_UNABORTWARNING
+!macro MUI_INSTALLOPTIONS_SHOW_RETURN
 
-  Function un.onUserAbort
-    !ifdef MUI_UNABORTWARNING
-      !insertmacro MUI_UNABORTWARNING
-    !endif
-    !ifdef MUI_CUSTOMFUNCTION_UNABORT
-      Call "${MUI_CUSTOMFUNCTION_UNABORT}"
-    !endif
-  FunctionEnd
+  !verbose push
+  !verbose 3
+  
+  InstallOptions::show
+
+  !verbose pop
 
 !macroend
-!macro MUI_UNFUNCTION_GUIINIT
-  
-  Function un.onGUIInit
-  
-  !insertmacro MUI_UNGUIINIT
-  
-  !ifdef MUI_CUSTOMFUNCTION_UNGUIINIT
-    Call "${MUI_CUSTOMFUNCTION_UNGUIINIT}"
-  !endif
-  
-  FunctionEnd
+
+!macro MUI_INSTALLOPTIONS_READ VAR FILE SECTION KEY
+
+  !verbose push
+  !verbose 3
+
+  ReadIniStr ${VAR} "$PLUGINSDIR\${FILE}" "${SECTION}" "${KEY}"
+
+  !verbose pop
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_WRITE FILE SECTION KEY VALUE
+
+  !verbose push
+  !verbose 3
+
+  WriteIniStr "$PLUGINSDIR\${FILE}" "${SECTION}" "${KEY}" "${VALUE}"
+
+  !verbose pop
 
 !macroend
 
@@ -1932,20 +1842,20 @@ Var MUI_TEMP2
 
   Function "${PRE}"
   
-   !insertmacro MUI_FUNCTION_CUSTOM PRE
+   !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
    !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_UNTEXT_CONFIRM_TITLE) $(MUI_UNTEXT_CONFIRM_SUBTITLE)
   
   FunctionEnd
   
   Function "${SHOW}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
   
   FunctionEnd
   
   Function "${LEAVE}"
   
-    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
     
   FunctionEnd
   
@@ -1977,31 +1887,101 @@ Var MUI_TEMP2
 !macroend
 
 ;--------------------------------
-;INSERT ALL CODE
+;LANGUAGES
 
-!macro MUI_INSERT
+!macro MUI_LANGUAGE LANGUAGE
+
+  !verbose push
+  !verbose 3
   
-  !ifdef MUI_INSERT_NSISCONF
-    !insertmacro MUI_NSISCONF
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\${LANGUAGE}.nsh"
+  
+  !verbose pop
+  
+!macroend
+
+;--------------------------------
+;LANGUAGE SELECTION DIALOG
+
+!macro MUI_LANGDLL_DISPLAY
+
+  !verbose push
+  !verbose 3
+
+  !ifdef NSIS_CONFIG_SILENT_SUPPORT
+    IfSilent mui.langdll_done
+  !endif
+
+  !ifndef MUI_LANGDLL_WINDOWTITLE
+    !define MUI_LANGDLL_WINDOWTITLE "Installer Language"
+  !endif
+
+  !ifndef MUI_LANGDLL_INFO
+    !define MUI_LANGDLL_INFO "Please select a language."
   !endif
   
-  !ifdef MUI_PRODUCT | MUI_VERSION
-    !warning "The MUI_PRODUCT and MUI_VERSION defines have been removed. Use a normal Name command now."
+  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
+    
+    ReadRegStr $MUI_TEMP1 "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
+    StrCmp $MUI_TEMP1 "" mui.langdll_show
+      StrCpy $LANGUAGE $MUI_TEMP1
+      !ifndef MUI_LANGDLL_ALWAYSSHOW
+        Goto mui.langdll_done
+      !endif
+    mui.langdll_show:
+  
   !endif
   
-  !ifndef MUI_INSERT_INTERFACE
-    !insertmacro MUI_INTERFACE
-    !define MUI_INSERT_INTERFACE
+  LangDLL::LangDialog "${MUI_LANGDLL_WINDOWTITLE}" "${MUI_LANGDLL_INFO}" A ${MUI_LANGDLL_PUSHLIST} ""
+
+  Pop $LANGUAGE
+  StrCmp $LANGUAGE "cancel" 0 +2
+    Abort
+  
+  !ifdef NSIS_CONFIG_SILENT_SUPPORT
+    mui.langdll_done:
+  !else ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
+    mui.langdll_done:
+  !endif
+    
+  !verbose pop
+    
+!macroend
+
+!macro MUI_LANGDLL_SAVELANGUAGE
+
+  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
+    WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
   !endif
   
-  !insertmacro MUI_FUNCTION_GUIINIT
-  !insertmacro MUI_FUNCTION_ABORTWARNING
+!macroend
+
+!macro MUI_UNGETLANGUAGE
+
+  !verbose pop
+
+  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
   
-  !ifdef MUI_UNINSTALLER
-    !insertmacro MUI_UNFUNCTION_GUIINIT
-    !insertmacro MUI_FUNCTION_UNABORTWARNING
+    ReadRegStr $MUI_TEMP1 "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}"
+    StrCmp $MUI_TEMP1 "" 0 mui.ungetlanguage_setlang
+  
+  !endif
+    
+  !insertmacro MUI_LANGDLL_DISPLAY
+      
+  !ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & MUI_LANGDLL_REGISTRY_VALUENAME
+  
+    Goto mui.ungetlanguage_done
+   
+    mui.ungetlanguage_setlang:
+      StrCpy $LANGUAGE $MUI_TEMP1
+        
+    mui.ungetlanguage_done:
+
   !endif
   
+  !verbose pop
+
 !macroend
 
 ;--------------------------------
@@ -2226,6 +2206,4 @@ Var MUI_TEMP2
 
 !endif
 
-!ifndef MUI_MANUALVERBOSE
-  !verbose 4
-!endif
\ No newline at end of file
+!verbose 4
\ No newline at end of file