diff --git a/Contrib/Modern UI/Language files/Japanese.nsh b/Contrib/Modern UI/Language files/Japanese.nsh
index 0f9abf00..8d53a8c1 100644
--- a/Contrib/Modern UI/Language files/Japanese.nsh	
+++ b/Contrib/Modern UI/Language files/Japanese.nsh	
@@ -11,9 +11,6 @@
 !insertmacro MUI_LANGUAGEFILE_BEGIN "JAPANESE"
 
   !define MUI_LANGNAME "Japanese" ;(日本語) Use only ASCII characters (if this is not possible, use the English name)
-
-  !define MUI_FONT "ＭＳ Ｐゴシック"
-  !define MUI_FONTSIZE "9"
   
   !define MUI_TEXT_WELCOME_INFO_TITLE "$(^Name) セットアップ ウィザードへようこそ"
   !define MUI_TEXT_WELCOME_INFO_TEXT "このウィザードは、$(^Name)のインストールをガイドしていきます。\r\n\r\nセットアップを開始する前に、他のすべてのアプリケーションを終了することを推奨します。これによって、セットアップがこのコンピュータを再起動せずに、確実にシステム ファイルをアップデートすることが出来るようになります。\r\n\r\n$_CLICK"
diff --git a/Contrib/Modern UI/Language files/Korean.nsh b/Contrib/Modern UI/Language files/Korean.nsh
index a0653d27..28c5d8fa 100644
--- a/Contrib/Modern UI/Language files/Korean.nsh	
+++ b/Contrib/Modern UI/Language files/Korean.nsh	
@@ -12,10 +12,7 @@
 
   !ifndef EUL_RUL
     !define EUL_RUL	"(ﾀｻ)ｸｦ"	; ~ﾀｻ/ｸｦ ｹｮﾁｦ ﾇﾘｰ眤ｻ ﾀｧﾇﾑ ﾁ､ﾀﾇ !insertmacro MUI_LANGUAGE "Korean" ﾇﾏｱ� ﾀ�ｿ｡ define ﾇﾘ ｳ�ﾀｸｸ魴ﾈｴﾙ.
-  !endif	
-  
-  !define MUI_FONT "ｱｼｸｲ"
-  !define MUI_FONTSIZE "9"
+  !endif	s
 
   !define MUI_TEXT_WELCOME_INFO_TITLE "$(^Name) ｼｳﾄ｡ｸｦ ｽﾃﾀﾛﾇﾕｴﾏｴﾙ."
   !define MUI_TEXT_WELCOME_INFO_TEXT "ﾀﾌ ﾇﾁｷﾎｱﾗｷ･ﾀｺ ｴ鄂ﾅﾀﾇ ﾄﾄﾇｻﾅﾍｿ｡ $(^Name)${EUL_RUL} ｼｳﾄ｡ﾇﾒ ｰﾍﾀﾔｴﾏｴﾙ.\r\n\r\nｼｳﾄ｡ｸｦ ｽﾃﾀﾛﾇﾏｱ� ﾀ� ｰ｡ｴﾉﾇﾑﾇﾑ ｸ�ｵ� ﾇﾁｷﾎｱﾗｷ･ﾀｻ ﾁｾｷ睇ﾏｿｩ ﾁﾖｽﾃｱ� ｹﾙｶ�ｴﾏｴﾙ. ﾀﾌｴﾂ ﾀ郤ﾎﾆﾃﾀｻ ﾇﾏﾁ� ｾﾊｰ�ｼｭｵｵ ｽﾃｽｺﾅﾛ ﾆﾄﾀﾏﾀｻ ｼ�ﾁ､ﾇﾒ ｼ� ﾀﾖｰﾔ ﾇﾘﾁﾝｴﾏｴﾙ.\r\n\r\n$_CLICK"
diff --git a/Contrib/Modern UI/Language files/SimpChinese.nsh b/Contrib/Modern UI/Language files/SimpChinese.nsh
index 2148ffd4..44f7348d 100644
--- a/Contrib/Modern UI/Language files/SimpChinese.nsh	
+++ b/Contrib/Modern UI/Language files/SimpChinese.nsh	
@@ -9,9 +9,6 @@
 !insertmacro MUI_LANGUAGEFILE_BEGIN "SIMPCHINESE"
 
   !define MUI_LANGNAME "Chinese (Simplified)" ;(ﾒﾔﾓ�ﾑﾔｱｾﾉ�ｵﾄｷｽﾊｽ｣ｬﾐｴﾏﾂﾓ�ﾑﾔﾃ�ｳﾆ) Use only ASCII characters (if this is not possible, use the English name)
-
-  !define MUI_FONT "ﾋﾎﾌ�"
-  !define MUI_FONTSIZE "9"
   
   !define MUI_TEXT_WELCOME_INFO_TITLE "ｻｶﾓｭﾊｹﾓﾃ $(^Name) ｰｲﾗｰﾏ�ｵｼ"
   !define MUI_TEXT_WELCOME_INFO_TEXT "ﾕ篆ｫｻ瞞ﾚﾄ羞ﾄｼﾆﾋ羹�｣ｬｰｲﾗｰ $(^Name) ｡｣\r\n\r\nﾔﾚｿｪﾊｼｰｲﾗｰﾖｮﾇｰ｣ｬｽｨﾒ鰕ﾈｹﾘｱﾕﾆ萢�ﾋ�ﾓﾐﾓｦﾓﾃｳﾌﾐ�｡｣ﾕ篆ｫﾔﾊﾐ�｡ｰｰｲﾗｰｳﾌﾐ�｡ｱｸ�ﾐﾂﾖｸｶｨｵﾄﾏｵﾍｳﾎﾄｼ�｣ｬｶ�ｲｻﾐ靨ｪﾖﾘﾐﾂﾆ�ｶｯﾄ羞ﾄｼﾆﾋ羹�｡｣\r\n\r\n$_CLICK"
