diff --git a/gui/dialogs/shader-options.xml b/gui/dialogs/shader-options.xml
index 044ffc9f6..fc58c114d 100644
--- a/gui/dialogs/shader-options.xml
+++ b/gui/dialogs/shader-options.xml
@@ -1,205 +1,157 @@
 <?xml version="1.0"?>
 
 <PropertyList>
-  <name>shader-options</name>
-  <modal>false</modal>
-  <layout>vbox</layout>
-
-    <checkbox>
-      <halign>left</halign>
-      <label>Enable effects</label>
-      <property>/sim/rendering/shader-effects</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-
-  <hrule/>
-<!--
-  <button>
-    <halign>left</halign>
-    <legend>Terrain</legend>
-    <binding>
-      <command>dialog-show</command>
-      <dialog-name>terrain-shaders</dialog-name>
-    </binding>
-  </button>
-
-  <button>
-    <halign>left</halign>
-    <legend>Atmosphere</legend>
-    <binding>
-      <command>dialog-show</command>
-      <dialog-name>atmosphere-shaders</dialog-name>
-    </binding>
-  </button>
-
-  <button>
-    <halign>left</halign>
-    <legend>Water</legend>
-    <binding>
-      <command>dialog-show</command>
-      <dialog-name>water-shaders</dialog-name>
-    </binding>
-  </button>
-    
-  <button>
-    <halign>left</halign>
-    <legend>AI models</legend>
-    <binding>
-      <command>dialog-show</command>
-      <dialog-name>ai-shaders</dialog-name>
-    </binding>
-  </button>
-
-    <button>
-      <legend>Close</legend>
-      <default>true</default>
-      <key>Esc</key>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
--->
-  <text>
-    <label>Terrain Effects</label>
-  </text>
-  <group>
+    <name>shader-options</name>
+    <modal>false</modal>
     <layout>vbox</layout>
-    <halign>center</halign>
 
     <checkbox>
-      <halign>left</halign>
-      <label>Random vegetation</label>
-      <property>/sim/rendering/random-vegetation</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-
-      <checkbox>
         <halign>left</halign>
-        <label>Crop texture</label>
-        <property>/sim/rendering/crop-shader</property>
-        <binding>
-            <command>dialog-apply</command>
-        </binding>
-      </checkbox>
-
-      <checkbox>
-        <halign>left</halign>
-        <label>Landmass effects</label>
-        <property>/sim/rendering/landmass-shader</property>
+        <label>Enable effects</label>
+        <property>/sim/rendering/shader-effects</property>
         <binding>
             <command>dialog-apply</command>
         </binding>
     </checkbox>
-  </group>
-  <hrule/>
 
-  <text>
-    <label>Atmosphere Effects</label>
-  </text>
-
-  <group>
-    <padding>8</padding>
-    <layout>vbox</layout>
-    <checkbox>
-        <padding>8</padding>
-        <halign>left</halign>
-        <label>Enable 3d clouds</label>
-        <property>/sim/rendering/clouds3d-enable</property>
-        <binding>
-            <command>dialog-apply</command>
-        </binding>
-    </checkbox>
-    
-    
-    <group>
-      <layout>hbox</layout>
-      <halign>right</halign>
-      <text><label>Cloud density</label></text>
-      <slider>
-        <min>0</min>
-        <max>1.0</max>
-
-        <property>/sim/rendering/clouds3d-density</property>
-        <binding>
-          <command>dialog-apply</command>
-        </binding>
-      </slider>
-      <text>
-        <label>12345678</label>
-        <format>%.2f</format>
-        <live>true</live>
-        <property>/sim/rendering/clouds3d-density</property>
-      </text>
-    </group>
+    <hrule/>
 
     <group>
-        <layout>hbox</layout>
-        <halign>right</halign>
-        <text><label>Cloud visibility range</label></text>
-        <slider>
-            <min>100.0</min>
-            <max>20000.0</max>
-            
-            <property>/sim/rendering/clouds3d-vis-range</property>
+        <text>
+            <label>Terrain Effects</label>
+        </text>
+
+        <layout>vbox</layout>
+        <halign>center</halign>
+
+        <checkbox>
+            <halign>left</halign>
+            <label>Random vegetation</label>
+            <property>/sim/rendering/random-vegetation</property>
             <binding>
                 <command>dialog-apply</command>
             </binding>
-        </slider>
+        </checkbox>
+
+        <checkbox>
+            <halign>left</halign>
+            <label>Crop texture</label>
+            <property>/sim/rendering/crop-shader</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+
+        <checkbox>
+            <halign>left</halign>
+            <label>Landmass effects</label>
+            <property>/sim/rendering/landmass-shader</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+    </group>
+
+    <hrule/>
+
+    <group>
         <text>
-            <label>12345678</label>
-            <format>%.fm</format>
-            <live>true</live>
-            <property>/sim/rendering/clouds3d-vis-range</property>
+            <label>Atmosphere Effects</label>
+        </text>
+
+        <padding>8</padding>
+        <layout>vbox</layout>
+
+        <checkbox>
+            <padding>8</padding>
+            <halign>left</halign>
+            <label>Enable 3d clouds</label>
+            <property>/sim/rendering/clouds3d-enable</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+
+        <group>
+            <layout>hbox</layout>
+            <halign>right</halign>
+            <text><label>Cloud density</label></text>
+            <slider>
+                <min>0</min>
+                <max>1.0</max>
+                <property>/sim/rendering/clouds3d-density</property>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+            </slider>
+            <text>
+                <label>12345678</label>
+                <format>%.2f</format>
+                <live>true</live>
+                <property>/sim/rendering/clouds3d-density</property>
+            </text>
+        </group>
+
+        <group>
+            <layout>hbox</layout>
+            <halign>right</halign>
+            <text><label>Cloud visibility range</label></text>
+            <slider>
+                <min>100.0</min>
+                <max>20000.0</max>
+                <property>/sim/rendering/clouds3d-vis-range</property>
+                <binding>
+                    <command>dialog-apply</command>
+                </binding>
+            </slider>
+            <text>
+                <label>12345678</label>
+                <format>%.fm</format>
+                <live>true</live>
+                <property>/sim/rendering/clouds3d-vis-range</property>
+            </text>
+        </group>
+    </group>
+
+    <hrule/>
+
+    <group>
+        <text>
+            <label>Water Effects</label>
+        </text>
+        <layout>vbox</layout>
+        <halign>center</halign>
+
+        <checkbox>
+            <halign>left</halign>
+            <label>Light reflection</label>
+            <property>/sim/rendering/water-shader</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+    </group>
+
+    <hrule/>
+
+    <group>
+        <text>
+            <label>Model Effects</label>
         </text>
     </group>
-  </group>
 
-  <hrule/>
+    <hrule/>
 
-  <text>
-    <label>Water Effects</label>
-  </text>
-
-  <group>
-    <layout>vbox</layout>
-    <halign>center</halign>
-
-      <checkbox>
-        <halign>left</halign>
-        <label>Light reflection</label>
-        <property>/sim/rendering/water-shader</property>
+    <button>
+        <legend>Close</legend>
+        <default>true</default>
+        <key>Esc</key>
         <binding>
             <command>dialog-apply</command>
         </binding>
-      </checkbox>
-  </group>
-  
-<hrule/>
-  <text>
-    <label>Model Effects</label>
-  </text>
-  <group>
-  </group>
-  <hrule/>
-
-    <button>
-      <legend>Close</legend>
-      <default>true</default>
-      <key>Esc</key>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
+        <binding>
+            <command>dialog-close</command>
+        </binding>
     </button>
 
-
 </PropertyList>