Index: binaries/data/mods/public/gui/session/developer_overlay.xml
===================================================================
--- binaries/data/mods/public/gui/session/developer_overlay.xml
+++ binaries/data/mods/public/gui/session/developer_overlay.xml
@@ -1,156 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <object
-	name="devCommands"
+	name="devCommandsOverlay"
 	type="image"
 	sprite="sessionOverlayBackground"
-	size="100%-225 50%-88 100%-8 50%+120"
+	size="100%-250 50%-200 100%-8 50%"
 	z="40"
 	hidden="true"
 	hotkey="session.devcommands.toggle"
 >
-	<action on="Press">
-		toggleDeveloperOverlay();
-	</action>
-
-	<!-- Control all units -->
-	<object size="0 0 100%-18 16" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Control all units</translatableAttribute>
-	</object>
-	<object size="100%-16 0 100% 16" type="checkbox" name="devControlAll" style="ModernTickBox">
-		<action on="Press">
-			Engine.PostNetworkCommand({
-				"type": "control-all",
-				"flag": this.checked
-			});
-		</action>
-	</object>
-
-	<!-- Change perspective -->
-	<object size="0 16 100%-18 32" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Change perspective</translatableAttribute>
-	</object>
-	<object size="100%-16 16 100% 32" type="checkbox" style="ModernTickBox">
-		<action on="Press">
-			toggleChangePerspective(this.checked);
-		</action>
-	</object>
-
-	<!-- Display selection state -->
-	<object size="0 32 100%-18 48" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Display selection state</translatableAttribute>
-	</object>
-	<object size="100%-16 32 100% 48" type="checkbox" name="devDisplayState" style="ModernTickBox"/>
-
-	<!-- Pathfinder overlay -->
-	<object size="0 48 100%-18 64" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Pathfinder overlay</translatableAttribute>
-	</object>
-	<object size="100%-16 48 100% 64" type="checkbox" style="ModernTickBox">
-		<action on="Press">
-			Engine.GuiInterfaceCall("SetPathfinderDebugOverlay", this.checked);
-		</action>
-	</object>
-
-	<!-- Obstruction overlay -->
-	<object size="0 64 100%-18 80" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Obstruction overlay</translatableAttribute>
-	</object>
-	<object size="100%-16 64 100% 80" type="checkbox" style="ModernTickBox">
-		<action on="Press">
-			Engine.GuiInterfaceCall("SetObstructionDebugOverlay", this.checked);
-		</action>
-	</object>
-
-	<!-- Unit motion overlay -->
-	<object size="0 80 100%-18 96" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Unit motion overlay</translatableAttribute>
-	</object>
-	<object size="100%-16 80 100% 96" type="checkbox" style="ModernTickBox">
-		<action on="Press">
-			g_Selection.SetMotionDebugOverlay(this.checked);
-		</action>
-	</object>
-
-	<!-- Range overlay -->
-	<object size="0 96 100%-18 112" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Range overlay</translatableAttribute>
-	</object>
-	<object size="100%-16 96 100% 112" type="checkbox" style="ModernTickBox">
-		<action on="Press">
-			Engine.GuiInterfaceCall("SetRangeDebugOverlay", this.checked);
-		</action>
+	<object name="dev_commands">
+		<repeat count="16">
+			<object name="dev_command[n]" size="0 0 100% 0">
+				<object name="dev_command_label[n]" size="0 0 100%-26 100%" type="text" style="devCommandsText"/>
+				<object name="dev_command_checkbox[n]" size="100%-24 1 100% 100%" type="checkbox" style="ModernTickBox"/>
+			</object>
+		</repeat>
 	</object>