diff --git a/Contrib/Modern UI/Language files/TradChinese.nsh b/Contrib/Modern UI/Language files/TradChinese.nsh
index d73ac1a2..97bc08fe 100644
--- a/Contrib/Modern UI/Language files/TradChinese.nsh	
+++ b/Contrib/Modern UI/Language files/TradChinese.nsh	
@@ -9,9 +9,6 @@
 !insertmacro MUI_LANGUAGEFILE_BEGIN "TRADCHINESE"
 
   !define MUI_LANGNAME "Chinese (Traditional)" ;(･Hｻyｨ･･ｻｨｭｪｺ､隕｡｡Aｼg､Uｻyｨ･ｦWｺﾙ) Use only ASCII characters (if this is not possible, use the English name)
-
-  !define MUI_FONT "ｷsｲﾓｩ�ﾅ�"
-  !define MUI_FONTSIZE "9"
   
   !define MUI_TEXT_WELCOME_INFO_TITLE "ﾅwｪ�ｨﾏ･ﾎ $(^Name) ｦwｸﾋｺ�ﾆF"
   !define MUI_TEXT_WELCOME_INFO_TEXT "ｳoｱNｷ|ｦbｧAｪｺｹqｸ｣｡Aｦwｸﾋ $(^Name) ｡C\r\n\r\nｦbｶ}ｩlｦwｸﾋ､ｧｫe｡Aｫﾘﾄｳ･�ﾃ�ｳｬｨ茹Lｩﾒｦｳﾀｳ･ﾎｵ{ｦ｡｡CｳoｱN､ｹｳ\\｡uｦwｸﾋｵ{ｦ｡｡vｧ�ｷsｫ�ｩwｪｺｨtｲﾎﾀﾉｮﾗ｡Aｦﾓ､｣ｻﾝｭnｭｫｷsｱﾒｰﾊｧAｪｺｹqｸ｣｡C\r\n\r\n$_CLICK"
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index 749f3a72..44ee8304 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -256,7 +256,7 @@ Var MUI_TEMP2
     !ifdef MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT
       !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "${MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT}"
     !else
-      !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SUBTITLE)"
+      !insertmacro MUI_HEADER_TEXT "${MUI_INSTFILESPAGE_ABORTHEADER_TEXT}" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_SUBTITLE)"
     !endif
   !else
       !insertmacro MUI_HEADER_TEXT "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_ABORT_TITLE)" "$(MUI_${MUI_PAGE_UNINSTALLER_PREFIX}TEXT_FINISH_SUBTITLE)"
@@ -315,7 +315,7 @@ Var MUI_TEMP2
 !macro MUI_GUIINIT_BASIC
 
   GetDlgItem $MUI_TEMP1 $HWNDPARENT 1037
-  CreateFont $MUI_TEMP2 "$(MUI_FONT)" "$(MUI_FONTSIZE)" "700"
+  CreateFont $MUI_TEMP2 "$(^Font)" "$(^FontSize))" "700"
   SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
   SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
 
@@ -1100,7 +1100,7 @@ Var MUI_TEMP2
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
     SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
     
-    CreateFont $MUI_TEMP2 "$(MUI_FONT)" "12" "700"
+    CreateFont $MUI_TEMP2 "$(^Font)" "12" "700"
     SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
         
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
@@ -1474,7 +1474,7 @@ Var MUI_TEMP2
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1201
     SetCtlColors $MUI_TEMP1 "" "${MUI_BGCOLOR}"
     
-    CreateFont $MUI_TEMP2 "$(MUI_FONT)" "12" "700"
+    CreateFont $MUI_TEMP2 "$(^Font)" "12" "700"
     SendMessage $MUI_TEMP1 ${WM_SETFONT} $MUI_TEMP2 0
     
     GetDlgItem $MUI_TEMP1 $MUI_HWND 1202
@@ -1969,17 +1969,6 @@ Var MUI_TEMP2
 
 !macroend
 
-!macro MUI_LANGUAGEFILE_LANGSTRING_FONT NAME DEFAULT
-
-  !ifdef "${NAME}"
-    Langstring "${NAME}" 0 "${${NAME}}"
-    !undef "${NAME}"
-  !else
-    Langstring "${NAME}" 0 "${DEFAULT}"
-  !endif
-
-!macroend
-
 !macro MUI_LANGUAGEFILE_END
 
   !include "${NSISDIR}\Contrib\Modern UI\Language files\Default.nsh"
@@ -1997,9 +1986,6 @@ Var MUI_TEMP2
     !define MUI_LANGDLL_PUSHLIST "'${MUI_${LANGUAGE}_LANGNAME}' ${LANG_${LANGUAGE}} ${MUI_LANGDLL_PUSHLIST_TEMP}"
   !endif
  
-  !insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONT" "MS Shell Dlg"
-  !insertmacro MUI_LANGUAGEFILE_LANGSTRING_FONT "MUI_FONTSIZE" "8"
- 
   !insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF "MUI_BGCOLOR"
   
   !insertmacro MUI_LANGUAGEFILE_LANGSTRING_PAGE WELCOME "MUI_TEXT_WELCOME_INFO_TITLE"