diff --git a/Environment/environment.xml b/Environment/environment.xml
index 9765a6adf..87cfac7aa 100644
--- a/Environment/environment.xml
+++ b/Environment/environment.xml
@@ -76,26 +76,6 @@
   <weather-scenario>Fair weather</weather-scenario>
   <config>
 
-   <!-- definitions for the metar generated fog/mist/haze layer -->
-   <fog-mist-haze-layer>
-     <offset-from-station-elevation-ft>-200</offset-from-station-elevation-ft>
-     <visibility-above-layer-m>20000</visibility-above-layer-m>
-
-     <fog-thickness-ft>500</fog-thickness-ft>
-     <fog-2dlayer-alpha>0.6</fog-2dlayer-alpha>
-     <fog-2dlayer-coverage>broken</fog-2dlayer-coverage>
-     <fog-bc-2dlayer-coverage>scattered</fog-bc-2dlayer-coverage>
-     <fog-shallow-thickness-ft>30</fog-shallow-thickness-ft>
-
-     <mist-thickness-ft>2000</mist-thickness-ft>
-     <mist-2dlayer-alpha>0.8</mist-2dlayer-alpha>
-     <mist-2dlayer-coverage>overcast</mist-2dlayer-coverage>
-
-     <haze-thickness-ft>2000</haze-thickness-ft>
-     <haze-2dlayer-alpha>0.6</haze-2dlayer-alpha>
-     <haze-2dlayer-coverage>overcast</haze-2dlayer-coverage>
-   </fog-mist-haze-layer>
-
    <boundary-transition-ft>500</boundary-transition-ft>
 
    <boundary>
@@ -235,11 +215,31 @@
   </realwx>
 
   <params>
-   <metar-max-age-min type="long">240</metar-max-age-min> <!-- deprecated -->
+   <metar-max-age-min type="long">240</metar-max-age-min>
    <metar-updates-environment type="bool">true</metar-updates-environment>
    <metar-updates-winds-aloft type="bool">true</metar-updates-winds-aloft>
    <control-fdm-atmosphere type="bool">true</control-fdm-atmosphere>
    <contrail-altitude>30000</contrail-altitude>
+   <!-- definitions for the metar generated fog/mist/haze layer -->
+   <fog-mist-haze-layer>
+    <offset-from-station-elevation-ft>-200</offset-from-station-elevation-ft>
+    <visibility-above-layer-m>20000</visibility-above-layer-m>
+
+    <fog-thickness-ft>500</fog-thickness-ft>
+    <fog-2dlayer-alpha>1.0</fog-2dlayer-alpha>
+    <fog-2dlayer-coverage>overcast</fog-2dlayer-coverage>
+    <fog-bc-2dlayer-coverage>broken</fog-bc-2dlayer-coverage>
+    <fog-shallow-thickness-ft>30</fog-shallow-thickness-ft>
+
+    <mist-thickness-ft>2000</mist-thickness-ft>
+    <mist-2dlayer-alpha>0.8</mist-2dlayer-alpha>
+    <mist-2dlayer-coverage>overcast</mist-2dlayer-coverage>
+
+    <haze-thickness-ft>2000</haze-thickness-ft>
+    <haze-2dlayer-alpha>0.6</haze-2dlayer-alpha>
+    <haze-2dlayer-coverage>overcast</haze-2dlayer-coverage>
+   </fog-mist-haze-layer>
+
   </params>
 
   <wildfire>
diff --git a/gui/dialogs/about.xml b/gui/dialogs/about.xml
index b8acaa4c0..bca834ca9 100644
--- a/gui/dialogs/about.xml
+++ b/gui/dialogs/about.xml
@@ -92,23 +92,6 @@
       <format>Revision: %s</format>
       <property>/sim/version/revision</property>
     </text>