-
-	<!-- Bounding box overlay -->
-	<object size="0 112 100%-18 128" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Bounding box overlay</translatableAttribute>
-	</object>
-	<object size="100%-16 112 100% 128" type="checkbox" style="ModernTickBox">
-		<action on="Press">
-			Engine.SetBoundingBoxDebugOverlay(this.checked);
-		</action>
-	</object>
-
-	<!-- Unrestricted camera -->
-	<object size="0 128 100%-18 144" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Restrict camera</translatableAttribute>
-	</object>
-	<object size="100%-16 128 100% 144" type="checkbox" style="ModernTickBox" checked="true">
-		<action on="Press">
-			Engine.GameView_SetConstrainCameraEnabled(this.checked);
-		</action>
-	</object>
-
-	<!-- Reveal map -->
-	<object size="0 144 100%-18 160" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Reveal map</translatableAttribute>
-	</object>
-	<object size="100%-16 144 100% 160" type="checkbox" name="devCommandsRevealMap" style="ModernTickBox">
-		<action on="Load">
-			this.checked = Engine.GuiInterfaceCall("IsMapRevealed");
-		</action>
-		<action on="Press">
-			Engine.PostNetworkCommand({
-				"type": "reveal-map",
-				"enable": this.checked
-			});
-		</action>
-	</object>
-
-	<!-- Time warp mode -->
-	<object size="0 160 100%-18 176" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Enable time warp</translatableAttribute>
-	</object>
-		<object size="100%-16 160 100% 176" type="checkbox" name="devTimeWarp" style="ModernTickBox">
-		<action on="Press">
-			if (this.checked)
-				showTimeWarpMessageBox();
-			Engine.EnableTimeWarpRecording(this.checked ? 10 : 0);
-		</action>
-	</object>
-
-	<!-- Promote units -->
-	<object size="0 176 100%-18 192" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Promote selected units</translatableAttribute>
-	</object>
-	<object size="100%-16 176 100% 192" type="button" style="ModernTickBox">
-		<action on="Press">
-			Engine.PostNetworkCommand({
-				"type": "promote",
-				"entities": g_Selection.toList()
-			});
-		</action>
-	</object>
-
-	<!-- Hierarchical pathfinder overlay -->
-	<object size="0 192 100%-18 208" type="text" style="devCommandsText">
-		<translatableAttribute id="caption">Hierarchical pathfinder overlay</translatableAttribute>
-	</object>
-	<object size="100%-16 192 100% 208" type="checkbox" style="ModernTickBox">
-		<action on="Press">
-			Engine.GuiInterfaceCall("SetPathfinderHierDebugOverlay", this.checked);
-		</action>
-	</object>
-
 </object>
Index: binaries/data/mods/public/gui/session/input.js
===================================================================
--- binaries/data/mods/public/gui/session/input.js
+++ binaries/data/mods/public/gui/session/input.js
@@ -796,7 +796,7 @@
 		ev.hotkey = null;
 
 	// Handle the time-warp testing features, restricted to single-player
-	if (!g_IsNetworked && Engine.GetGUIObjectByName("devTimeWarp").checked)
+	if (!g_IsNetworked && g_DeveloperOverlay.timeWrap)
 	{
 		if (ev.type == "hotkeydown" && ev.hotkey == "session.timewarp.fastforward")
 			Engine.SetSimRate(20.0);
Index: binaries/data/mods/public/gui/session/menu.js
===================================================================
--- binaries/data/mods/public/gui/session/menu.js
+++ binaries/data/mods/public/gui/session/menu.js
@@ -1235,31 +1235,6 @@
 	});
 }
 
