diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 910bfcf0..193ac166 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -572,12 +572,24 @@
 !macroend
 
 ;--------------------------------
-;BASIC FUNCTIONS
+;BASIC MACRO'S
 
-!macro MUI_FUNCTIONS_BASIC
+!macro MUI_SYSTEM
+
+  !verbose 3
+  
+  !insertmacro MUI_BASIC
+  !insertmacro MUI_UNBASIC
+  
+  !verbose 4
+  
+!macroend
+
+!macro MUI_BASIC
 
   !verbose 3
 
+  !insertmacro MUI_INTERFACE
   !insertmacro MUI_PAGECOMMANDS
   !insertmacro MUI_FUNCTIONS_PAGES
   !insertmacro MUI_FUNCTIONS_GUIINIT
@@ -587,10 +599,11 @@
 
 !macroend
 
-!macro MUI_UNFUNCTIONS_BASIC
+!macro MUI_UNBASIC
 
   !verbose 3
 
+  !insertmacro MUI_INTERFACE
   !insertmacro MUI_UNPAGECOMMANDS
   !insertmacro MUI_UNFUNCTIONS_PAGES
   !insertmacro MUI_UNFUNCTIONS_GUIINIT
diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi
index 998a02bc..5e59f88b 100644
--- a/Examples/Modern UI/Basic.nsi	
+++ b/Examples/Modern UI/Basic.nsi	
@@ -25,8 +25,6 @@
   OutFile "Basic.exe"
   Name "${NAME} ${VERSION}"
 
-  !insertmacro MUI_INTERFACE
-
   ;License page
   LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
 
@@ -59,14 +57,15 @@ Section ""
 SectionEnd
 
 ;--------------------------------
-;Installer Functions
+;Modern UI System
 
-!insertmacro MUI_FUNCTIONS_BASIC
+!insertmacro MUI_SYSTEM
 
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_START
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_END
  
+
 ;--------------------------------
 ;Uninstaller Section
 
@@ -82,9 +81,4 @@ Section "Uninstall"
   ;Display the Finish header
   !insertmacro MUI_UNFINISHHEADER
 
-SectionEnd
-
-;--------------------------------
-;Uninstaller Functions
-
-!insertmacro MUI_UNFUNCTIONS_BASIC
\ No newline at end of file
+SectionEnd
\ No newline at end of file
diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi
index fe7b0805..d65ecbc9 100644
--- a/Examples/Modern UI/InstallOptions.nsi	
+++ b/Examples/Modern UI/InstallOptions.nsi	
@@ -38,8 +38,6 @@
   !insertmacro MUI_PAGECOMMAND_DIRECTORY
   Page custom SetCustomC
   !insertmacro MUI_PAGECOMMAND_INSTFILES
-
-  !insertmacro MUI_INTERFACE
   
   ;License page
   LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
@@ -134,10 +132,13 @@ Function SetCustomC
   !insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini"
 FunctionEnd
 
-!insertmacro MUI_FUNCTIONS_BASIC
+;--------------------------------
+;Modern UI System
+
+!insertmacro MUI_SYSTEM
 
 ;--------------------------------
-;Uninstaller
+;Uninstaller Section
 
 Section "Uninstall"
 
@@ -152,9 +153,4 @@ Section "Uninstall"
 
 SectionEnd
 
-;--------------------------------
-;Uninstaller Functions
-
-  !insertmacro MUI_UNFUNCTIONS_BASIC
-
 ;eof
\ No newline at end of file
diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi
index f717ba46..3a0a4866 100644
--- a/Examples/Modern UI/MultiLanguage.nsi	
+++ b/Examples/Modern UI/MultiLanguage.nsi	
@@ -74,8 +74,6 @@
     !include "${NSISDIR}\Contrib\Modern UI\Language files\Ukrainian.nsh"
   
   OutFile "MultiLanguage.exe"
-
-  !insertmacro MUI_INTERFACE
   
   ;Name
   Name /LANG=${LANG_ENGLISH} "${NAME} ${VERSION}"
@@ -217,7 +215,10 @@ Function .onInit
 
 FunctionEnd
 
-!insertmacro MUI_FUNCTIONS_BASIC
+;--------------------------------
+;Modern UI System
+
+!insertmacro MUI_SYSTEM
 
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_START
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
@@ -247,6 +248,4 @@ SectionEnd
 
 Function un.onInit
   ReadRegStr $LANGUAGE HKCU "Software\${NAME}" "Installer Language"
-FunctionEnd
-
-!insertmacro MUI_UNFUNCTIONS_BASIC
\ No newline at end of file
+FunctionEnd
\ No newline at end of file