-  <hrule/>
-  
-  <group>
-    <layout>hbox</layout>
-      <halign>center</halign>
-
-    <button>
-      <legend>OK</legend>
-      <equal>true</equal>
-      <key>Esc</key>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
-
-    <empty><stretch>true</stretch></empty>
-  </group>
 
   <nasal>
     <open><![CDATA[
diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml
index bb741fc43..efa228b08 100644
--- a/gui/dialogs/autopilot.xml
+++ b/gui/dialogs/autopilot.xml
@@ -16,9 +16,32 @@
       /autopilot/settings/true-heading-deg
       /autopilot/settings/vertical-speed-fpm
     -->
-    <text>
-        <label>Autopilot Settings</label>
-    </text>
+	
+	<group>
+		<layout>hbox</layout>
+		<empty><stretch>1</stretch></empty>
+		
+		<text>
+			<label>Autopilot Settings</label>
+		</text>
+		
+		<empty><stretch>1</stretch></empty>
+			
+		<button>
+			<pref-width>16</pref-width>
+			<pref-height>16</pref-height>
+			<legend></legend>
+			<default>1</default>
+			<keynum>27</keynum>
+			<border>2</border>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+			<binding>
+				<command>dialog-apply</command>
+			</binding>
+		</button>
+	</group>
     <hrule/>
     <nasal>
         <open>
@@ -512,17 +535,5 @@
             </binding>
         </checkbox>
     </group>
-    <hrule/>
-    <button>
-        <legend>Close</legend>
-        <default>true</default>
-        <key>Esc</key>
-        <padding>10</padding>
-        <binding>
-            <command>dialog-apply</command>
-        </binding>
-        <binding>
-            <command>dialog-close</command>
-        </binding>
-    </button>
+
 </PropertyList>
diff --git a/gui/dialogs/cockpit-view.xml b/gui/dialogs/cockpit-view.xml
index f7f73ae9f..87d7b9171 100644
--- a/gui/dialogs/cockpit-view.xml
+++ b/gui/dialogs/cockpit-view.xml
@@ -3,12 +3,31 @@
 <PropertyList>
   <name>cockpit-view</name>
   <layout>vbox</layout>
-  <default-padding>4</default-padding>
   <modal>false</modal>
 
-  <text>
-    <label>Cockpit View Options</label>
-  </text>
+  <group>
+    <layout>hbox</layout>
+	<empty><stretch>1</stretch></empty>
+	
+    <text>
+      <label>Cockpit View Options</label>
+    </text>
+	
+	<empty><stretch>1</stretch></empty>
+		
+	<button>
+	  <pref-width>16</pref-width>
+	  <pref-height>16</pref-height>
+	  <legend></legend>
+	  <default>1</default>
+	  <keynum>27</keynum>
+	  <border>2</border>
+	  <binding>
+	  	<command>dialog-close</command>
+	  </binding>
+	</button>
+	
+  </group>
 
   <hrule/>
 
@@ -44,6 +63,9 @@
   <text>
     <halign>center</halign>
     <label>Blackout</label>
+	<enable>
+      <property>/sim/rendering/redout/enabled</property>
+    </enable>
   </text>
 
   <group>
@@ -52,6 +74,9 @@
       <row>0</row>
       <col>0</col>
       <label>Onset</label>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <text>
@@ -62,6 +87,9 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/blackout-onset-g</property>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <slider>
@@ -73,12 +101,18 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </slider>
 
     <text>
       <row>1</row>
       <col>0</col>
       <label>Complete</label>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <text>
@@ -89,6 +123,9 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/blackout-complete-g</property>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <slider>
@@ -100,6 +137,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </slider>
   </group>
 
@@ -108,6 +148,9 @@
   <text>
     <halign>center</halign>
     <label>Redout</label>
+	<enable>
+      <property>/sim/rendering/redout/enabled</property>
+    </enable>
   </text>
 
   <group>
@@ -116,6 +159,9 @@
       <row>0</row>
       <col>0</col>
       <label>Onset</label>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <text>
@@ -126,6 +172,9 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/redout-onset-g</property>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <slider>
@@ -137,12 +186,18 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </slider>
 
     <text>
       <row>1</row>
       <col>0</col>
       <label>Complete</label>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <text>
@@ -152,6 +207,9 @@
       <format>%2.1f</format>
       <live>true</live>
       <property>/sim/rendering/redout/parameters/redout-complete-g</property>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </text>
 
     <slider>
@@ -163,15 +221,10 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/rendering/redout/enabled</property>
+      </enable>
     </slider>
   </group>
 
-  <button>
-    <legend>Close</legend>
-    <default>true</default>
-    <key>Esc</key>
-    <binding>
-      <command>dialog-close</command>
-    </binding>
-  </button>
 </PropertyList>
diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml
index a2861d45e..dc7c39118 100644
--- a/gui/dialogs/display.xml
+++ b/gui/dialogs/display.xml
@@ -5,9 +5,30 @@
   <modal>false</modal>
   <layout>vbox</layout>
 
-  <text>
-    <label>Display Options</label>
-  </text>
+
+  <group>
+    <layout>hbox</layout>
+	<empty><stretch>1</stretch></empty>
+	
+    <text>
+      <label>Display Options</label>
+    </text>
+	
+	<empty><stretch>1</stretch></empty>
+		
+	<button>
+	  <pref-width>16</pref-width>
+	  <pref-height>16</pref-height>
+	  <legend></legend>
+	  <default>1</default>
+	  <keynum>27</keynum>
+	  <border>2</border>
+	  <binding>
+	  	<command>dialog-close</command>
+	  </binding>
+	</button>
+	
+  </group>
 
   <hrule/>
 
@@ -61,25 +82,4 @@
     </checkbox>
   </group>
 
-  <hrule/>
-
-  <group>
-    <layout>hbox</layout>
-    <empty><stretch>true</stretch></empty>
-
-    <button>
-      <legend>Close</legend>
-      <default>true</default>
-      <key>Esc</key>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-      <binding>
-        <command>dialog-close</command>
-      </binding>
-    </button>
-
-    <empty><stretch>true</stretch></empty>
-  </group>
-
 </PropertyList>
diff --git a/gui/dialogs/hud.xml b/gui/dialogs/hud.xml
index 24460715f..ac19d1c83 100644
--- a/gui/dialogs/hud.xml
+++ b/gui/dialogs/hud.xml
@@ -5,10 +5,30 @@
 	<y>20</y>
 	<name>hud</name>
 	<layout>vbox</layout>
+	<padding>20</padding>
+	
+	<group>
+		<layout>hbox</layout>
+		<empty><stretch>1</stretch></empty>
 
-	<text>
-		<label>HUD Configuration</label>
-	</text>
+		<text>
+			<label>HUD Configuration</label>
+		</text>
+		
+		<empty><stretch>1</stretch></empty>
+			
+		<button>
+			<pref-width>16</pref-width>
+			<pref-height>16</pref-height>
+			<legend></legend>
+			<default>1</default>
+			<keynum>27</keynum>
+			<border>2</border>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+	</group>
 
 	<hrule/>
 
@@ -154,20 +174,6 @@
 		</slider>
 	</group>
 
-	<group>
-		<layout>hbox</layout>
-		<default-padding>10</default-padding>
-
-		<button>
-			<legend>Close</legend>
-			<default>true</default>
-			<key>Esc</key>
-			<binding>
-				<command>dialog-close</command>
-			</binding>
-		</button>
-	</group>
-
 	<nasal>
 		<open>
 			gui.enable_widgets(cmdarg(), "devel-stuff", getprop("/sim/gui/devel-widgets"));
diff --git a/gui/dialogs/location-on-ground.xml b/gui/dialogs/location-on-ground.xml
index 132030404..49e8b4450 100644
--- a/gui/dialogs/location-on-ground.xml
+++ b/gui/dialogs/location-on-ground.xml
@@ -41,6 +41,22 @@
       }
       if (!initialized) {
         set_radio("runway");
+      }
+	  
+	  var runways = dlg.getNode("available-runways", 1);
+	  var updateRunways = func {         
+        var icao = dlg.getNode("airport").getValue();
+		runways.removeChildren("value");
+        
+        var apt = airportinfo(icao);
+        if (apt != nil) {
+          var i=0;
+          foreach (var rwy; keys(apt.runways)) {
+            runways.getNode("value[" ~ i ~ "]", 1).setValue(rwy);
+            i += 1;
+          }
+        }
+		gui.dialog_update("location-on-ground");
       }
     </open>
   </nasal>
@@ -48,14 +64,23 @@
   <group>
     <layout>table</layout>
     <halign>center</halign>
+	
     <text>
       <row>0</row><col>1</col>
       <halign>right</halign>
       <label>Airport:</label>
     </text>
+	
     <input>
       <row>0</row><col>2</col>
       <property>/sim/gui/dialogs/location-on-ground/airport</property>
+	  <binding>
+        <command>dialog-apply</command>
+      </binding>
+	  <binding>
+        <command>nasal</command>
+        <script>updateRunways();</script>
+      </binding>
     </input>
 
     <radio>
@@ -67,15 +92,29 @@
         <script>set_radio("runway")</script>
       </binding>
     </radio>
+	
     <text>
       <row>1</row><col>1</col>
       <halign>right</halign>
       <label>Runway:</label>
     </text>
-    <input>
-      <row>1</row><col>2</col>
-      <property>/sim/gui/dialogs/location-on-ground/runway</property>
-    </input>
+	
+	<combo>
+      <name>runway</name>
+	  <row>1</row><col>2</col>
+      <pref-width>85</pref-width>
+	  <enable>
+        <property>/sim/gui/dialogs/location-on-ground/use_runway</property>
+      </enable>
+      <property>sim/gui/dialogs/location-on-ground/runway</property>
+      <editable>false</editable>
+      <properties>sim/gui/dialogs/location-on-ground/available-runways</properties>
+      <binding>
+        <command>dialog-apply</command>
+        <object-name>runway</object-name>
+      </binding>
+    </combo>
+	
     <radio>
       <row>2</row><col>0</col>
       <property>/sim/gui/dialogs/location-on-ground/use_parkpos</property>
@@ -85,13 +124,18 @@
         <script>set_radio("parkpos")</script>
       </binding>
     </radio>
+	
     <text>
       <row>2</row><col>1</col>
       <halign>right</halign>
       <label>Parking:</label>
     </text>
+	
     <input>
       <row>2</row><col>2</col>
+	  <enable>
+        <property>/sim/gui/dialogs/location-on-ground/use_parkpos</property>
+      </enable>
       <property>/sim/gui/dialogs/location-on-ground/parkpos</property>
     </input>
   </group>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index cc05dd3d9..e7b99d922 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -30,7 +30,7 @@
   </group>
   
   <hrule/>
-
+  
   <group>
     <halign>center</halign>
     <layout>hbox</layout>
@@ -38,6 +38,16 @@
     <group>
       <layout>vbox</layout>
 	  
+      <text>
+        <halign>left</halign>
+	    <label>"Material shaders" must be enabled for certain options</label>
+      </text>
+	  
+	  <group>
+	    <layout>vbox</layout>
+		<stretch>1</stretch>
+	  </group>
+	  
 	  <!--
 	  
 	  <group>
@@ -152,6 +162,9 @@
       <checkbox>
         <halign>left</halign>
         <label>Random vegetation</label>
+		<enable>
+          <property>/sim/rendering/shader-effects</property>
+        </enable>
         <property>/sim/rendering/random-vegetation</property>
         <binding>
           <command>dialog-apply</command>
@@ -183,18 +196,25 @@
 	  -->
 
       <checkbox>
+	    <halign>left</halign>
         <label>3D clouds</label>
-        <halign>left</halign>
+		<enable>
+          <property>/sim/rendering/shader-effects</property>
+        </enable>
         <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>
+        <text>
+		  <label>Cloud density</label>
+		</text>
         <slider>
           <min>0</min>
           <max>1.0</max>
@@ -210,13 +230,23 @@
           <property>/sim/rendering/clouds3d-density</property>
         </text>
       </group>
+	  
+	  -->
 
       <group>
         <layout>hbox</layout>
         <halign>right</halign>
-        <text><label>Cloud visibility range</label></text>
+        <text>
+		  <label>Cloud visibility range</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
+		</text>
         <slider>
-          <min>100.0</min>
+          <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
+		  <min>100.0</min>
           <max>20000.0</max>
           <property>/sim/rendering/clouds3d-vis-range</property>
           <binding>
@@ -224,7 +254,10 @@
           </binding>
         </slider>
         <text>
-          <label>12345678</label>
+          <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
+		  <label>12345678</label>
           <format>%.fm</format>
           <live>true</live>
           <property>/sim/rendering/clouds3d-vis-range</property>
@@ -233,9 +266,9 @@
 	  
 	  <group>
 	    <layout>vbox</layout>
-		<stretch>true</stretch>
+		<stretch>1</stretch>
 	  </group>
-	  
+
     </group>
 	
     <vrule/>
@@ -267,10 +300,12 @@
         <layout>vbox</layout>
         <padding>10</padding>
 
-
         <checkbox>
           <halign>left</halign>
           <label>Crop texture</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <property>/sim/rendering/crop-shader</property>
           <binding>
             <command>dialog-apply</command>
@@ -280,6 +315,9 @@
         <checkbox>
           <halign>left</halign>
           <label>Landmass effects</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <property>/sim/rendering/landmass-shader</property>
           <binding>
             <command>dialog-apply</command>
@@ -289,6 +327,9 @@
         <checkbox>
           <halign>left</halign>
           <label>Water reflection</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <property>/sim/rendering/water-shader</property>
           <binding>
             <command>dialog-apply</command>
@@ -298,6 +339,9 @@
         <checkbox>
           <halign>left</halign>
           <label>Urban effects</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <property>/sim/rendering/urban-shader</property>
           <binding>
             <command>dialog-apply</command>
@@ -307,6 +351,9 @@
         <checkbox>
           <halign>left</halign>
           <label>Transition effects</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <property>/sim/rendering/transition-shader</property>
           <binding>
             <command>dialog-apply</command>
@@ -316,6 +363,9 @@
         <checkbox>
           <halign>left</halign>
           <label>Persistent contrails</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <property>/sim/rendering/contrail-shader</property>
           <binding>
             <command>dialog-apply</command>
@@ -326,8 +376,16 @@
       <group>
         <layout>hbox</layout>
         <halign>right</halign>
-        <text><label>Snow Level</label></text>
+        <text>
+		  <label>Snow Level</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
+		</text>
         <slider>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <min>0.0</min>
           <max>5000.0</max>
           <property>/sim/rendering/snow-level-m</property>
@@ -336,6 +394,9 @@
           </binding>
         </slider>
         <text>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <label>12345678</label>
           <format>%.fm</format>
           <live>true</live>
@@ -346,8 +407,16 @@
       <group>
         <layout>hbox</layout>
         <halign>right</halign>
-        <text><label>Performance vs Quality</label></text>
+        <text>
+		  <label>Performance vs Quality</label>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
+		</text>
         <slider>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <min>0.0</min>
           <max>5.0</max>
           <step>0.5</step>
@@ -357,6 +426,9 @@
           </binding>
         </slider>
         <text>
+		  <enable>
+            <property>/sim/rendering/shader-effects</property>
+          </enable>
           <label>12345678</label>
           <format>%.1f</format>
           <live>true</live>
diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml
index 763db4fe7..4b58249d4 100644
--- a/gui/dialogs/sound.xml
+++ b/gui/dialogs/sound.xml
@@ -101,6 +101,9 @@
       <col>0</col>
       <label>Effects</label>
       <halign>left</halign>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </text>
 
     <checkbox>
@@ -110,6 +113,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </checkbox>
 
     <slider>
@@ -119,6 +125,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </slider>
 
     <text>
@@ -126,6 +135,9 @@
       <col>0</col>
       <label>Chatter</label>
       <halign>left</halign>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </text>
     
     <checkbox>
@@ -135,6 +147,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </checkbox>
 
     <slider>
@@ -144,6 +159,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </slider>
 
     <text>
@@ -151,6 +169,9 @@
       <col>0</col>
       <label>Avionics</label>
       <halign>left</halign>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </text>
     
     <checkbox>
@@ -160,6 +181,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </checkbox>
 
     <slider>
@@ -169,6 +193,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </slider>
 
     <checkbox>
@@ -178,6 +205,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </checkbox>
 
     <text>
@@ -185,6 +215,9 @@
       <col>0</col>
       <label>ATC</label>
       <halign>left</halign>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </text>
     
     <checkbox>
@@ -194,6 +227,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </checkbox>
 
     <slider>
@@ -203,6 +239,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </slider>
 
     <checkbox>
@@ -212,6 +251,9 @@
       <binding>
         <command>dialog-apply</command>
       </binding>
+	  <enable>
+        <property>/sim/sound/enabled</property>
+      </enable>
     </checkbox>
   </group>
 
diff --git a/gui/dialogs/timeofday.xml b/gui/dialogs/timeofday.xml
index 9e3adca95..7d79fefc4 100644
--- a/gui/dialogs/timeofday.xml
+++ b/gui/dialogs/timeofday.xml
@@ -3,17 +3,37 @@
 <PropertyList>
 	<name>timeofday</name>
 	<layout>vbox</layout>
-	<default-padding>4</default-padding>
+	<padding>20</padding>
 	<modal>false</modal>
 
-	<text>
-		<label>Time Settings</label>
-	</text>
+	<group>
+		<layout>hbox</layout>
+		<empty><stretch>1</stretch></empty>
+		
+		<text>
+			<label>Time Settings</label>
+		</text>
+		
+		<empty><stretch>1</stretch></empty>
+			
+		<button>
+			<pref-width>16</pref-width>
+			<pref-height>16</pref-height>
+			<legend></legend>
+			<default>1</default>
+			<keynum>27</keynum>
+			<border>2</border>
+			<binding>
+				<command>dialog-close</command>
+			</binding>
+		</button>
+	</group>
 
 	<hrule/>
 
 	<group>
 		<layout>hbox</layout>
+		<padding>4</padding>
 
 		<group>
 			<layout>vbox</layout>
@@ -241,12 +261,4 @@
 		</group>
 	</group>
 
-	<button>
-		<legend>Close</legend>
-		<default>true</default>
-		<key>Esc</key>
-		<binding>
-			<command>dialog-close</command>
-		</binding>
-	</button>
 </PropertyList>
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 2d95e816d..545ed9d79 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -55,6 +55,9 @@
           <layout>hbox</layout>
           <text>
             <label>Cloud Layers (All Altitudes ft-AMSL)</label>
+		    <enable> 
+              <property>/sim/gui/dialogs/weather-scenario/state</property>
+            </enable>
           </text>
           <hrule>
             <stretch>true</stretch>
@@ -70,6 +73,9 @@
               <label>Altitude (ft)</label>
               <row>0</row>
               <col>1</col>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <text>
@@ -77,12 +83,18 @@
               <row>0</row>
               <col>2</col>
               <width>80</width>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <text>
               <label>Thickness (ft)</label>
               <row>0</row>
               <col>3</col>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
 
@@ -393,6 +405,9 @@
           <layout>hbox</layout>
           <text>
             <label>Precipitation</label>
+		    <enable> 
+              <property>/sim/gui/dialogs/weather-scenario/state</property>
+            </enable>
           </text>
           <hrule>
             <stretch>true</stretch>
@@ -408,12 +423,18 @@
               <row>0</row>
               <col>0</col>
               <label>Rain</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <text>
               <row>0</row>
               <col>1</col>
               <label>Snow</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <slider>
@@ -456,6 +477,9 @@
               <row>0</row>
               <col>3</col>
               <label>QNH (inHg)</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <input>
@@ -1116,6 +1140,9 @@
           <layout>hbox</layout>
           <text>
             <label>Boundary (All Elevations ft-AGL)</label>
+		    <enable> 
+              <property>/sim/gui/dialogs/weather-scenario/state</property>
+            </enable>
           </text>
           <hrule>
             <stretch>true</stretch>
@@ -1132,6 +1159,9 @@
               <row>0</row>
               <col>0</col>
               <label>Elevation</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <text>
@@ -1139,24 +1169,36 @@
               <col>1</col>
               <colspan>2</colspan>
               <label>Wind (dir/kt)</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <text>
               <row>0</row>
               <col>3</col>
               <label>Vis (m)</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <text>
               <row>0</row>
               <col>4</col>
               <label>Temp (C)</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <text>
               <row>0</row>
               <col>5</col>
               <label>Dewpt (C)</label>
+		      <enable> 
+                <property>/sim/gui/dialogs/weather-scenario/state</property>
+              </enable>
             </text>
 
             <input>