diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang
index 024204739..41a77dbcb 100644
--- a/Lang/Chinese (Simplified).pj.Lang	
+++ b/Lang/Chinese (Simplified).pj.Lang	
@@ -88,7 +88,7 @@
 #198#  "插槽 8"
 #199#  "插槽 9"
 #200#  "插槽 10"
-#201#  "插槽 (%s) 被选"
+#201#  "插槽 (%ws) 被选"
 
 //Pop up Menu
 #210#  "运行游戏"
diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang
index 7a3a5aafd..ea3a5e8ac 100644
--- a/Lang/English.pj.Lang
+++ b/Lang/English.pj.Lang
@@ -88,7 +88,7 @@
 #198#  "Slot 8"
 #199#  "Slot 9"
 #200#  "Slot 10"
-#201#  "Save Slot (%s) selected"
+#201#  "Save Slot (%ws) selected"
 
 //Pop up Menu
 #210#  "Play Game"
diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h
index c1e9ed0f3..fd1042845 100644
--- a/Source/Project64/Multilanguage.h
+++ b/Source/Project64/Multilanguage.h
@@ -117,7 +117,7 @@ enum LanguageStringID{
 	MENU_SLOT_8			=	198,
 	MENU_SLOT_9			=	199,
 	MENU_SLOT_10		=	200,
-	MENU_SLOT_SAVE		=   201,
+	MENU_SLOT_SAVE		=	201,
 
 //Pop up Menu
 	POPUP_PLAY			=	210,
diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp
index 1025cc380..e002f27fa 100644
--- a/Source/Project64/Multilanguage/Language Class.cpp	
+++ b/Source/Project64/Multilanguage/Language Class.cpp	
@@ -124,7 +124,7 @@ void CLanguage::LoadDefaultStrings (void)
     DEF_STR(MENU_SLOT_8,      L"Slot 8"             );
     DEF_STR(MENU_SLOT_9,      L"Slot 9"             );
     DEF_STR(MENU_SLOT_10,     L"Slot 10"            );
-	DEF_STR(MENU_SLOT_SAVE,	  L"Save Slot (%s) selected");
+    DEF_STR(MENU_SLOT_SAVE,	  L"Save Slot (%s) selected");
 
     //Pop up Menu
     DEF_STR(POPUP_PLAY,      L"Play Game"  );
diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp
index 8505b6169..4cde81bac 100644
--- a/Source/Project64/User Interface/Main Menu Class.cpp	
+++ b/Source/Project64/User Interface/Main Menu Class.cpp	
@@ -519,7 +519,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
     case ID_DEBUGGER_INTERRUPT_PI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_PI); break;
     case ID_DEBUGGER_INTERRUPT_DP: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_DP); break;
     case ID_CURRENT_SAVE_DEFAULT:
-		g_Notify->DisplayMessageWide(3, GS(MENU_SLOT_SAVE), GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str());
+        g_Notify->DisplayMessageWide(3, GS(MENU_SLOT_SAVE), GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str());
         g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)(MenuID - ID_CURRENT_SAVE_DEFAULT));
         break;
     case ID_CURRENT_SAVE_1:
@@ -531,8 +531,8 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
     case ID_CURRENT_SAVE_7:
     case ID_CURRENT_SAVE_8:
     case ID_CURRENT_SAVE_9:
-	case ID_CURRENT_SAVE_10:
-		g_Notify->DisplayMessageWide(3, GS(MENU_SLOT_SAVE), GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1).c_str());
+    case ID_CURRENT_SAVE_10:
+        g_Notify->DisplayMessageWide(3, GS(MENU_SLOT_SAVE), GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1).c_str());
         g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)((MenuID - ID_CURRENT_SAVE_1) + 1));
         break;
     case ID_HELP_SUPPORTFORUM: ShellExecute(NULL, "open", "http://forum.pj64-emu.com/", NULL, NULL, SW_SHOWMAXIMIZED); break;
diff --git a/Source/Project64/User Interface/Notification Class.cpp b/Source/Project64/User Interface/Notification Class.cpp
index 1e270d7eb..126f1d99f 100644
--- a/Source/Project64/User Interface/Notification Class.cpp	
+++ b/Source/Project64/User Interface/Notification Class.cpp	
@@ -115,19 +115,19 @@ void CNotification::DisplayMessage(int DisplayTime, const wchar_t * Message) con
 
 void CNotification::DisplayMessageWide(int DisplayTime, const wchar_t * Message, ...) const
 {
-	va_list ap;
-	va_start(ap, Message);
-	DisplayMessageWide(DisplayTime, Message, ap);
+    va_list ap;
+    va_start(ap, Message);
+    DisplayMessageWide(DisplayTime, Message, ap);
 }
 
 void CNotification::DisplayMessageWide(int DisplayTime, const wchar_t * Message, va_list ap) const
 {
-	wchar_t Msg[1000];
+    wchar_t Msg[1000];
 
-	_vsnwprintf(Msg, sizeof(Msg) - 1, Message, ap);
-	va_end(ap);
+    _vsnwprintf(Msg, sizeof(Msg) - 1, Message, ap);
+    va_end(ap);
 
-	DisplayMessage(DisplayTime, Msg);
+    DisplayMessage(DisplayTime, Msg);
 }
 
 void CNotification::DisplayMessage2(const wchar_t * Message) const