diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 10ee68606..ef1c62767 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -114,15 +114,6 @@
       </binding>
     </checkbox>
 
-    <checkbox>
-      <halign>left</halign>
-      <label>Enable 3d clouds</label>
-      <property>/sim/rendering/clouds3d-enable</property>
-      <binding>
-        <command>dialog-apply</command>
-      </binding>
-    </checkbox>
-
     <checkbox>
       <halign>left</halign>
       <label>Random vegetation</label>
@@ -149,13 +140,24 @@
       </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>100</max>
+        <max>1.0</max>
 
         <property>/sim/rendering/clouds3d-density</property>
         <binding>
@@ -164,12 +166,54 @@
       </slider>
       <text>
         <label>12345678</label>
-        <format>%.0f%%</format>
+        <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>
+        <layout>hbox</layout>
+        <halign>right</halign>
+        <text><label>Cloud types</label></text>
+        <slider>
+            <min>1</min>
+            <max>20</max>
+            
+            <property>/sim/rendering/clouds3d-num-flavours</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </slider>
+        <text>
+            <label>12345678</label>
+            <format>%d</format>
+            <live>true</live>
+            <property>/sim/rendering/clouds3d-num-flavours</property>
+        </text>
+    </group>
+    
   </group>
 
   <hrule/>
diff --git a/preferences.xml b/preferences.xml
index 79f7e2d93..240485f39 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -100,10 +100,9 @@ Started September 2000 by David Megginson, david@megginson.com
    <specular-highlight type="bool" userarchive="y">false</specular-highlight>
    <bump-mapping type="bool" userarchive="y">false</bump-mapping>
    <clouds3d-enable type="bool" userarchive="y">false</clouds3d-enable>
-   <clouds3d-vis-range type="float" userarchive="y">25000</clouds3d-vis-range>
-   <clouds3d-density type="float" userarchive="y">100</clouds3d-density>
-   <clouds3d-cache-size type="int" userarchive="y">1024</clouds3d-cache-size>
-   <clouds3d-cache-resolution type="int" userarchive="y">64</clouds3d-cache-resolution>
+   <clouds3d-vis-range type="float" userarchive="y">20000.0</clouds3d-vis-range>
+   <clouds3d-density type="float" userarchive="y">1.0</clouds3d-density>
+   <clouds3d-num-flavours type="int" userarchive="y">10</clouds3d-num-flavours>
    <draw-otw type="bool">true</draw-otw>
    <shadows-ac type="bool" userarchive="y">false</shadows-ac>
    <shadows-ac-transp type="bool" userarchive="y">false</shadows-ac-transp>
@@ -637,7 +636,7 @@ Started September 2000 by David Megginson, david@megginson.com
    <status>true</status>
    <layer n="0">
     <coverage>scattered</coverage>
-    <elevation-ft>5000</elevation-ft>
+    <elevation-ft>4000</elevation-ft>
     <thickness-ft>600</thickness-ft>
     <transition-ft>150</transition-ft>
     <span-m>40000</span-m>