diff --git a/gui/dialogs/map.xml b/gui/dialogs/map.xml
index c80efd179..d2d1f6dac 100644
--- a/gui/dialogs/map.xml
+++ b/gui/dialogs/map.xml
@@ -16,9 +16,31 @@ command interface /autopilot/route-manager/input:
     <layout>vbox</layout>
     <resizable>true</resizable>
 
+    <color>
+        <red type="float">0.41</red>
+        <green type="float">0.4</green>
+        <blue type="float">0.42</blue>
+        <alpha type="float">1.0</alpha>
+        <alpha type="float">1.0</alpha>
+    </color>
+
     <nasal>
         <open>
-
+            var mapDialog = cmdarg();
+            var setTransparency = func(updateDialog){
+                var alpha = (getprop("/gui/map/transparent") or 0);
+                mapDialog.getNode("color/alpha").setValue(1-alpha*0.3);
+                mapDialog.getNode("color/red").setValue(0.41-alpha*0.2);
+                mapDialog.getNode("color/green").setValue(0.4-alpha*0.2);
+                mapDialog.getNode("color/blue").setValue(0.42-alpha*0.2);
+                var n = props.Node.new({ "dialog-name": "map" });
+                if (updateDialog)
+                {
+                    fgcommand("dialog-close", n);
+                    fgcommand("dialog-show", n);
+                }
+            }
+            setTransparency(0);
         </open>
 
         <close>
@@ -128,6 +150,19 @@ command interface /autopilot/route-manager/input:
 
                 <empty><stretch>true</stretch></empty>
 
+                <checkbox>
+                    <label>Magnetic Hdgs</label>
+                    <pref-width>100</pref-width>
+                    <property>/gui/map/magnetic-headings</property>
+                    <live>true</live>
+                    <binding>
+                      <command>dialog-apply</command>
+                    </binding>
+                    <binding>
+                      <command>property-toggle</command>
+                    </binding>
+                </checkbox>
+
                 <checkbox>
                     <label>Center on Acft</label>
                     <pref-width>100</pref-width>
@@ -155,9 +190,9 @@ command interface /autopilot/route-manager/input:
                 </checkbox>
 
                 <checkbox>
-                    <label>Magnetic Hdgs</label>
+                    <label>Transparent</label>
                     <pref-width>100</pref-width>
-                    <property>/gui/map/magnetic-headings</property>
+                    <property>/gui/map/transparent</property>
                     <live>true</live>
                     <binding>
                       <command>dialog-apply</command>
@@ -165,11 +200,16 @@ command interface /autopilot/route-manager/input:
                     <binding>
                       <command>property-toggle</command>
                     </binding>
+                    <binding>
+                        <command>nasal</command>
+                        <script>setTransparency(1);</script>
+                    </binding>
                 </checkbox>
 
                 <empty><stretch>true</stretch></empty>
 
                 <button>
+                    <name>close</name>
                     <legend>Close</legend>
                     <pref-width>100</pref-width>
                     <default>true</default>
@@ -202,18 +242,19 @@ command interface /autopilot/route-manager/input:
                     <layout>hbox</layout>
                     
                     <button>
-            			<legend>-</legend>
-            			<pref-width>22</pref-width>
-            			<pref-height>22</pref-height>
+                        <name>zoomout</name>
+                        <legend>-</legend>
+                        <pref-width>22</pref-width>
+                        <pref-height>22</pref-height>
 
-            			<binding>
-            				<command>property-adjust</command>
-            				<property>/gui/map/zoom</property>
-            				<min>0</min>
-            				<step>-1</step>
-            			</binding>
-            		</button>
-            		
+                        <binding>
+                            <command>property-adjust</command>
+                            <property>/gui/map/zoom</property>
+                            <min>0</min>
+                            <step>-1</step>
+                        </binding>
+                    </button>
+                    
                     <text>
                         <label>MMM</label>
                         <format>Zoom %d</format>
@@ -222,17 +263,18 @@ command interface /autopilot/route-manager/input:
                     </text>
                     
                     <button>
-            			<legend>+</legend>
-            			<pref-width>22</pref-width>
-            			<pref-height>22</pref-height>
+                        <name>zoomin</name>
+                        <legend>+</legend>
+                        <pref-width>22</pref-width>
+                        <pref-height>22</pref-height>
 
-            			<binding>
-            				<command>property-adjust</command>
-            				<property>/gui/map/zoom</property>
-            				<step>1</step>
-            				<max>12</max>
-            			</binding>
-            		</button>
+                        <binding>
+                            <command>property-adjust</command>
+                            <property>/gui/map/zoom</property>
+                            <step>1</step>
+                            <max>12</max>
+                        </binding>
+                    </button>
                 </group>
             </group>
             
diff --git a/gui/dialogs/stopwatch.xml b/gui/dialogs/stopwatch.xml
index a2154c1f5..95a5fff4f 100644
--- a/gui/dialogs/stopwatch.xml
+++ b/gui/dialogs/stopwatch.xml
@@ -7,6 +7,12 @@
 	<default-padding>8</default-padding>
 	<x>-5</x>
 	<y>5</y>
+	<color>
+		<red>0.2</red>
+		<green>0.2</green>
+		<blue>0.2</blue>
+		<alpha>0.7</alpha>
+	</color>
 
 	<nasal>
 		<open>
@@ -104,6 +110,12 @@
 			<legend>Start</legend>
 			<equal>true</equal>
 			<pref-width>47</pref-width>
+			<color>
+				<red type="float">0.3</red>
+				<green type="float">0.3</green>
+				<blue type="float">0.3</blue>
+				<alpha type="float">0.8</alpha>
+			</color>
 			<binding>
 				<command>nasal</command>
 				<script>start()</script>
@@ -114,6 +126,12 @@
 			<legend>Stop</legend>
 			<default>true</default>
 			<pref-width>47</pref-width>
+			<color>
+				<red type="float">0.3</red>
+				<green type="float">0.3</green>
+				<blue type="float">0.3</blue>
+				<alpha type="float">0.8</alpha>
+			</color>
 			<binding>
 				<command>nasal</command>
 				<script>stop()</script>
@@ -124,6 +142,12 @@
 			<legend>Reset</legend>
 			<key>Delete</key>
 			<pref-width>47</pref-width>
+			<color>
+				<red type="float">0.3</red>
+				<green type="float">0.3</green>
+				<blue type="float">0.3</blue>
+				<alpha type="float">0.8</alpha>
+			</color>
 			<binding>
 				<command>nasal</command>
 				<script>reset()</script>
@@ -132,6 +156,12 @@
 
 		<button>
 			<legend>Close</legend>
+			<color>
+				<red type="float">0.3</red>
+				<green type="float">0.3</green>
+				<blue type="float">0.3</blue>
+				<alpha type="float">0.8</alpha>
+			</color>
 			<key>Esc</key>
 			<pref-width>47</pref-width>
 			<binding>