diff --git a/indra/newview/app_settings/windlight/skies/AnaLutetia%20%2D%20AvatarOpt(2).xml b/indra/newview/app_settings/windlight/skies/AnaLutetia%20%2D%20AvatarOpt(2).xml
deleted file mode 100644
index c3413b8fed..0000000000
--- a/indra/newview/app_settings/windlight/skies/AnaLutetia%20%2D%20AvatarOpt(2).xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0.5565025806427002</real>
-            <real>0.66127157211303711</real>
-            <real>0.89999997615814209</real>
-            <real>0.29999998211860657</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.14522500336170197</real>
-            <real>0.39999699592590332</real>
-            <real>0.80000197887420654</real>
-            <real>1</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0.15130999684333801</real>
-            <real>0.30000001192092896</real>
-            <real>0.35131001472473145</real>
-            <real>1</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.12862999737262726</real>
-            <real>0.12862999737262726</real>
-            <real>0.12862999737262726</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.88419097661972046</real>
-            <real>0.53047597408294678</real>
-            <real>0.4270470142364502</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.38419300317764282</real>
-            <real>0.5</real>
-            <real>0.125</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.41999998688697815</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</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0001250890054507181</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>11.40000057220459</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>3.3300881385803223</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.7300000190734863</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>0.19999980926513672</real>
-            <real>0.0012815999798476696</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>1.4399999380111694</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.14999999105930328</real>
-            <real>0.21744099259376526</real>
-            <real>0.21744099259376526</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0.18507426977157593</real>
-            <real>0.15643447637557983</real>
-            <real>-0.97019368410110474</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>2</integer>
-    <key>star_brightness</key>
-        <real>0</real>
-    <key>sun_angle</key>
-        <real>0.15707963705062866</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>3</real>
-            <real>3</real>
-            <real>3</real>
-            <real>1</real>
-        </array>
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/AnaLutetia%2Doutdoor2(2).xml b/indra/newview/app_settings/windlight/skies/AnaLutetia%2Doutdoor2(2).xml
deleted file mode 100644
index 1721525215..0000000000
--- a/indra/newview/app_settings/windlight/skies/AnaLutetia%2Doutdoor2(2).xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<llsd>
-    <map>
-    <key>ambient</key>
-        <array>
-            <real>0</real>
-            <real>0</real>
-            <real>0.44999998807907104</real>
-            <real>0.44999998807907104</real>
-        </array>
-    <key>blue_density</key>
-        <array>
-            <real>0.13997539444089213</real>
-            <real>0.38665792478461469</real>
-            <real>0.77332294252195766</real>
-            <real>0.95108884837904384</real>
-        </array>
-    <key>blue_horizon</key>
-        <array>
-            <real>0</real>
-            <real>0.22876684367656708</real>
-            <real>0.290018230676651</real>
-            <real>0.31999999284744263</real>
-        </array>
-    <key>cloud_color</key>
-        <array>
-            <real>0.25999999046325684</real>
-            <real>0.28883209824562073</real>
-            <real>0.28994369506835938</real>
-            <real>0.28999999165534973</real>
-        </array>
-    <key>cloud_pos_density1</key>
-        <array>
-            <real>0.17999999225139618</real>
-            <real>0.50999999046325684</real>
-            <real>0.91999995708465576</real>
-            <real>1</real>
-        </array>
-    <key>cloud_pos_density2</key>
-        <array>
-            <real>0.5</real>
-            <real>0.5</real>
-            <real>0.079999998211860657</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scale</key>
-        <array>
-            <real>0.25</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>cloud_scroll_rate</key>
-        <array>
-            <real>10.436104517528292</real>
-            <real>10</real>
-        </array>
-    <key>cloud_shadow</key>
-        <array>
-            <real>0.34000000357627869</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>density_multiplier</key>
-        <array>
-            <real>0.0002899999963119626</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>distance_multiplier</key>
-        <array>
-            <real>1.3000000715255737</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>east_angle</key>
-        <real>2.2619466781616211</real>
-    <key>enable_cloud_scroll</key>
-        <array>
-            <boolean>1</boolean>
-            <boolean>1</boolean>
-        </array>
-    <key>gamma</key>
-        <array>
-            <real>1.5399999618530273</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>glow</key>
-        <array>
-            <real>4.0000009536743164</real>
-            <real>0.0010000000474974513</real>
-            <real>-0.74999994039535522</real>
-            <real>1</real>
-        </array>
-    <key>haze_density</key>
-        <array>
-            <real>0.12999999523162842</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>haze_horizon</key>
-        <array>
-            <real>0.14999999105930328</real>
-            <real>0.19915600121021271</real>
-            <real>0.19915600121021271</real>
-            <real>1</real>
-        </array>
-    <key>lightnorm</key>
-        <array>
-            <real>0.28364488482475281</real>
-            <real>0.92977643013000488</real>
-            <real>0.23465146124362946</real>
-            <real>0</real>
-        </array>
-    <key>max_y</key>
-        <array>
-            <real>394.39999389648437</real>
-            <real>0</real>
-            <real>0</real>
-            <real>1</real>
-        </array>
-    <key>preset_num</key>
-        <integer>18</integer>
-    <key>star_brightness</key>
-        <real>0.44999998807907104</real>
-    <key>sun_angle</key>
-        <real>1.9477875232696533</real>
-    <key>sunlight_color</key>
-        <array>
-            <real>2.25</real>
-            <real>1.957500696182251</real>
-            <real>1.170000433921814</real>
-            <real>0.75</real>
-        </array>
-    </map>
-</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%201.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%201.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%201.xml
rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%201.xml
diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%202.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%202.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%202.xml
rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%202.xml
diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%203.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%203.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%203.xml
rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%203.xml
diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%204.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%204.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%204.xml
rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%204.xml
diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%205.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%205.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%205.xml
rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%205.xml
diff --git a/indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%206.xml b/indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%206.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/CB%27%s%20%Rouge%206.xml
rename to indra/newview/app_settings/windlight/skies/CB%27s%20Rouge%206.xml
diff --git a/indra/newview/app_settings/windlight/skies/Daytime_shadows.xml b/indra/newview/app_settings/windlight/skies/Daytime%20shadows.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Daytime_shadows.xml
rename to indra/newview/app_settings/windlight/skies/Daytime%20shadows.xml
diff --git a/indra/newview/app_settings/windlight/skies/Magic_Hour.xml b/indra/newview/app_settings/windlight/skies/Magic%20Hour.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Magic_Hour.xml
rename to indra/newview/app_settings/windlight/skies/Magic%20Hour.xml
diff --git a/indra/newview/app_settings/windlight/skies/Shadows_Bright_day.xml b/indra/newview/app_settings/windlight/skies/Shadows%20Bright%20day.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Shadows_Bright_day.xml
rename to indra/newview/app_settings/windlight/skies/Shadows%20Bright%20day.xml
diff --git a/indra/newview/app_settings/windlight/skies/silent%20hill.xml b/indra/newview/app_settings/windlight/skies/Silent%20Hill.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/silent%20hill.xml
rename to indra/newview/app_settings/windlight/skies/Silent%20Hill.xml
diff --git a/indra/newview/app_settings/windlight/skies/Wastes_12pm.xml b/indra/newview/app_settings/windlight/skies/Wastes%2012pm.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Wastes_12pm.xml
rename to indra/newview/app_settings/windlight/skies/Wastes%2012pm.xml
diff --git a/indra/newview/app_settings/windlight/skies/Wastes_Midnight.xml b/indra/newview/app_settings/windlight/skies/Wastes%20Midnight.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Wastes_Midnight.xml
rename to indra/newview/app_settings/windlight/skies/Wastes%20Midnight.xml
diff --git a/indra/newview/app_settings/windlight/skies/Wastes_Morning.xml b/indra/newview/app_settings/windlight/skies/Wastes%20Morning.xml
similarity index 100%
rename from indra/newview/app_settings/windlight/skies/Wastes_Morning.xml
rename to indra/newview/app_settings/windlight/skies/Wastes%20Morning.xml
diff --git a/indra/newview/app_settings/windlight/skies/names.txt b/indra/newview/app_settings/windlight/skies/names.txt
index 2d80cde581..722d6262f9 100644
--- a/indra/newview/app_settings/windlight/skies/names.txt
+++ b/indra/newview/app_settings/windlight/skies/names.txt
@@ -1,77 +1,77 @@
-- Orac - Black fog 1
-- Orac - Black fog 2
-- Orac - Drawing blue
-- Orac - Drawing extreme
-- Orac - Drawing green
-- Orac - Drawing red
-- Orac - Drawing underground comic
-- Orac - fog
-- Orac - gray
-- Orac - green
-AnaLu - outdoor city night
-AnaLutetia - AvatarOpt(2)
-AnaLutetia - AvatarOpt2 whiter
-AnaLutetia - outdoor
-AnaLutetia - Studio Light
-AnaLutetia - STUDIO2
-AnaLutetia - STUDIO3
-AnaLutetia-default
-AnaLutetia-outdoor2(2)
-AnaLutetia
-B5-ShadowDancing
-CB'%s %Rouge 1
-CB'%s %Rouge 2
-CB'%s %Rouge 3
-CB'%s %Rouge 4
-CB'%s %Rouge 5
-CB'%s %Rouge 6
-Fairy blue (Paulina)
-Fairy dark blue (Paulina)
-Fairy light pink (Paulina)
-Fairy warm pinks (Paulina)
-PaperSnow
-Places Abracadabra
-Places Abracadabra2
-Places Abracadabra3
-Places alirium
-Places Annamaria
-Places Astryls Wild
-Places Babbage
-Places Beach Cay Surreal
-Places Beach Cay
-Places Bentham
-Places Cornfield
-Places Cromac
-Places Crucible
-Places District8
-Places Duskwood
-Places Eridu
-Places Erie
-Places Eugene 2
-Places Eugene BL
-Places Greed
-Places Greed2
-Places Imagine
-Places Kingsport
-Places Kunming
-Places Las Legunas
-Places Legacies
-Places Midian
-Places Mother
-Places Old New York
-Places Paris 2
-Places Paris
-Places Pathfinder
-Places Sand
-Places Terre Des Mortes
-Places Urbania
-Places Wiccan
-Places-Embryo
-StrawberrySingh.com - Closeups
-Sunset Pink (Paulina)
-Surreal - Brazil (Paulina)
-Surreal - Fire (Paulina)
-Surreal - Flirt (Paulina)
-Surreal - Night (Paulina)
-Surreal - Summer (Paulina)
-wastelands
\ No newline at end of file
+- Orac - Black fog 1
+- Orac - Black fog 2
+- Orac - Drawing blue
+- Orac - Drawing extreme
+- Orac - Drawing green
+- Orac - Drawing red
+- Orac - Drawing underground comic
+- Orac - fog
+- Orac - gray
+- Orac - green
+AnaLu - outdoor city night
+AnaLutetia - AvatarOpt(2)
+AnaLutetia - AvatarOpt2 whiter
+AnaLutetia - outdoor
+AnaLutetia - Studio Light
+AnaLutetia - STUDIO2
+AnaLutetia - STUDIO3
+AnaLutetia-default
+AnaLutetia-outdoor2(2)
+AnaLutetia
+B5-ShadowDancing
+CB's Rouge 1
+CB's Rouge 2
+CB's Rouge 3
+CB's Rouge 4
+CB's Rouge 5
+CB's Rouge 6
+Fairy blue (Paulina)
+Fairy dark blue (Paulina)
+Fairy light pink (Paulina)
+Fairy warm pinks (Paulina)
+PaperSnow
+Places Abracadabra
+Places Abracadabra2
+Places Abracadabra3
+Places alirium
+Places Annamaria
+Places Astryls Wild
+Places Babbage
+Places Beach Cay Surreal
+Places Beach Cay
+Places Bentham
+Places Cornfield
+Places Cromac
+Places Crucible
+Places District8
+Places Duskwood
+Places Eridu
+Places Erie
+Places Eugene 2
+Places Eugene BL
+Places Greed
+Places Greed2
+Places Imagine
+Places Kingsport
+Places Kunming
+Places Las Legunas
+Places Legacies
+Places Midian
+Places Mother
+Places Old New York
+Places Paris 2
+Places Paris
+Places Pathfinder
+Places Sand
+Places Terre Des Mortes
+Places Urbania
+Places Wiccan
+Places-Embryo
+StrawberrySingh.com - Closeups
+Sunset Pink (Paulina)
+Surreal - Brazil (Paulina)
+Surreal - Fire (Paulina)
+Surreal - Flirt (Paulina)
+Surreal - Night (Paulina)
+Surreal - Summer (Paulina)
+wastelands