Index: binaries/data/mods/public/gui/options/options.json
===================================================================
--- binaries/data/mods/public/gui/options/options.json
+++ binaries/data/mods/public/gui/options/options.json
@@ -161,50 +161,6 @@
 			},
 			{
 				"type": "boolean",
-				"label": "Shadows",
-				"tooltip": "Enable shadows.",
-				"config": "shadows",
-				"function": "Renderer_SetShadowsEnabled"
-			},
-			{
-				"type": "dropdown",
-				"label": "Shadow quality",
-				"tooltip": "Shadow map resolution. High values can crash the game when using a graphics card with low memory!",
-				"dependencies": ["shadows"],
-				"config": "shadowquality",
-				"function": "Renderer_RecreateShadowMap",
-				"list": [
-					{ "value": -2, "label": "Very Low" },
-					{ "value": -1, "label": "Low" },
-					{ "value": 0, "label": "Medium" },
-					{ "value": 1, "label": "High" },
-					{ "value": 2, "label": "Very High" }
-				]
-			},
-			{
-				"type": "boolean",
-				"label": "Shadow filtering",
-				"tooltip": "Smooth shadows.",
-				"dependencies": ["shadows"],
-				"config": "shadowpcf",
-				"function": "Renderer_SetShadowPCFEnabled"
-			},
-			{
-				"type": "boolean",
-				"label": "Unit silhouettes",
-				"tooltip": "Show outlines of units behind structures.",
-				"config": "silhouettes",
-				"function": "Renderer_SetSilhouettesEnabled"
-			},
-			{
-				"type": "boolean",
-				"label": "Particles",
-				"tooltip": "Enable particles.",
-				"config": "particles",
-				"function": "Renderer_SetParticlesEnabled"
-			},
-			{
-				"type": "boolean",
 				"label": "Water effects",
 				"tooltip": "When OFF, use the lowest settings possible to render water. This makes other settings irrelevant.",
 				"config": "watereffects",
@@ -252,13 +208,6 @@
 			},
 			{
 				"type": "boolean",
-				"label": "Smooth vision",
-				"tooltip": "Lift darkness and fog-of-war smoothly.",
-				"config": "smoothlos",
-				"function": "Renderer_SetSmoothLOSEnabled"
-			},
-			{
-				"type": "boolean",
 				"label": "Show sky",
 				"tooltip": "Render Sky.",
 				"config": "showsky",
@@ -289,6 +238,117 @@
 		]
 	},
 	{
+		"label": "Simulation Graphics",
+		"options":
+		[
+			{
+				"type": "boolean",
+				"label": "Shadows",
+				"tooltip": "Enable shadows.",
+				"config": "shadows",
+				"function": "Renderer_SetShadowsEnabled"
+			},
+			{
+				"type": "dropdown",
+				"label": "Shadow quality",
+				"tooltip": "Shadow map resolution. High values can crash the game when using a graphics card with low memory!",
+				"dependencies": ["shadows"],
+				"config": "shadowquality",
+				"function": "Renderer_RecreateShadowMap",
+				"list": [
+					{ "value": -2, "label": "Very Low" },
+					{ "value": -1, "label": "Low" },
+					{ "value": 0, "label": "Medium" },
+					{ "value": 1, "label": "High" },
+					{ "value": 2, "label": "Very High" }
+				]
+			},
+			{
+				"type": "boolean",
+				"label": "Shadow filtering",
+				"tooltip": "Smooth shadows.",
+				"dependencies": ["shadows"],
+				"config": "shadowpcf",
+				"function": "Renderer_SetShadowPCFEnabled"
+			},
+			{
+				"type": "boolean",
+				"label": "Unit silhouettes",
+				"tooltip": "Show outlines of units behind structures.",
+				"config": "silhouettes",
+				"function": "Renderer_SetSilhouettesEnabled"
+			},
+			{
+				"type": "boolean",
+				"label": "Particles",
+				"tooltip": "Enable particles.",
+				"config": "particles",
+				"function": "Renderer_SetParticlesEnabled"
+			},
+			{
+				"type": "boolean",
+				"label": "Smooth vision",
+				"tooltip": "Lift darkness and fog-of-war smoothly.",
+				"config": "smoothlos",
+				"function": "Renderer_SetSmoothLOSEnabled"
+			},
+			{
+				"type": "boolean",
+				"label": "Attack range visualization",
+				"tooltip": "Display the attack range of selected defensive structures (can also be toggled in-game with the hotkey).",
+				"config": "gui.session.attackrange"
+			},
+			{
+				"type": "boolean",
+				"label": "Aura range visualization",
+				"tooltip": "Display the range of auras of selected units and structures (can also be toggled in-game with the hotkey).",
+				"config": "gui.session.aurasrange"
+			},
+			{
+				"type": "boolean",
+				"label": "Heal range visualization",
+				"tooltip": "Display the healing range of selected units (can also be toggled in-game with the hotkey).",
+				"config": "gui.session.healrange"
+			},
+			{
+				"type": "boolean",
+				"label": "Rank icon above status bar",
+				"tooltip": "Show rank icons above status bars.",
+				"config": "gui.session.rankabovestatusbar"
+			},
+			{
+				"type": "boolean",
+				"label": "Experience status bar",
+				"tooltip": "Show an experience status bar above each selected unit.",
+				"config": "gui.session.experiencestatusbar"
+			},
+			{
+				"type": "color",
+				"label": "Diplomacy colors: self",
+				"tooltip": "Color of your units when diplomacy colors are enabled.",
+				"config": "gui.session.diplomacycolors.self"
+			},
+			{
+				"type": "color",
+				"label": "Diplomacy colors: ally",
+				"tooltip": "Color of allies when diplomacy colors are enabled.",
+				"config": "gui.session.diplomacycolors.ally"
+			},
+			{
+				"type": "color",
+				"label": "Diplomacy colors: neutral",
+				"tooltip": "Color of neutral players when diplomacy colors are enabled.",
+				"config": "gui.session.diplomacycolors.neutral"
+			},
+			{
+				"type": "color",
+				"label": "Diplomacy colors: enemy",
+				"tooltip": "Color of enemies when diplomacy colors are enabled.",
+				"config": "gui.session.diplomacycolors.enemy"
+			}
+		]
+	},
+	{
 		"label": "Sound",
 		"options":
 		[
@@ -510,36 +570,6 @@
 			},
 			{
 				"type": "boolean",
-				"label": "Attack range visualization",
-				"tooltip": "Display the attack range of selected defensive structures (can also be toggled in-game with the hotkey).",
-				"config": "gui.session.attackrange"
-			},
-			{
-				"type": "boolean",
-				"label": "Aura range visualization",
-				"tooltip": "Display the range of auras of selected units and structures (can also be toggled in-game with the hotkey).",
-				"config": "gui.session.aurasrange"
-			},
-			{
-				"type": "boolean",
-				"label": "Heal range visualization",
-				"tooltip": "Display the healing range of selected units (can also be toggled in-game with the hotkey).",
-				"config": "gui.session.healrange"
-			},
-			{
-				"type": "boolean",
-				"label": "Rank icon above status bar",
-				"tooltip": "Show rank icons above status bars.",
-				"config": "gui.session.rankabovestatusbar"
-			},
-			{
-				"type": "boolean",
-				"label": "Experience status bar",
-				"tooltip": "Show an experience status bar above each selected unit.",
-				"config": "gui.session.experiencestatusbar"
-			},
-			{
-				"type": "boolean",
 				"label": "Detailed tooltips",
 				"tooltip": "Show detailed tooltips for trainable units in unit-producing structures.",
 				"config": "showdetailedtooltips"
@@ -556,30 +586,6 @@
 				]
 			},
 			{
-				"type": "color",
-				"label": "Diplomacy colors: self",
-				"tooltip": "Color of your units when diplomacy colors are enabled.",
-				"config": "gui.session.diplomacycolors.self"
-			},
-			{
-				"type": "color",
-				"label": "Diplomacy colors: ally",
-				"tooltip": "Color of allies when diplomacy colors are enabled.",
-				"config": "gui.session.diplomacycolors.ally"
-			},
-			{
-				"type": "color",
-				"label": "Diplomacy colors: neutral",
-				"tooltip": "Color of neutral players when diplomacy colors are enabled.",
-				"config": "gui.session.diplomacycolors.neutral"
-			},
-			{
-				"type": "color",
-				"label": "Diplomacy colors: enemy",
-				"tooltip": "Color of enemies when diplomacy colors are enabled.",
-				"config": "gui.session.diplomacycolors.enemy"
-			},
-			{
 				"type": "dropdown",
 				"label": "Snap to edges",
 				"tooltip": "This option allows to align new structures with nearby structures.",