diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fd4c2917d52b5c4443ea85ae6e7d123148bd6d4f..062c3f4caed3c21bce683b007e0051aa448ccaa2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8818,7 +8818,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>0</integer>
+    <integer>1</integer>
   </map>
   <key>RenderLocalLights</key>
   <map>
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index 0a189ff416b45050faa0010659048a4d5a92c94d..b00e2290a9ed77662d21860ff86c47e62ef16192 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -194,6 +194,7 @@ void main()
 #ifdef USE_VERTEX_COLOR
     float final_alpha = diffuse_linear.a * vertex_color.a;
     diffuse_srgb.rgb *= vertex_color.rgb;
+    diffuse_linear.rgb *= vertex_color.rgb;
 #else
     float final_alpha = diffuse_linear.a;
 #endif
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
index c5eaacbd0bb42698d6296d8b34459a8aaf954338..595efdf6fedc0f85ed07105fcb426a00dba4d554 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
@@ -120,11 +120,11 @@ void main()
     vec4 color;
     color = (cloudColorSun*(1.-alpha2) + cloudColorAmbient);
     color.rgb= max(vec3(0), color.rgb);
-    color.rgb = linear_to_srgb(color.rgb);
+    //color.rgb = linear_to_srgb(color.rgb);
 
 //alpha1 = 1.0;
 //color.rgb = cloudColorAmbient.rgb;
-
+color.rgb = vec3(1,0,1);
 
     /// Gamma correct for WL (soft clip effect).
     frag_data[0] = vec4(scaleSoftClip(color.rgb), alpha1);
diff --git a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
index 8256d5f106192ae63358c56367af02a30e262270..80f232948acd4a3d1bdc4e60e83c95d555c36941 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
@@ -57,7 +57,8 @@ void main()
     // and shows true moon color at night
     vec3 luma_weights = vec3(0.3, 0.5, 0.3);
 
-    float mix = 1.0 - dot(normalize(sunlight_color.rgb), luma_weights);
+    vec4 light_color = max(sunlight_color, moonlight_color);
+    float mix = 1.0 - dot(normalize(light_color.rgb), luma_weights);
 
     vec3 exp = vec3(1.0 - mix * moon_brightness) * 2.0  - 1.0;
     c.rgb = pow(c.rgb, exp);
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index a2fbec524e5ebeb06109e32ca8b5c5b482676f04..8fcd26eba937d8635473980d2cf64aff8d65a425 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -153,7 +153,7 @@ vec3 post_diffuse = color.rgb;
                 float scontrib = fres*texture2D(lightFunc, vec2(nh, spec.a)).r*gt/(nh*da);
                 vec3 speccol = sun_contrib*scontrib*spec.rgb;
                 speccol = clamp(speccol, vec3(0), vec3(1));
-                bloom += dot (speccol, speccol) / 6;
+                bloom += dot (speccol, speccol) / 12;
                 color += speccol;
             }
         }