diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Black.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Black.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Black.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Black.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark%20Blue.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark%20Blue.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark%20Blue.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark%20Blue.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Dark.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Dark.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray%20Blue.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray%20Blue.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray%20Blue.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray%20Blue.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Gray.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Gray.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Underwater.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Underwater.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20Underwater.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20Underwater.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White%20Wash.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White%20Wash.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White%20Wash.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White%20Wash.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White.xml
similarity index 95%
rename from indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White.xml
index b33f7ad69..c91588466 100644
--- a/indra/newview/app_settings/windlight/skies/Ambient%20%2BFog%20White.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20%2BFog%20White.xml
@@ -2,10 +2,10 @@
     <map>
     <key>ambient</key>
         <array>
-            <real>3</real>
-            <real>3</real>
-            <real>3</real>
-            <real>1</real>
+            <real>1.5</real>
+            <real>1.5</real>
+            <real>1.5</real>
+            <real>0.5</real>
         </array>
     <key>blue_density</key>
         <array>
@@ -63,14 +63,14 @@
         </array>
     <key>density_multiplier</key>
         <array>
-            <real>4.999999873689375817775726e-05</real>
+            <real>0.0008999999845400452613830566</real>
             <real>0</real>
             <real>0</real>
             <real>1</real>
         </array>
     <key>distance_multiplier</key>
         <array>
-            <real>50</real>
+            <real>1</real>
             <real>0</real>
             <real>0</real>
             <real>1</real>
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Black.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Black.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20Black.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Black.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Dark%20H%2DBomb.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Dark%20H%2DBomb.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20Dark%20H%2DBomb.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Dark%20H%2DBomb.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Dark.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20Dark.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Dark.xml
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Gray%20Background.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Gray%20Background.xml
new file mode 100644
index 000000000..fe1c9f8c0
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Gray%20Background.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.5</real>
+            <real>1.5</real>
+            <real>1.5</real>
+            <real>0.5</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.449999993698308176082179</real>
+            <real>0.4499999939833594919669224</real>
+            <real>0.4499999944309046040480382</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.89999997615814208984375</real>
+            <real>0.89999997615814208984375</real>
+            <real>0.89999997615814208984375</real>
+            <real>0.449999988079071044921875</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.2261540024157503436796901</real>
+            <real>0.2261540024157503436796901</real>
+            <real>0.2261540024157503436796901</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.4199999868869781494140625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.36000001430511474609375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004499999922700226306915283</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-0</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.1991560043746730401803546</real>
+            <real>0.1991560043746730401803546</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>1</real>
+            <real>1.148381556959066074341536e-06</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>26</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.57079517841339111328125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Gray.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Gray.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20Gray.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20Gray.xml
diff --git a/indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20White.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Ambient%20Not%20As%20White.xml
rename to indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Ambient%20White.xml
diff --git a/indra/newview/app_settings/windlight/water/%5BPyFX%5D%20Ice.xml b/indra/newview/app_settings/windlight/water/%5BPyFX%5D%20Ice.xml
new file mode 100644
index 000000000..a5cdf76ae
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/%5BPyFX%5D%20Ice.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.1600000113248825073242188</real>
+    <key>fresnelOffset</key>
+        <real>0.5</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>5</real>
+            <real>5</real>
+            <real>5</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>f92da839-f302-c813-668d-601ab1957af1</uuid>
+    <key>scaleAbove</key>
+        <real>0.199999988079071044921875</real>
+    <key>scaleBelow</key>
+        <real>0.2000000029802322387695313</real>
+    <key>underWaterFogMod</key>
+        <real>1</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.02851562201976776123046875</real>
+            <real>0.07148437201976776123046875</real>
+            <real>0.06242064759135246276855469</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>2</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>