diff --git a/source/common/console/c_bind.cpp b/source/common/console/c_bind.cpp
index 459c6b08a..a95251978 100644
--- a/source/common/console/c_bind.cpp
+++ b/source/common/console/c_bind.cpp
@@ -703,6 +703,19 @@ void C_BindDefaults()
 	CONFIG_SetDefaultKeys(cl_defaultconfiguration == 1 ? "engine/origbinds.txt" : cl_defaultconfiguration == 2 ? "engine/leftbinds.txt" : "engine/defbinds.txt");
 }
 
+CCMD(controlpreset)
+{
+	if (argv.argc() < 2)
+	{
+		Printf("Usage: Controlpreset {0,1,2}\n");
+		return;
+	}
+	int v = atoi(argv[1]);
+	if (v < 0 || v > 2) return;
+	cl_defaultconfiguration = v;
+	C_BindDefaults();
+}
+
 CCMD(binddefaults)
 {
 	C_BindDefaults();
diff --git a/source/common/menu/optionmenuitems.h b/source/common/menu/optionmenuitems.h
index 6362de732..6e1b9005f 100644
--- a/source/common/menu/optionmenuitems.h
+++ b/source/common/menu/optionmenuitems.h
@@ -158,7 +158,8 @@ public:
 		auto msg = GStrings.localize(mPrompt.IsNotEmpty()? mPrompt.GetChars() : "$SAFEMESSAGE");
 		auto actionLabel = GStrings.localize(mLabel.GetChars());
 
-		FStringf FullString("%s%s%s\n\n%s", TEXTCOLOR_WHITE, actionLabel, TEXTCOLOR_NORMAL, msg);
+		//FStringf FullString("%s%s%s\n\n%s", TEXTCOLOR_WHITE, actionLabel, TEXTCOLOR_NORMAL, msg);
+		FStringf FullString("- %s -\n%s", actionLabel, msg);
 		M_StartMessage(FullString, 0, mScriptId);
 		return true;
 	}
diff --git a/wadsrc/static/engine/language.csv b/wadsrc/static/engine/language.csv
index 9ea17b163..eb696b0a9 100644
--- a/wadsrc/static/engine/language.csv
+++ b/wadsrc/static/engine/language.csv
@@ -240,7 +240,7 @@ Default,CTRL_DEFAULT,,,,,Standard,,,,,,,,,,,,,,,,,
 Classic,CTRL_CLASSIC,,,,,"Klassisch
 ",,,,,,,,,,,,,,,,,
 Left-handed,CTRL_LEFTHANDED,,,,,Linkshändig,,,,,,,,,,,,,,,,,
-Preferred control preset,CTRL_PRESET,,,,,Bevorzugter Steuerungsstandard,,,,,,,,,,,,,,,,,
+Control presets,CTRL_PRESET,,,,,Voreinstellungen,,,,,,,,,,,,,,,,,
 Customize Controls,CNTRLMNU_TITLE,,,,Nastavení ovládání,Steuerung einstellen,,Agordi Regilojn,Personalizar Controles ,,Ohjausasetukset,Modifier contrôles,Irányítás testreszabása,Personalizza i controlli,キー配置変更,조작 사용자 지정,Instellen van de controle,Ustaw Klawisze,Configurar Controles,Configurar Controlos,,Настройки управления,Подешавања контрола
 "ENTER to change, BACKSPACE to clear",CNTRLMNU_SWITCHTEXT1,,,,"ENTER pro změnu, BACKSPACE pro smazání",ENTER: Editieren BACKSPACE: Löschen,,"ENTER klavo por ŝanĝi, BACKSPACE klavo por viŝi","ENTER para cambiar, BACKSPACE para limpiar",,"Aseta ENTERILLÄ, tyhjennä ASKELPALAUTTIMELLA","ENTREE pour changer, RET. ARRIERE pour effacer.","ENTER a változtatáshoz, BACKSPACE a törléshez","INVIO per modificare, BACKSPACE per ripulire",Enter で決定、BackSpaceで無効化,"바꿀려면 ENTER키, 지울려면 BACKSPACE키를 누르시오","ENTER om te veranderen, BACKSPACE om te wissen.","ENTER by zmienić, BACKSPACE by wyczyścić","ENTER para alterar, BACKSPACE para limpar",,,"ENTER — изменить, BACKSPACE — очистить","ENTER за промену, BACKSPACE за чишћење"
 "Press new key for control, ESC to cancel",CNTRLMNU_SWITCHTEXT2,,,,"Zmáčkni novou klávesu pro nastavení, ESC pro storno",Drücke eine Taste oder ESC um abzubrechen,,"Premi novan klavon por reakiri regilon, ESC por nuligi","Presiona una tecla para el control, ESC para cancelar",,"Valitse näppäin toiminnolle, ESC peruuttaa","Appuyez sur la nouvelle touche pour l'assigner,
diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt
index b9f5df125..d629e629a 100644
--- a/wadsrc/static/engine/menudef.txt
+++ b/wadsrc/static/engine/menudef.txt
@@ -677,6 +677,11 @@ OptionMenu "CustomizeControls"// protected
 	Submenu    "$CNTRLMNU_INVENTORY"   , "InventoryControlsMenu"
 	Submenu    "$CNTRLMNU_OTHER"       , "OtherControlsMenu"
 	//Submenu    "$MAPCNTRLMNU_CONTROLS" , "MapControlsMenu" // todo after thorough cleanup
+	StaticText ""
+	StaticText "$CTRL_PRESET"
+	SafeCommand		"$CTRL_DEFAULT",		"controlpreset 0" //engine/defbinds.txt
+	SafeCommand		"$CTRL_CLASSIC",		"controlpreset 1" //engine/origbinds.txt
+	SafeCommand		"$CTRL_LEFTHANDED",		"controlpreset 2" //engine/leftbinds.txt
 }
 
 OptionMenu "ActionControlsMenu"// protected
@@ -1509,11 +1514,18 @@ OptionValue MaxFps
 	200, "$OPTVAL_200FPS"
 }
 
+OptionValue GPUSwitch
+{
+	0.0, "$OPTVAL_DEFAULT"
+	1.0, "$OPTVAL_DEDICATED"
+	2.0, "$OPTVAL_INTEGRATED"
+}
+
 OptionMenu VideoModeMenu //protected
 {
 	Title "$VIDMNU_TITLE"
 	
-	Option "$VIDMNU_FULLSCREEN",		"fullscreen", "YesNo"
+	Option "$VIDMNU_FULLSCREEN",		"vid_fullscreen", "YesNo"
 
 	IfOption(Mac)
 	{