diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index a8a773821..3b90ab927 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -113,86 +113,6 @@
         <command>dialog-apply</command>
       </binding>
     </checkbox>
-
-    <checkbox>
-      <halign>left</halign>
-      <label>Random vegetation</label>
-      <property>/sim/rendering/random-vegetation</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-  </group>
-
-  <hrule/>
-
-  <group>
-    <padding>8</padding>
-    <layout>vbox</layout>
-    <text>
-      <padding>-6</padding>
-      <halign>left</halign>
-      <label>3D Clouds</label>
-      <color>
-        <red>0.5</red>
-        <green>0.5</green>
-        <blue>0.5</blue>
-      </color>
-    </text>
-
-    <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/>
@@ -241,48 +161,7 @@
 
   <hrule/>
 
-  <group>
-    <padding>8</padding>
-    <layout>hbox</layout>
-    <group>
-      <layout>vbox</layout>
-      <valign>top</valign>
-      <halign>left</halign>
-      <text>
-        <padding>-6</padding>
-        <label>Shaders</label>
-        <color>
-          <red>0.5</red>
-          <green>0.5</green>
-          <blue>0.5</blue>
-        </color>
-      </text>
-    </group>
-    <group>
-      <layout>vbox</layout>
-      <group>
-        <layout>hbox</layout>
-        <checkbox>
-          <halign>left</halign>
-          <label>Enable</label>
-          <property>/sim/rendering/shader-effects</property>
-          <binding>
-             <command>dialog-apply</command>
-          </binding>
-        </checkbox>
-        <checkbox>
-          <halign>left</halign>
-          <label>Experimental effects</label>
-          <property>/sim/rendering/shader-experimental</property>
-          <binding>
-             <command>dialog-apply</command>
-          </binding>
-        </checkbox>
-      </group>
-    </group>
-  </group>
-
-  <group>
+<group>
     <layout>hbox</layout>
     <empty><stretch>true</stretch></empty>
 
diff --git a/gui/dialogs/shader-options.xml b/gui/dialogs/shader-options.xml
new file mode 100644
index 000000000..044ffc9f6
--- /dev/null
+++ b/gui/dialogs/shader-options.xml
@@ -0,0 +1,205 @@
+<?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>
+    <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>
+        <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>
+
+    <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/>
+
+  <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>
+        <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>
+    </button>
+
+
+</PropertyList>
diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml
index 345eca677..e6823ae19 100644
--- a/gui/dialogs/view.xml
+++ b/gui/dialogs/view.xml
@@ -11,6 +11,17 @@
 
 	<hrule/>
 
+	<checkbox>
+		<halign>left</halign>
+		<label>Enable view name popup</label>
+		<property>/sim/view-name-popup</property>
+		<binding>
+			<command>dialog-apply</command>
+		</binding>
+	</checkbox>
+
+	<hrule/>
+
 	<nasal>
 		<open>
 			var group = cmdarg().getNode("group");
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 120dae0f9..569a4f224 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -116,6 +116,14 @@
 			</binding>
 		</item>
 
+		<item>
+			<label>Effects</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>shader-options</dialog-name>
+			</binding>
+		</item>
+
 		<item>
 			<label>Cockpit View Options</label>
 			<binding>