diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp
index 89c93a1f4b..a482421d49 100644
--- a/Core/HLE/sceGe.cpp
+++ b/Core/HLE/sceGe.cpp
@@ -220,9 +220,6 @@ bool __GeHasPendingInterrupt()
 	return !ge_pending_cb.empty();
 }
 
-// The GE is implemented wrong - it should be parallel to the CPU execution instead of
-// synchronous.
-
 u32 sceGeEdramGetAddr()
 {
 	u32 retVal = 0x04000000;
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index 21825e56ea..75966b9d7f 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -898,12 +898,16 @@ namespace MainWindow
 				case ID_CPU_DYNAREC:
 					g_Config.bJit = true;
 					osm.ShowOnOff(g->T("Dynarec", "Dynarec (JIT)"), g_Config.bJit);
-					break;	
+					break;
 
 				case ID_CPU_INTERPRETER:
 					g_Config.bJit = false;
 					break;
 
+				case ID_CPU_MULTITHREADED:
+					g_Config.bSeparateCPUThread = !g_Config.bSeparateCPUThread;
+					break;
+
 				case ID_EMULATION_RUNONLOAD:
 					g_Config.bAutoRun = !g_Config.bAutoRun;
 					break;
@@ -1181,6 +1185,7 @@ namespace MainWindow
 		CHECKITEM(ID_OPTIONS_IGNOREILLEGALREADS,g_Config.bIgnoreBadMemAccess);
 		CHECKITEM(ID_CPU_INTERPRETER,g_Config.bJit == false);
 		CHECKITEM(ID_CPU_DYNAREC,g_Config.bJit == true);
+		CHECKITEM(ID_CPU_MULTITHREADED, g_Config.bSeparateCPUThread);
 		CHECKITEM(ID_OPTIONS_SHOWDEBUGSTATISTICS, g_Config.bShowDebugStats);
 		CHECKITEM(ID_OPTIONS_HARDWARETRANSFORM, g_Config.bHardwareTransform);
 		CHECKITEM(ID_OPTIONS_FASTMEMORY, g_Config.bFastMemory);
@@ -1318,21 +1323,22 @@ namespace MainWindow
 		ModifyMenu(menu, ID_TOGGLE_PAUSE, MF_BYCOMMAND | MF_STRING, ID_TOGGLE_PAUSE, pauseMenuText);
 
 		UINT ingameEnable = globalUIState == UISTATE_INGAME ? MF_ENABLED : MF_GRAYED;
-		EnableMenuItem(menu,ID_TOGGLE_PAUSE, ingameEnable);
-		EnableMenuItem(menu,ID_EMULATION_STOP, ingameEnable);
-		EnableMenuItem(menu,ID_EMULATION_RESET, ingameEnable);
+		EnableMenuItem(menu, ID_TOGGLE_PAUSE, ingameEnable);
+		EnableMenuItem(menu, ID_EMULATION_STOP, ingameEnable);
+		EnableMenuItem(menu, ID_EMULATION_RESET, ingameEnable);
 
 		UINT menuEnable = globalUIState == UISTATE_MENU ? MF_ENABLED : MF_GRAYED;
-		EnableMenuItem(menu,ID_FILE_SAVESTATEFILE, !menuEnable);
-		EnableMenuItem(menu,ID_FILE_LOADSTATEFILE, !menuEnable);
-		EnableMenuItem(menu,ID_FILE_QUICKSAVESTATE, !menuEnable);
-		EnableMenuItem(menu,ID_FILE_QUICKLOADSTATE, !menuEnable);
-		EnableMenuItem(menu,ID_CPU_DYNAREC, menuEnable);
-		EnableMenuItem(menu,ID_CPU_INTERPRETER, menuEnable);
-		EnableMenuItem(menu,ID_TOGGLE_PAUSE, !menuEnable);
-		EnableMenuItem(menu,ID_EMULATION_STOP, !menuEnable);
-		EnableMenuItem(menu,ID_EMULATION_RESET, !menuEnable);
-		EnableMenuItem(menu,ID_DEBUG_LOG, !g_Config.bEnableLogging);
+		EnableMenuItem(menu, ID_FILE_SAVESTATEFILE, !menuEnable);
+		EnableMenuItem(menu, ID_FILE_LOADSTATEFILE, !menuEnable);
+		EnableMenuItem(menu, ID_FILE_QUICKSAVESTATE, !menuEnable);
+		EnableMenuItem(menu, ID_FILE_QUICKLOADSTATE, !menuEnable);
+		EnableMenuItem(menu, ID_CPU_DYNAREC, menuEnable);
+		EnableMenuItem(menu, ID_CPU_INTERPRETER, menuEnable);
+		EnableMenuItem(menu, ID_CPU_MULTITHREADED, menuEnable);
+		EnableMenuItem(menu, ID_TOGGLE_PAUSE, !menuEnable);
+		EnableMenuItem(menu, ID_EMULATION_STOP, !menuEnable);
+		EnableMenuItem(menu, ID_EMULATION_RESET, !menuEnable);
+		EnableMenuItem(menu, ID_DEBUG_LOG, !g_Config.bEnableLogging);
 	}
 
 	// Message handler for about box.
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 8caf6bdf46..fc6b8b92bc 100644
Binary files a/Windows/ppsspp.rc and b/Windows/ppsspp.rc differ
diff --git a/Windows/resource.h b/Windows/resource.h
index 65f81e219a..fc180d7bb9 100644
Binary files a/Windows/resource.h and b/Windows/resource.h differ