-function toggleDeveloperOverlay()
-{
-	if (!g_GameAttributes.settings.CheatsEnabled && !g_IsReplay)
-		return;
-
-	let devCommands = Engine.GetGUIObjectByName("devCommands");
-	devCommands.hidden = !devCommands.hidden;
-
-	let message = devCommands.hidden ?
-		markForTranslation("The Developer Overlay was closed.") :
-		markForTranslation("The Developer Overlay was opened.");
-
-	// Only players can send the simulation chat command
-	if (Engine.GetPlayerID() == -1)
-		submitChatDirectly(message);
-	else
-		Engine.PostNetworkCommand({
-			"type": "aichat",
-			"message": message,
-			"translateMessage": true,
-			"translateParameters": [],
-			"parameters": {}
-		});
-}
-
 function closeOpenDialogs()
 {
 	closeMenu();
Index: binaries/data/mods/public/gui/session/session.js
===================================================================
--- binaries/data/mods/public/gui/session/session.js
+++ binaries/data/mods/public/gui/session/session.js
@@ -136,6 +136,8 @@
 	"controlAll": false
 };
 
+var g_DeveloperOverlay = null;
+
 /**
  * Whether the entire UI should be hidden (useful for promotional screenshots).
  * Can be toggled with a hotkey.
@@ -276,6 +278,9 @@
 			restoreSavedGameData(initData.savedGUIData);
 	}
 
+	g_DeveloperOverlay = new DeveloperOverlay();
+	g_DeveloperOverlay.init();
+
 	LoadModificationTemplates();
 	updatePlayerData();
 	initializeMusic(); // before changing the perspective
@@ -520,12 +525,6 @@
 	));
 }
 
-function toggleChangePerspective(enabled)
-{
-	g_DevSettings.changePerspective = enabled;
-	selectViewPlayer(g_ViewedPlayer);
-}
-
 /**
  * Change perspective tool.
  * Shown to observers or when enabling the developers option.
@@ -939,7 +938,6 @@
 	displayPanelEntities();
 
 	updateGroups();
-	updateDebug();
 	updatePlayerDisplay();
 	updateResearchDisplay();
 	updateSelectionDetails();
@@ -957,7 +955,6 @@
 	{
 		let playerState = GetSimState().players[g_ViewedPlayer];
 		g_DevSettings.controlAll = playerState && playerState.controlsAll;
-		Engine.GetGUIObjectByName("devControlAll").checked = g_DevSettings.controlAll;
 	}
 
 	if (!g_IsObserver)
@@ -970,6 +967,8 @@
 
 	updateViewedPlayerDropdown();
 	updateDiplomacy();
+
+	g_DeveloperOverlay.update();
 }
 
 function onReplayFinished()
@@ -1160,39 +1159,6 @@
 	}
 }
 
-function updateDebug()
-{
-	let debug = Engine.GetGUIObjectByName("debugEntityState");
-
-	if (!Engine.GetGUIObjectByName("devDisplayState").checked)
-	{
-		debug.hidden = true;
-		return;
-	}
-
-	debug.hidden = false;
-
-	let conciseSimState = clone(GetSimState());
-	conciseSimState.players = "<<<omitted>>>";
-	let text = "simulation: " + uneval(conciseSimState);
-
-	let selection = g_Selection.toList();
-	if (selection.length)
-	{
-		let entState = GetEntityState(selection[0]);
-		if (entState)
-		{
-			let template = GetTemplateData(entState.template);
-			text += "\n\nentity: {\n";
-			for (let k in entState)
-				text += "  " + k + ":" + uneval(entState[k]) + "\n";
-			text += "}\n\ntemplate: " + uneval(template);
-		}
-	}
-
-	debug.caption = text.replace(/\[/g, "\\[");
-}
-
 /**
  * Create ally player stat tooltip.
  * @param {string} resource - Resource type, on which values will be sorted.
@@ -1463,15 +1429,6 @@
 	Engine.PlayAmbientSound(pickRandom(g_Ambient), true);
 }
 
-function showTimeWarpMessageBox()
-{
-	messageBox(
-		500, 250,
-		translate("Note: time warp mode is a developer option, and not intended for use over long periods of time. Using it incorrectly may cause the game to run out of memory or crash."),
-		translate("Time warp mode")
-	);
-}
-
 /**
  * Adds the ingame time and ceasefire counter to the global FPS and
  * realtime counters shown in the top right corner.