diff --git a/Examples/Modern UI/Example.nsi b/Examples/Modern UI/Example.nsi
deleted file mode 100644
index 8cc47bc5..00000000
--- a/Examples/Modern UI/Example.nsi	
+++ /dev/null
@@ -1,191 +0,0 @@
-;NSIS Modern Style UI version 1.21
-;Example Script
-;Written by Joost Verburg
-
-!define NAME "Test Software" ;Define your own software name here
-!define VERSION "1.0" ;Define your own software version here
-
-!verbose 3
-  !include "ModernUI.nsh"
-!verbose 4
-
-;--------------------------------
-;Configuration
-
-  ;General
-  Name "${NAME} ${VERSION}"
-  OutFile "Example.exe"
-  SetOverwrite on
-
-  ;User interface
-  !insertmacro MUI_INTERFACE "modern.exe" "adni18-installer-C-no48xp.ico" "adni18-uninstall-C-no48xp.ico" "modern.bmp" "smooth" "$9" ;$9 is the variable used to store the current page, do not use this var!
-
-  ;License dialog
-  LicenseText "Press Page Down to see the rest of the agreement."
-  LicenseData "License.txt"
-
-  ;Component-select dialog
-  ComponentText "Check the components you want to install and uncheck the components you don't want to install. Click Next to continue."
-
-  ;Folder-select dialog
-  InstallDir "$PROGRAMFILES\${NAME}"
-  DirText "Setup will install ${NAME} in the following folder.$\r$\n$\r$\nTo install in this folder, click Install. To install in a different folder, click Browse and select another folder." " "
-
-  ;Uninstaller
-  UninstallText "This will uninstall ${NAME} from your system."
-
-;--------------------------------
-;Installer Sections
-
-Section "Modern.exe" SecCopyUI
-
-  ;Add your stuff here
-
-  SetOutPath "$INSTDIR"
-  File "${NSISDIR}\Contrib\UIs\modern.exe"
-
-SectionEnd
-
-Section "Create uninstaller" SecCreateUninst
-
-  ;Add your stuff here
-
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-SectionEnd
-
-Section ""
-
-  ;Invisible section to display the Finish header
-  !insertmacro MUI_FINISHHEADER SetPage
-
-SectionEnd
-
-;--------------------------------
-;Installer Functions
-
-Function .onInitDialog
-
-  !insertmacro MUI_INNERDIALOG_INIT
-
-    !insertmacro MUI_INNERDIALOG_START 1
-      !insertmacro MUI_INNERDIALOG_TEXT 1033 1040 "If you accept all the terms of the agreement, choose I Agree to continue. If you choose Cancel, Setup will close. You must accept the agreement to install ${NAME}."
-    !insertmacro MUI_INNERDIALOG_STOP 1
-
-    !insertmacro MUI_INNERDIALOG_START 2
-      !insertmacro MUI_INNERDIALOG_TEXT 1033 1042 "Description"
-      !insertmacro MUI_INNERDIALOG_TEXT 1033 1043 "Hover your mouse over a component to see it's description."
-    !insertmacro MUI_INNERDIALOG_STOP 2
-
-    !insertmacro MUI_INNERDIALOG_START 3
-      !insertmacro MUI_INNERDIALOG_TEXT 1033 1041 "Destination Folder"
-      !insertmacro MUI_INNERDIALOG_STOP 3
-
-  !insertmacro MUI_INNERDIALOG_END
-
-FunctionEnd
-
-Function .onNextPage
-
-  !insertmacro MUI_NEXTPAGE SetPage
-
-FunctionEnd
-
-Function .onPrevPage
-
-  !insertmacro MUI_PREVPAGE SetPage
-
-FunctionEnd
-
-Function SetPage
-
-  !insertmacro MUI_PAGE_INIT
-
-    !insertmacro MUI_PAGE_START 1
-       !insertmacro MUI_HEADER_TEXT 1033 "License Agreement" "Please review the license terms before installing ${NAME}."
-    !insertmacro MUI_PAGE_STOP 1
-
-    !insertmacro MUI_PAGE_START 2
-      !insertmacro MUI_HEADER_TEXT 1033 "Choose Components" "Choose the components you want to install."
-    !insertmacro MUI_PAGE_STOP 2
-
-    !insertmacro MUI_PAGE_START 3
-      !insertmacro MUI_HEADER_TEXT 1033 "Choose Install Location" "Choose the folder in which to install ${NAME}."
-    !insertmacro MUI_PAGE_STOP 3
-
-    !insertmacro MUI_PAGE_START 4
-      !insertmacro MUI_HEADER_TEXT 1033 "Installing" "Please wait while ${NAME} is being installed."
-    !insertmacro MUI_PAGE_STOP 4
-
-    !insertmacro MUI_PAGE_START 5
-      !insertmacro MUI_HEADER_TEXT 1033 "Finished" "Setup was completed successfully."
-    !insertmacro MUI_PAGE_STOP 5
-
-  !insertmacro MUI_PAGE_END
-
-FunctionEnd
-
-Function .onMouseOverSection
-
-  !insertmacro MUI_DESCRIPTION_INIT
-
-    !insertmacro MUI_DESCRIPTION_TEXT 1033 ${SecCopyUI} "Copy the modern.exe file to the application folder."
-    !insertmacro MUI_DESCRIPTION_TEXT 1033 ${SecCreateUninst} "Create a uninstaller which can automatically delete ${NAME}."
-
- !insertmacro MUI_DESCRIPTION_END
-
-FunctionEnd
-
-Function .onUserAbort
-
-  !insertmacro MUI_ABORTWARNING 1033 "Are you sure you want to quit ${NAME} Setup?"
-  !insertmacro MUI_ABORTWARNING_END
-
-FunctionEnd
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-
-  ;Add your stuff here
-
-  Delete "$INSTDIR\modern.exe"
-  Delete "$INSTDIR\Uninstall.exe"
-
-  RMDir "$INSTDIR"
-
-  !insertmacro MUI_FINISHHEADER un.SetPage
-
-SectionEnd
-
-;--------------------------------
-;Uninstaller Functions
-
-Function un.onNextPage
-
-  !insertmacro MUI_NEXTPAGE un.SetPage
-
-FunctionEnd
-
-Function un.SetPage
-
-  !insertmacro MUI_PAGE_INIT
-
-    !insertmacro MUI_PAGE_START 1
-      !insertmacro MUI_HEADER_TEXT 1033 "Uninstall ${NAME}" "Remove ${NAME} from your system."
-    !insertmacro MUI_PAGE_STOP 1
-
-    !insertmacro MUI_PAGE_START 2
-      !insertmacro MUI_HEADER_TEXT 1033 "Uninstalling" "Please wait while ${NAME} is being uninstalled."
-    !insertmacro MUI_PAGE_STOP 2
-
-    !insertmacro MUI_PAGE_START 3
-      !insertmacro MUI_HEADER_TEXT 1033 "Finished" "${NAME} has been removed from your system."
-    !insertmacro MUI_PAGE_STOP 3
-
-  !insertmacro MUI_PAGE_END
-
-FunctionEnd
-
-;eof
diff --git a/Examples/Modern UI/ModernUI.nsh b/Examples/Modern UI/ModernUI.nsh
deleted file mode 100644
index e568f897..00000000
--- a/Examples/Modern UI/ModernUI.nsh	
+++ /dev/null
@@ -1,394 +0,0 @@
-;Modern UI Header File version 1.21b
-;Written by Joost Verburg
-
-;See Example.nsi & Multilanguage.nsi for an example of usage
-
-!ifndef MUI_MACROS_USED
-
-!define MUI_MACROS_USED
-
-!include "${NSISDIR}\Examples\WinMessages.nsh"
-
-!define IO_DIRECTION_NEXT 1
-!define IO_DIRECTION_PREV 2
-
-!define IO_INITPLUGINS_1 "Call Initialize_____Plugins"
-!define IO_INITPLUGINS_2 "SetDetailsPrint both"
-!define IO_UNINITPLUGINS_1 "Call un.Initialize_____Plugins"
-!define IO_UNINITPLUGINS_2 "SetDetailsPrint both"
-
-!define MUI_TEMP1 $R0
-!define MUI_TEMP2 $R1
-
-!macro MUI_INTERFACE UI ICON UNICON CHECKS PROGRESSBAR CURRENTPAGEVAR
-
-  ;User interface
-  
-  Icon "${NSISDIR}\Contrib\Icons\${ICON}"
-  UninstallIcon "${NSISDIR}\Contrib\Icons\${UNICON}"
-  XPStyle On
-  ChangeUI all "${NSISDIR}\Contrib\UIs\${UI}"
-  SetFont Tahoma 8
-  CheckBitmap "${NSISDIR}\Contrib\Icons\${CHECKS}"
-  InstallColors /windows
-  InstProgressFlags "${PROGRESSBAR}"
-  BrandingText /TRIMRIGHT
-  !define CURRENTPAGE ${CURRENTPAGEVAR}
-
-!macroend
-
-!macro MUI_INTERFACE_ABSOLUTEPATH UI ICON UNICON CHECKS PROGRESSBAR CURRENTPAGEVAR
-
-  ;User interface
-  
-  Icon "${ICON}"
-  UninstallIcon "${UNICON}"
-  XPStyle On
-  ChangeUI all "${UI}"
-  SetFont Tahoma 8
-  CheckBitmap "${CHECKS}"
-  InstallColors /windows
-  InstProgressFlags "${PROGRESSBAR}"
-  BrandingText /TRIMRIGHT
-  !define CURRENTPAGE ${CURRENTPAGEVAR}
-
-!macroend
-
-!macro MUI_FINISHHEADER CALL
-
-  ;Finish text on the header (white rectangle)
-  
-  IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1
-  Call ${CALL}
-
-!macroend
-
-!macro MUI_INNERDIALOG_INIT
-
-  Push ${MUI_TEMP1}
-
-!macroend
-
-!macro MUI_INNERDIALOG_START PAGE
-
-  StrCmp ${CURRENTPAGE} ${PAGE} "" done_${PAGE}
-  
-!macroend
-
-!macro MUI_INNERDIALOG_TEXT LANGID CONTROL TEXT
-
- ;Text on inner dialogs components
-
-  StrCmp $LANGUAGE ${LANGID} "" +4
-    FindWindow ${MUI_TEMP1} "#32770" "" $HWNDPARENT
-    GetDlgItem ${MUI_TEMP1} ${MUI_TEMP1} ${CONTROL}
-    SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${TEXT}"
-	
-!macroend
-
-!macro MUI_INNERDIALOG_STOP PAGE
-
-  Goto done
-  done_${PAGE}:
-  
-!macroend
-
-!macro MUI_INNERDIALOG_END
-
-  done:
-  Pop ${MUI_TEMP1}
-
-!macroend
-
-!macro MUI_NEXTPAGE CALL
-
-  ;Set backgrounds & fonts for the outer dialog (only once)
-  StrCmp ${CURRENTPAGE} "" "" no_first_run
-
-  Push ${MUI_TEMP1}
-  Push ${MUI_TEMP2}
-
-    GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037
-    CreateFont ${MUI_TEMP2} "Tahoma" 10 700
-    SendMessage ${MUI_TEMP1} ${WM_SETFONT} ${MUI_TEMP2} 0
-    SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF
- 
-    GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038
-    SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF
-
-    GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1034
-    SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF
-
-    GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1039
-    SetStaticBkColor ${MUI_TEMP1} 0x00FFFFFF
-    
-  Pop ${MUI_TEMP2}  
-  Pop ${MUI_TEMP1}
-
-  no_first_run:
-
-  IntOp ${CURRENTPAGE} ${CURRENTPAGE} + 1
-
-  Call "${CALL}"
-   
-!macroend
-
-!macro MUI_PREVPAGE CALL
-
-  IntOp ${CURRENTPAGE} ${CURRENTPAGE} - 1
-
-  Call "${CALL}"
-  
-!macroend
-
-!macro MUI_PAGE_INIT
-
-  Push ${MUI_TEMP1}
-
-!macroend
-
-!macro MUI_PAGE_START PAGE
-
-   StrCmp ${CURRENTPAGE} ${PAGE} "" done_${PAGE}
-  
-!macroend
-
-!macro MUI_HEADER_TEXT LANGID TEXT SUBTEXT
-
-  ;Text on the white rectangle
-
-  StrCmp $LANGUAGE ${LANGID} "" +5
-    GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1037
-    SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${TEXT}"
-    GetDlgItem ${MUI_TEMP1} $HWNDPARENT 1038
-    SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${SUBTEXT}"
-
-!macroend
-
-!macro MUI_PAGE_STOP PAGE
-
-  Goto done
-  done_${PAGE}:
-  
-!macroend
-
-!macro MUI_PAGE_END
-  
-  done:
-  Pop ${MUI_TEMP1}
-  
-!macroend
-
-!macro MUI_DESCRIPTION_INIT
-
-  Push ${MUI_TEMP1}
-
-  FindWindow ${MUI_TEMP1} "#32770" "" $HWNDPARENT
-  GetDlgItem ${MUI_TEMP1} ${MUI_TEMP1} 1043
-
-!macroend
-
-!macro MUI_DESCRIPTION_TEXT LANGID VAR TEXT
-
-  ;Set text on the Description frame
-
-  StrCmp $LANGUAGE ${LANGID} "" +4
-    StrCmp $0 ${VAR} "" +3
-      SendMessage ${MUI_TEMP1} ${WM_SETTEXT} 0 "STR:${TEXT}"
-      Goto done
-    
-!macroend
-
-!macro MUI_DESCRIPTION_END
-
-  done:
-  Pop ${MUI_TEMP1}
-  
-!macroend
-
-!macro MUI_ABORTWARNING LANGID TEXT
-
-  ;Warning when Cancel button is pressed
-
-  StrCmp $LANGUAGE ${LANGID} "" +3
-    MessageBox MB_YESNO|MB_ICONEXCLAMATION "${TEXT}" IDYES quit
-    Abort
-
-!macroend
-
-!macro MUI_ABORTWARNING_END
-
-  quit:
-  
-!macroend
-
-;INSTALL OPTIONS
-
-!macro MUI_INSTALLOPTIONS DIRECTIONVAR NOSETDIRECTIONVAR
-
-  !define IO_NOSETDIRECTION ${DIRECTIONVAR}
-  !define IO_DIRECTION ${NOSETDIRECTIONVAR}
-  
-!macroend
-
-!macro MUI_INSTALLOPTIONS_EXTRACT FILE
-
-  ;Init plugin system
-  ${IO_INITPLUGINS_1}
-  ${IO_INITPLUGINS_2}
-  !undef IO_INITPLUGINS_1
-  !undef IO_INITPLUGINS_2
-  !define IO_INITPLUGINS_1 ""
-  !define IO_INITPLUGINS_2 ""
-  
-  File /oname=$PLUGINSDIR\${FILE} "${FILE}"
-  
-!macroend
-
-!macro MUI_INSTALLOPTIONS_UNEXTRACT FILE
-
-  ;Init plugin system
-  ${IO_UNINITPLUGINS_1}
-  ${IO_UNINITPLUGINS_2}
-  !undef IO_UNINITPLUGINS_1
-  !undef IO_UNINITPLUGINS_2
-  !define IO_UNINITPLUGINS_1 ""
-  !define IO_UNINITPLUGINS_2 ""
-  
-  File /oname=$PLUGINSDIR\${FILE} "${FILE}"
-  
-!macroend
-
-!macro MUI_INSTALLOPTIONS_SETDIRECTION DIRECTION
-
-  StrCpy ${IO_DIRECTION} "${DIRECTION}"
-
-!macroend
-
-!macro MUI_INSTALLOPTIONS_NEXTPAGE
-
-  StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection
-    !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${IO_DIRECTION_NEXT}
-  no_setdirection:
-  StrCpy ${IO_NOSETDIRECTION} "0"
-  
-!macroend
-
-!macro MUI_INSTALLOPTIONS_PREVPAGE
-
-  StrCmp ${IO_NOSETDIRECTION} "1" no_setdirection
-    !insertmacro MUI_INSTALLOPTIONS_SETDIRECTION ${IO_DIRECTION_PREV}
-  no_setdirection:
-  StrCpy ${IO_NOSETDIRECTION} "0"
-  
-!macroend
-
-!macro MUI_INSTALLOPTIONS_SHOW PAGE FILE IOBACK IONEXT
-        
-  InstallOptions::dialog "$PLUGINSDIR\${FILE}"
-  Pop ${MUI_TEMP1}
-
-  StrCmp ${MUI_TEMP1} "cancel" "" +2
-    Quit
-
-  StrCmp ${MUI_TEMP1} "back" "" noback_${PAGE}
-    !insertmacro MUI_INSTALLOPTIONS_${IOBACK}BACK
-  noback_${PAGE}:
-
-  !insertmacro MUI_INSTALLOPTIONS_${IONEXT}NEXT
-		
-!macroend
-
-!macro MUI_INSTALLOPTIONS_UNSHOW PAGE FILE IOBACK IONEXT
-        
-  InstallOptions::dialog "$PLUGINSDIR\${FILE}"
-  Pop ${MUI_TEMP1}
-
-  StrCmp ${MUI_TEMP1} "cancel" "" +2
-    Quit
-
-  StrCmp ${MUI_TEMP1} "back" "" noback_${PAGE}
-    !insertmacro MUI_INSTALLOPTIONS_UN${IOBACK}BACK
-  noback_${PAGE}:
-
-  !insertmacro MUI_INSTALLOPTIONS_UN${IONEXT}NEXT
-		
-!macroend
-
-!macro MUI_INSTALLOPTIONS_BACK
-
-  StrCmp ${IO_DIRECTION} "${IO_DIRECTION_NEXT}" "" +3
-    Call .onPrevPage
-    Abort
-  StrCmp ${IO_DIRECTION} "${IO_DIRECTION_PREV}" "" +3
-    Call .onPrevPage
-    Goto done
-            
-!macroend
-
-!macro MUI_INSTALLOPTIONS_NEXT
-
-  StrCmp ${IO_DIRECTION} ${IO_DIRECTION_NEXT} "" +3
-    Call .onNextPage
-    Goto done
-  StrCmp ${IO_DIRECTION} ${IO_DIRECTION_PREV} "" +3
-    Call .onNextPage
-    Abort
-   
-!macroend
-
-!macro MUI_INSTALLOPTIONS_IOBACK
-  
-  StrCpy ${IO_NOSETDIRECTION} "1"
-  Call .onPrevPage
-  Goto done
-            
-!macroend
-
-!macro MUI_INSTALLOPTIONS_IONEXT
-
-  StrCpy ${IO_NOSETDIRECTION} "1"
-  Call .onNextPage
-  Goto done
-	
-!macroend
-
-!macro MUI_INSTALLOPTIONS_UNBACK
-
-  StrCmp ${IO_DIRECTION} "${IO_DIRECTION_NEXT}" "" +3
-    Call un.onPrevPage
-    Abort
-  StrCmp ${IO_DIRECTION} "${IO_DIRECTION_PREV}" "" +3
-    Call un.onPrevPage
-    Goto done
-            
-!macroend
-
-!macro MUI_INSTALLOPTIONS_UNNEXT
-
-  StrCmp ${IO_DIRECTION} ${IO_DIRECTION_NEXT} "" +3
-    Call un.onNextPage
-    Goto done
-  StrCmp ${IO_DIRECTION} ${IO_DIRECTION_PREV} "" +3
-    Call un.onNextPage
-    Abort
-   
-!macroend
-
-!macro MUI_INSTALLOPTIONS_UNIOBACK
-  
-  StrCpy ${IO_NOSETDIRECTION} "1"
-  Call .onPrevPage
-  Goto done
-            
-!macroend
-
-!macro MUI_INSTALLOPTIONS_UNIONEXT
-
-  StrCpy ${IO_NOSETDIRECTION} "1"
-  Call .onNextPage
-  Goto done
-	
-!macroend
-
-!endif
\ No newline at end of file
diff --git a/Examples/Modern UI/iniA.ini b/Examples/Modern UI/iniA.ini
deleted file mode 100644
index 90a707d9..00000000
--- a/Examples/Modern UI/iniA.ini	
+++ /dev/null
@@ -1,13 +0,0 @@
-[Settings]
-NumFields=1
-BackEnabled=1
-BackButtonText=< Back
-NextButtonText=Next >
-
-[Field 1]
-Type=label
-text=IniA
-left=0
-right=350
-top=10
-bottom=25
\ No newline at end of file
diff --git a/Examples/Modern UI/iniB.ini b/Examples/Modern UI/iniB.ini
deleted file mode 100644
index a79cd0ae..00000000
--- a/Examples/Modern UI/iniB.ini	
+++ /dev/null
@@ -1,13 +0,0 @@
-[Settings]
-NumFields=1
-BackEnabled=1
-BackButtonText=< Back
-NextButtonText=Next >
-
-[Field 1]
-Type=label
-text=IniB
-left=0
-right=350
-top=10
-bottom=25
\ No newline at end of file
diff --git a/Examples/Modern UI/iniC.ini b/Examples/Modern UI/iniC.ini
deleted file mode 100644
index f5d10707..00000000
--- a/Examples/Modern UI/iniC.ini	
+++ /dev/null
@@ -1,13 +0,0 @@
-[Settings]
-NumFields=1
-BackEnabled=1
-BackButtonText=< Back
-NextButtonText=Install
-
-[Field 1]
-Type=label
-text=IniC
-left=0
-right=350
-top=10
-bottom=25
\ No newline at end of file