Index: binaries/data/mods/public/art/actors/geology/stone_scandiv_formation.xml
===================================================================
--- binaries/data/mods/public/art/actors/geology/stone_scandiv_formation.xml
+++ binaries/data/mods/public/art/actors/geology/stone_scandiv_formation.xml
@@ -5,10 +5,6 @@
   <group>
     <variant name="a">
       <mesh>gaia/rock_scandiv_01.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
       <textures>
         <texture file="gaia/stone_scandiv_template.png" name="baseTex"/>
         <texture file="gaia/stone_scandiv_template_norm.png" name="normTex"/>
@@ -17,5 +13,5 @@
       </textures>
     </variant>
   </group>
-  <material>rock_bump_spec_ao_test.xml</material>
+  <material>rock_norm_spec_ao.xml</material>
 </actor>
Index: binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml
===================================================================
--- binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml
+++ binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_new.xml
@@ -5,42 +5,39 @@
     <variant frequency="1" name="a">
       <mesh>gaia/rock_stonemine_desert_bl01.dae</mesh>
       <textures>
-	  <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
-	  <texture file="gaia/ao/rock_stonemine_desert_bl01_ao.png" name="aoTex"/>
-	  </textures>
-	   <props>
+        <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
+        <texture file="gaia/ao/rock_stonemine_desert_bl01_ao.png" name="aoTex"/>
+      </textures>
+      <props>
         <prop actor="geology/decal_stone_desert_b.xml" attachpoint="root"/>
       </props>
-	  </variant>
+    </variant>
     <variant frequency="1" name="b">
       <mesh>gaia/rock_stonemine_desert_bl02.dae</mesh>
-	  <textures>
-	  <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
-	  <texture file="gaia/ao/rock_stonemine_desert_bl02_ao.png" name="aoTex"/>
-	  </textures>
-	   <props>
+      <textures>
+        <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
+        <texture file="gaia/ao/rock_stonemine_desert_bl02_ao.png" name="aoTex"/>
+      </textures>
+      <props>
         <prop actor="geology/decal_stone_desert_b.xml" attachpoint="root"/>
       </props>
     </variant>
-	
-	 <variant frequency="1" name="c">
+    <variant frequency="1" name="c">
       <mesh>gaia/rock_stonemine_desert_bl03.dae</mesh>
-	  <textures>
-	  <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
-	  <texture file="gaia/ao/rock_stonemine_desert_bl03_ao.png" name="aoTex"/>
-	  </textures>
-	  <props>
+      <textures>
+        <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
+        <texture file="gaia/ao/rock_stonemine_desert_bl03_ao.png" name="aoTex"/>
+      </textures>
+      <props>
         <prop actor="geology/decal_stone_desert_b.xml" attachpoint="root"/>
       </props>
     </variant>
-   
   </group>
-
-  <material>rock_bump_spec_ao_test.xml</material>
+  <material>rock_norm_spec_ao.xml</material>
 </actor>
Index: binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
===================================================================
--- binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
+++ binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
@@ -4,23 +4,22 @@
   <group>
     <variant frequency="1" name="formation-01">
       <mesh>gaia/rock_stone_bl01.dae</mesh>
-	  <textures>
-	  <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
-	  <texture file="gaia/ao/rock_stone_bl01_ao.png" name="aoTex"/>
-	  </textures>
+      <textures>
+        <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
+        <texture file="gaia/ao/rock_stone_bl01_ao.png" name="aoTex"/>
+      </textures>
     </variant>
     <variant frequency="1" name="formation-02">
       <mesh>gaia/rock_stone_bl02.dae</mesh>
-	  <textures>
-	  <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
-	  <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
-	  <texture file="gaia/ao/rock_stone_bl02_ao.png" name="aoTex"/>
-	  </textures>
+      <textures>
+        <texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
+        <texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
+        <texture file="gaia/ao/rock_stone_bl02_ao.png" name="aoTex"/>
+      </textures>
     </variant>
-    
   </group>
   <group>
     <variant frequency="1" name="decal">
@@ -29,5 +28,5 @@
       </props>
     </variant>
   </group>
-    <material>rock_bump_spec_ao_test.xml</material>
+  <material>rock_norm_spec_ao.xml</material>
 </actor>
Index: binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry.xml
===================================================================
--- binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry.xml
+++ binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry.xml
@@ -15,5 +15,5 @@
       </textures>
     </variant>
   </group>
-  <material>rock_bump_spec_ao_test.xml</material>
+  <material>rock_norm_spec_ao.xml</material>
 </actor>
Index: binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry_01.xml
===================================================================
--- binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry_01.xml
+++ binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry_01.xml
@@ -15,5 +15,5 @@
       </textures>
     </variant>
   </group>
-  <material>rock_bump_spec_ao_test.xml</material>
+  <material>rock_norm_spec_ao.xml</material>
 </actor>
Index: binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry_02.xml
===================================================================
--- binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry_02.xml
+++ binaries/data/mods/public/art/actors/geology/stonemine_temperate_quarry_02.xml
@@ -15,5 +15,5 @@
       </textures>
     </variant>
   </group>
-  <material>rock_bump_spec_ao_test.xml</material>
+  <material>rock_norm_spec_ao.xml</material>
 </actor>
Index: binaries/data/mods/public/art/actors/geology/stonemine_temperate_small.xml
===================================================================
--- binaries/data/mods/public/art/actors/geology/stonemine_temperate_small.xml
+++ binaries/data/mods/public/art/actors/geology/stonemine_temperate_small.xml
@@ -1,29 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
-  
   <group>
     <variant frequency="1" name="a">
       <mesh>gaia/geo_rock_set_02_temperate_stone_01.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-  <variant>
-          <textures>
-		  <texture file="gaia/stonequarry_temperate.png" name="baseTex"/>
-          <texture file="gaia/stonequarry_temperate_norm.png" name="normTex"/>
-		  <texture file="gaia/stonequarry_temperate_spec.png" name="specTex"/>
-		  <texture file="gaia/ao/stonequarry_temperate_rock02_small_ao.png" name="aoTex"/>
-	  </textures>
-	  </variant>
-	  </group>
-	    <group>
-    <variant frequency="1" name="decal">
+      <textures>
+        <texture file="gaia/stonequarry_temperate.png" name="baseTex"/>
+        <texture file="gaia/stonequarry_temperate_norm.png" name="normTex"/>
+        <texture file="gaia/stonequarry_temperate_spec.png" name="specTex"/>
+        <texture file="gaia/ao/stonequarry_temperate_rock02_small_ao.png" name="aoTex"/>
+      </textures>
       <props>
         <prop actor="geology/decal_stone_medit_a.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
-       <material>rock_bump_spec_ao_test.xml</material>
+  <material>rock_norm_spec_ao.xml</material>
 </actor>
Index: binaries/data/mods/public/art/materials/alphatest.xml
===================================================================
--- binaries/data/mods/public/art/materials/alphatest.xml
+++ binaries/data/mods/public/art/materials/alphatest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <define name="USE_ALPHATEST" value="1"/>
-	<required_texture name="baseTex"/>
-
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_ALPHATEST" value="1"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model_transparent"/>
 </material>
Index: binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml
+++ binaries/data/mods/public/art/materials/alphatest_ao_parallax_spec.xml
@@ -1,47 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-	<required_texture name="baseTex"/>
-
-    <shader effect="model_transparent"/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <define name="USE_ALPHATEST" value="1"/>
-    
-	<required_texture name="baseTex"/>
-    <!--define name="USE_PLAYERCOLOR" value="1"/-->
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the Alpha channel
-                   is the heightmap (white = high). 
-         COMMENT: Pixels that are exactly white are calculated more efficiently (on average) 
-		  if dynamic branching is supported by the player's GPU.
-	 EFFICIENCY: This is a moderately expensive effect, so use with care. -->
-    <!--define name="USE_PARALLAX_MAP" value="1"/-->
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the RGB channels
-		   are a normal map corresponding to XYZ normals.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    <!--define name="USE_NORMAL_MAP" value="1"/-->
-    
-    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
-		   provide a specular color multiplier. 
-		   Material must provide a uniform definition for "specularPower" that controls
-		   the glossiness of the effect.
-	 COMMENT: The intensity of the color controls the specular amount, so black pixels have
-		  no specularity. 
-	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    <!--define name="USE_SPECULAR_MAP" value="1"/-->
-    
-    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
-		   The Alpha channel of the texture defines the amount of self-illumination, with 
-		   transparency being no self-illumination.
-	 COMMENT: Full self-illumination means the screen color of a pixel is equal to its baseTex value.
-	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
-    <!--define name="USE_SELF_LIGHT" value="1"/-->
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <!--uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/-->
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_ALPHATEST" value="1"/>
+  <define name="USE_PARALLAX_MAP" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model_transparent"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/alphatest_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/alphatest_spec.xml
+++ binaries/data/mods/public/art/materials/alphatest_spec.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <define name="USE_ALPHATEST" value="1"/>
-
-    <define name="USE_SPECULAR" value="1"/>
-    <uniform name="specularPower" value="16.0"/>
-    <uniform name="specularColor" value="1.0 1.0 1.0"/>
-	<required_texture name="baseTex"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_ALPHATEST" value="1"/>
+  <define name="USE_SPECULAR" value="1"/>
+  <uniform name="specularPower" value="16.0"/>
+  <uniform name="specularColor" value="1.0 1.0 1.0"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model_transparent"/>
 </material>
Index: binaries/data/mods/public/art/materials/aura.xml
===================================================================
--- binaries/data/mods/public/art/materials/aura.xml
+++ binaries/data/mods/public/art/materials/aura.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_waterfall"/>
-    <alpha_blending/>
-    <renderquery name="sim_time"/>
-    <uniform name="translation" value="0.0 -0.1"/>
-	<define name="USE_SELF_LIGHT" value="1"/>
-	<uniform name="specularPower" value="100.0"/>
-    <uniform name="specularColor" value="1.0 1.0 1.0"/>
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <alpha_blending/>
+  <define name="USE_SELF_LIGHT" value="1"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model_waterfall"/>
+  <uniform name="translation" value="0.0 -0.1"/>
+  <uniform name="specularPower" value="100.0"/>
+  <uniform name="specularColor" value="1.0 1.0 1.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_glow.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_glow.xml
+++ binaries/data/mods/public/art/materials/basic_glow.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-	<shader effect="model_transparent"/>
-	<alpha_blending/>
-	<define name="USE_TRANSPARENT" value="1"/>
-	<alternative material="basic_trans.xml" quality="2"/>
-	<alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-	<define name="USE_SPECULAR_MAP" value="1"/>
-	<define name="USE_SELF_LIGHT" value="1"/>
-	<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <alpha_blending/>
+  <alternative material="basic_trans.xml" quality="2"/>
+  <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_SELF_LIGHT" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model_transparent"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_glow_wind.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_glow_wind.xml
+++ binaries/data/mods/public/art/materials/basic_glow_wind.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-	<shader effect="model_transparent"/>
-	<alpha_blending/>
-	<define name="USE_TRANSPARENT" value="1"/>
-	<alternative material="basic_trans.xml" quality="2"/>
-	<alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-	<define name="USE_SPECULAR_MAP" value="1"/>
-	<define name="USE_SELF_LIGHT" value="1"/>
-	<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-
-    <renderquery name="sim_time"/>
-    <define name="USE_WIND" value="1"/>
-    <uniform name="windData" value="6.0 6.0"/>
+  <alpha_blending/>
+  <alternative material="basic_trans.xml" quality="2"/>
+  <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_SPECULAR_MAP" value="1"/>
+  <define name="USE_SELF_LIGHT" value="1"/>
+  <define name="USE_WIND" value="1"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model_transparent"/>
+  <uniform name="windData" value="6.0 6.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_spec.xml
+++ binaries/data/mods/public/art/materials/basic_spec.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-
-    <define name="USE_SPECULAR" value="1"/>
-    <uniform name="specularPower" value="16.0"/>
-    <uniform name="specularColor" value="1.0 1.0 1.0"/>
-	
-	<required_texture name="baseTex"/>
+  <define name="USE_SPECULAR" value="1"/>
+  <uniform name="specularPower" value="16.0"/>
+  <uniform name="specularColor" value="1.0 1.0 1.0"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_specmap.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_specmap.xml
+++ binaries/data/mods/public/art/materials/basic_specmap.xml
@@ -1,23 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-
-    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
-		   provide a specular color multiplier. 
-		   Material must provide a uniform definition for "specularPower" that controls
-		   the glossiness of the effect.
-	 COMMENT: The intensity of the color controls the specular amount, so black pixels have
-		  no specularity. 
-	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- Settings for effects above:
-     First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 25.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 25.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_trans.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans.xml
+++ binaries/data/mods/public/art/materials/basic_trans.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <alternative material="alphatest.xml" if="CFG_FORCE_ALPHATEST"/>
-	
-	<required_texture name="baseTex"/>
+  <alpha_blending/>
+  <alternative material="alphatest.xml" if="CFG_FORCE_ALPHATEST"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model_transparent"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_trans_ao.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_ao.xml
+++ binaries/data/mods/public/art/materials/basic_trans_ao.xml
@@ -1,27 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <alternative material="basic_trans.xml" quality="2"/>
-    <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-
-    <!--<conditional_define name="USE_PARALLAX_MAP" value="1" type="draw_range" conf="PARALLAX_DIST"/>
-    <conditional_define name="USE_HQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_HQ_DIST"/>
-    <conditional_define name="USE_VHQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_VHQ_DIST"/>
-    <define name="USE_NORMAL_MAP" value="1"/>-->
-
-    <!--<define name="USE_SPECULAR_MAP" value="1"/>
-    <define name="USE_SELF_LIGHT" value="1"/>-->
-
-
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-</material>
+<?xml version="1.0" encoding="utf-8"?>
+<material>
+  <alpha_blending/>
+  <alternative material="basic_trans.xml" quality="2"/>
+  <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model_transparent"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+</material>
Index: binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml
+++ binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <alternative material="basic_trans_ao_spec.xml" quality="8"/>
-    <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-
-    <define name="USE_PARALLAX" value="1"/>
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
+  <alpha_blending/>
+  <alternative material="basic_trans_ao_spec.xml" quality="8"/>
+  <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model_transparent"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml
+++ binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml
@@ -1,18 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <alternative material="basic_trans_ao.xml" quality="3"/>
-
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-    <!-- Settings for effects above:
-     First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-</material>
+<?xml version="1.0" encoding="utf-8"?>
+<material>
+  <alpha_blending/>
+  <alternative material="basic_trans_ao.xml" quality="3"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model_transparent"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+</material>
Index: binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml
+++ binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <alternative material="basic_trans_spec.xml" quality="8"/>
-    <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-
-    <define name="USE_PARALLAX" value="1"/>
-
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <alpha_blending/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <alternative material="basic_trans_spec.xml" quality="8"/>
+  <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="model_transparent"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_trans_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_spec.xml
+++ binaries/data/mods/public/art/materials/basic_trans_spec.xml
@@ -1,26 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <alternative material="basic_trans.xml" quality="2"/>
-    <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-
-    <!--<conditional_define name="USE_PARALLAX_MAP" value="1" type="draw_range" conf="PARALLAX_DIST"/>
-    <conditional_define name="USE_HQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_HQ_DIST"/>
-    <conditional_define name="USE_VHQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_VHQ_DIST"/>
-    <define name="USE_NORMAL_MAP" value="1"/>-->
-
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-
-</material>
+<?xml version="1.0" encoding="utf-8"?>
+<material>
+  <alpha_blending/>
+  <alternative material="basic_trans.xml" quality="2"/>
+  <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model_transparent"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+</material>
Index: binaries/data/mods/public/art/materials/basic_trans_wind.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_wind.xml
+++ binaries/data/mods/public/art/materials/basic_trans_wind.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <alternative material="basic_trans.xml" quality="1"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <renderquery name="sim_time"/>
-    <define name="USE_WIND" value="1"/>
-    <uniform name="windData" value="1.0 1.0"/>
-	<required_texture name="baseTex"/>
+  <alpha_blending/>
+  <alternative material="basic_trans.xml" quality="1"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_WIND" value="1"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model_transparent"/>
+  <uniform name="windData" value="1.0 1.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_trans_wind_grain.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_wind_grain.xml
+++ binaries/data/mods/public/art/materials/basic_trans_wind_grain.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <alternative material="basic_trans.xml" quality="1"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <renderquery name="sim_time"/>
-    <define name="USE_WIND" value="1"/>
-    <uniform name="windData" value="6.0 6.0"/>
-	<required_texture name="baseTex"/>
+  <alpha_blending/>
+  <alternative material="basic_trans.xml" quality="1"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_WIND" value="1"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model_transparent"/>
+  <uniform name="windData" value="6.0 6.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/basic_trans_wind_parallax_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/basic_trans_wind_parallax_spec.xml
+++ binaries/data/mods/public/art/materials/basic_trans_wind_parallax_spec.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <define name="USE_NORMAL_MAP" value="1"/>
-    <define name="USE_SPECULAR_MAP" value="1"/>
-
-    <renderquery name="sim_time"/>
-    <define name="USE_WIND" value="1"/>
-    <uniform name="windData" value="1.0 1.0"/>
+  <alpha_blending/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_WIND" value="1"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="model_transparent"/>
+  <uniform name="windData" value="1.0 1.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/blend_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/blend_spec.xml
+++ binaries/data/mods/public/art/materials/blend_spec.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <alternative material="alphatest_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-
-    <define name="USE_SPECULAR" value="1"/>
-    <uniform name="specularPower" value="16.0"/>
-    <uniform name="specularColor" value="1.0 1.0 1.0"/>
-	<required_texture name="baseTex"/>
+  <alpha_blending/>
+  <alternative material="alphatest_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_SPECULAR" value="1"/>
+  <uniform name="specularPower" value="16.0"/>
+  <uniform name="specularColor" value="1.0 1.0 1.0"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model_transparent"/>
 </material>
Index: binaries/data/mods/public/art/materials/default.xml
===================================================================
--- binaries/data/mods/public/art/materials/default.xml
+++ binaries/data/mods/public/art/materials/default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-	<required_texture name="baseTex"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model"/>
 </material>
Index: binaries/data/mods/public/art/materials/no_trans_ao.xml
===================================================================
--- binaries/data/mods/public/art/materials/no_trans_ao.xml
+++ binaries/data/mods/public/art/materials/no_trans_ao.xml
@@ -1,24 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-    <shader effect="model"/>
-    <alternative material="default.xml" quality="2"/>
-
-    <!--<conditional_define name="USE_PARALLAX_MAP" value="1" type="draw_range" conf="PARALLAX_DIST"/>
-    <conditional_define name="USE_HQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_HQ_DIST"/>
-    <conditional_define name="USE_VHQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_VHQ_DIST"/>
-    <define name="USE_NORMAL_MAP" value="1"/>-->
-
-    <!--<define name="USE_SPECULAR_MAP" value="1"/>
-    <define name="USE_SELF_LIGHT" value="1"/>-->
-
-
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-</material>
+<?xml version="1.0" encoding="utf-8"?>
+<material>
+  <alternative material="default.xml" quality="2"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+</material>
Index: binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml
===================================================================
--- binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml
+++ binaries/data/mods/public/art/materials/no_trans_parallax_ao.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="no_trans_ao.xml" quality="8"/>
-
-    <define name="USE_PARALLAX" value="1"/>
-
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-
+  <alternative material="no_trans_ao.xml" quality="8"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/objectcolor.xml
===================================================================
--- binaries/data/mods/public/art/materials/objectcolor.xml
+++ binaries/data/mods/public/art/materials/objectcolor.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <define name="USE_OBJECTCOLOR" value="1"/>
-	
-	<required_texture name="baseTex"/>
+  <define name="USE_OBJECTCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model"/>
 </material>
Index: binaries/data/mods/public/art/materials/objectcolor_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/objectcolor_spec.xml
+++ binaries/data/mods/public/art/materials/objectcolor_spec.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-
-    <define name="USE_OBJECTCOLOR" value="1"/>
-
-    <define name="USE_SPECULAR" value="1"/>
-    <uniform name="specularPower" value="16.0"/>
-    <uniform name="specularColor" value="1.0 1.0 1.0"/>
-
-<required_texture name="baseTex"/>
+  <define name="USE_OBJECTCOLOR" value="1"/>
+  <define name="USE_SPECULAR" value="1"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model"/>
+  <uniform name="specularPower" value="16.0"/>
+  <uniform name="specularColor" value="1.0 1.0 1.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/objectcolor_specmap.xml
===================================================================
--- binaries/data/mods/public/art/materials/objectcolor_specmap.xml
+++ binaries/data/mods/public/art/materials/objectcolor_specmap.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-
-    <define name="USE_OBJECTCOLOR" value="1"/>
-
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <define name="USE_OBJECTCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans.xml
+++ binaries/data/mods/public/art/materials/player_trans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-	<required_texture name="baseTex"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_ao.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_ao.xml
+++ binaries/data/mods/public/art/materials/player_trans_ao.xml
@@ -1,26 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans.xml" quality="2"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-
-    <!--<conditional_define name="USE_PARALLAX_MAP" value="1" type="draw_range" conf="PARALLAX_DIST"/>
-    <conditional_define name="USE_HQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_HQ_DIST"/>
-    <conditional_define name="USE_VHQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_VHQ_DIST"/>
-    <define name="USE_NORMAL_MAP" value="1"/>-->
-
-    <!--<define name="USE_SPECULAR_MAP" value="1"/>
-    <define name="USE_SELF_LIGHT" value="1"/>-->
-
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-
+  <alternative material="player_trans.xml" quality="2"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml
+++ binaries/data/mods/public/art/materials/player_trans_ao_parallax.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans_ao.xml" quality="8"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-
-    <define name="USE_PARALLAX" value="1"/>
-
-	<uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
+  <alternative material="player_trans_ao.xml" quality="8"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml
+++ binaries/data/mods/public/art/materials/player_trans_ao_parallax_spec.xml
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans_ao_spec.xml" quality="8"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-
-    <define name="USE_PARALLAX" value="1"/>
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
+  <alternative material="player_trans_ao_spec.xml" quality="8"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.6"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_ao_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_ao_spec.xml
+++ binaries/data/mods/public/art/materials/player_trans_ao_spec.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans_ao.xml" quality="3"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-
+  <alternative material="player_trans_ao.xml" quality="3"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_parallax.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_parallax.xml
+++ binaries/data/mods/public/art/materials/player_trans_parallax.xml
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans.xml" quality="8"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-
-    <define name="USE_PARALLAX" value="1"/>
-
-    <!--<define name="USE_SPECULAR_MAP" value="1"/>
-    <define name="USE_SELF_LIGHT" value="1"/>-->
-
-    <!--<define name="USE_AO" value="1"/>-->
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale. 
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.75"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.75"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml
+++ binaries/data/mods/public/art/materials/player_trans_parallax_spec.xml
@@ -1,24 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans_spec.xml" quality="8"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-
-    <define name="USE_PARALLAX" value="1"/>
-
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-
-    <!--<define name="USE_AO" value="1"/>-->
-
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-
+  <alternative material="player_trans_spec.xml" quality="8"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml
+++ binaries/data/mods/public/art/materials/player_trans_parallax_spec_helmet.xml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans.xml" quality="1"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-
-    <!-- Settings for effects above:
-     First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-
+  <alternative material="player_trans.xml" quality="1"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_spec.xml
+++ binaries/data/mods/public/art/materials/player_trans_spec.xml
@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans.xml" quality="1"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-
-    <!-- Settings for effects above:
-     First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-
+  <alternative material="player_trans.xml" quality="1"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml
+++ binaries/data/mods/public/art/materials/player_trans_spec_helmet.xml
@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans.xml" quality="1"/>
-    <define name="USE_PLAYERCOLOR" value="1"/>
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-
-    <!-- Settings for effects above:
-     First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-
+  <alternative material="player_trans.xml" quality="1"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/player_water.xml
===================================================================
--- binaries/data/mods/public/art/materials/player_water.xml
+++ binaries/data/mods/public/art/materials/player_water.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_water"/>
-    <renderquery name="water_tex"/>
-    <renderquery name="sky_cube"/>
-    <renderquery name="sim_time"/>
-    <uniform name="translation" value="0.05 -0.05"/>
-    
-    <uniform name="shininess" value="32.0"/>
-    <uniform name="specularStrength" value="1.5"/>
-    <uniform name="waviness" value="0.5"/>
-    <uniform name="waterTint" value="0.2 0.3 0.2"/>
-    <uniform name="murkiness" value="0.6"/>
-    <uniform name="reflectionTint" value="0.3 0.4 0.3"/>
-    <uniform name="reflectionTintStrength" value="0.1"/>
-	<required_texture name="baseTex"/>
+  <shader effect="model_water"/>
+  <renderquery name="water_tex"/>
+  <renderquery name="sky_cube"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <uniform name="translation" value="0.05 -0.05"/>
+  <uniform name="shininess" value="32.0"/>
+  <uniform name="specularStrength" value="1.5"/>
+  <uniform name="waviness" value="0.5"/>
+  <uniform name="waterTint" value="0.2 0.3 0.2"/>
+  <uniform name="murkiness" value="0.6"/>
+  <uniform name="reflectionTint" value="0.3 0.4 0.3"/>
+  <uniform name="reflectionTintStrength" value="0.1"/>
 </material>
Index: binaries/data/mods/public/art/materials/playercolor_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/playercolor_spec.xml
+++ binaries/data/mods/public/art/materials/playercolor_spec.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-
-    <define name="USE_PLAYERCOLOR" value="1"/>
-
-    <define name="USE_SPECULAR" value="1"/>
-    <uniform name="specularPower" value="16.0"/>
-    <uniform name="specularColor" value="1.0 1.0 1.0"/>
-	<required_texture name="baseTex"/>
+  <shader effect="model"/>
+  <define name="USE_PLAYERCOLOR" value="1"/>
+  <define name="USE_SPECULAR" value="1"/>
+  <uniform name="specularPower" value="16.0"/>
+  <uniform name="specularColor" value="1.0 1.0 1.0"/>
+  <required_texture name="baseTex"/>
 </material>
Index: binaries/data/mods/public/art/materials/rock_bump_spec_ao_test.xml
===================================================================
--- binaries/data/mods/public/art/materials/rock_bump_spec_ao_test.xml
+++ binaries/data/mods/public/art/materials/rock_bump_spec_ao_test.xml
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-    <shader effect="model"/>
-    <alternative material="player_trans_ao_spec.xml" quality="8"/>
-    
-    <define name="USE_PLAYERCOLOR" value="0"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the Alpha channel
-                   is the heightmap (white = high). 
-         COMMENT: Pixels that are exactly white are calculated more efficiently (on average) 
-		  if dynamic branching is supported by the player's GPU.
-	 EFFICIENCY: This is a moderately expensive effect, so use with care. -->
-    <define name="USE_PARALLAX" value="1"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the RGB channels
-		   are a normal map corresponding to XYZ normals.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
-		   provide a specular color multiplier. 
-		   Material must provide a uniform definition for "specularPower" that controls
-		   the glossiness of the effect.
-	 COMMENT: The intensity of the color controls the specular amount, so black pixels have
-		  no specularity. 
-	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
-		   The Alpha channel of the texture defines the amount of self-illumination, with 
-		   transparency being no self-illumination.
-	 COMMENT: Full self-illumination means the screen color of a pixel is equal to its baseTex value.
-	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
-                   The model must provide a second, non-overlapping set of UV coordinates.
-	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-
-</material>
Index: binaries/data/mods/public/art/materials/rock_bump_spec_test.xml
===================================================================
--- binaries/data/mods/public/art/materials/rock_bump_spec_test.xml
+++ binaries/data/mods/public/art/materials/rock_bump_spec_test.xml
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<material>
-    <shader effect="model"/>
-    <alternative material="player_trans_ao_spec.xml" quality="8"/>
-    
-    <define name="USE_PLAYERCOLOR" value="0"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the Alpha channel
-                   is the heightmap (white = high). 
-         COMMENT: Pixels that are exactly white are calculated more efficiently (on average) 
-		  if dynamic branching is supported by the player's GPU.
-	 EFFICIENCY: This is a moderately expensive effect, so use with care. -->
-    <define name="USE_PARALLAX" value="1"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the RGB channels
-		   are a normal map corresponding to XYZ normals.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
-		   provide a specular color multiplier. 
-		   Material must provide a uniform definition for "specularPower" that controls
-		   the glossiness of the effect.
-	 COMMENT: The intensity of the color controls the specular amount, so black pixels have
-		  no specularity. 
-	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
-		   The Alpha channel of the texture defines the amount of self-illumination, with 
-		   transparency being no self-illumination.
-	 COMMENT: Full self-illumination means the screen color of a pixel is equal to its baseTex value.
-	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
-                   The model must provide a second, non-overlapping set of UV coordinates.
-	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
-    <define name="USE_AO" value="0"/>
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="5.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-</material>
Index: binaries/data/mods/public/art/materials/rock_norm_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/rock_norm_spec.xml
+++ binaries/data/mods/public/art/materials/rock_norm_spec.xml
@@ -1,50 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans_ao_spec.xml" quality="8"/>
-    
-    <define name="USE_PLAYERCOLOR" value="0"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the Alpha channel
-                   is the heightmap (white = high). 
-         COMMENT: Pixels that are exactly white are calculated more efficiently (on average) 
-		  if dynamic branching is supported by the player's GPU.
-	 EFFICIENCY: This is a moderately expensive effect, so use with care. -->
-    <define name="USE_PARALLAX" value="1"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the RGB channels
-		   are a normal map corresponding to XYZ normals.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
-		   provide a specular color multiplier. 
-		   Material must provide a uniform definition for "specularPower" that controls
-		   the glossiness of the effect.
-	 COMMENT: The intensity of the color controls the specular amount, so black pixels have
-		  no specularity. 
-	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
-		   The Alpha channel of the texture defines the amount of self-illumination, with 
-		   transparency being no self-illumination.
-	 COMMENT: Full self-illumination means the screen color of a pixel is equal to its baseTex value.
-	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
-                   The model must provide a second, non-overlapping set of UV coordinates.
-	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
-    <define name="USE_AO" value="0"/>
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="5.0 50.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <alternative material="player_trans_spec.xml" quality="8"/>
+  <define name="USE_PLAYERCOLOR" value="0"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <define name="USE_AO" value="0"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="5.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml
===================================================================
--- binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml
+++ binaries/data/mods/public/art/materials/rock_norm_spec_ao.xml
@@ -1,51 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <alternative material="player_trans_ao_spec.xml" quality="8"/>
-    
-    <define name="USE_PLAYERCOLOR" value="0"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the Alpha channel
-                   is the heightmap (white = high). 
-         COMMENT: Pixels that are exactly white are calculated more efficiently (on average) 
-		  if dynamic branching is supported by the player's GPU.
-	 EFFICIENCY: This is a moderately expensive effect, so use with care. -->
-    <define name="USE_PARALLAX" value="1"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "normTex", where the RGB channels
-		   are a normal map corresponding to XYZ normals.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
-		   provide a specular color multiplier. 
-		   Material must provide a uniform definition for "specularPower" that controls
-		   the glossiness of the effect.
-	 COMMENT: The intensity of the color controls the specular amount, so black pixels have
-		  no specularity. 
-	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    
-    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
-		   The Alpha channel of the texture defines the amount of self-illumination, with 
-		   transparency being no self-illumination.
-	 COMMENT: Full self-illumination means the screen color of a pixel is equal to its baseTex value.
-	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
-    <!-- <define name="USE_SELF_LIGHT" value="1"/> -->
-    
-    <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
-                   The model must provide a second, non-overlapping set of UV coordinates.
-	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
-    
-    <!-- Settings for effects above:
-         First value: Normal mapping intensity.
-	 Second value: Specular power.
-	 Third value: Parallax scale.
-	 Fourth value: AO amount. -->
-    <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
-	
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="aoTex" define="USE_AO"/>
-
+  <alternative material="player_trans_ao_spec.xml" quality="8"/>
+  <define name="USE_PLAYERCOLOR" value="0"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="aoTex" define="USE_AO"/>
+  <shader effect="model"/>
+  <uniform name="effectSettings" value="1.0 10.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_base.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_base.xml
+++ binaries/data/mods/public/art/materials/terrain_base.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_base"/>
-	<required_texture name="baseTex"/>
+  <shader effect="terrain_base"/>
+  <required_texture name="baseTex"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_grass.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_grass.xml
+++ binaries/data/mods/public/art/materials/terrain_grass.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_grass"/>
-    <!--define name="USE_NORMAL_MAP" value="1"/-->
-    <!--define name="USE_SPECULAR_MAP" value="1"/-->
-    
-    <!--uniform name="specularPower" value="15.0"/-->
-	<required_texture name="baseTex"/>
+  <shader effect="terrain_grass"/>
+  <required_texture name="baseTex"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml
+++ binaries/data/mods/public/art/materials/terrain_grass_norm_spec.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_grass"/>
-    <define name="USE_NORMAL_MAP" value="1"/>
-    <define name="USE_SPECULAR_MAP" value="1"/>
-    
-    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="terrain_grass"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_grass_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_grass_spec.xml
+++ binaries/data/mods/public/art/materials/terrain_grass_spec.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_grass"/>
-    <define name="USE_SPECULAR_MAP" value="1"/>
-    
-    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="terrain_grass"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_norm.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_norm.xml
+++ binaries/data/mods/public/art/materials/terrain_norm.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_base"/>
-    <alternative material="terrain_base.xml" quality="2"/>
-
-    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <alternative material="terrain_base.xml" quality="2"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="terrain_base"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_norm_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_norm_spec.xml
+++ binaries/data/mods/public/art/materials/terrain_norm_spec.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_base"/>
-    <alternative material="terrain_norm.xml" quality="4"/>
-
-    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <alternative material="terrain_norm.xml" quality="4"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="terrain_base"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_triplanar.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_triplanar.xml
+++ binaries/data/mods/public/art/materials/terrain_triplanar.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_base"/>
-    <alternative material="terrain_base.xml" quality="1"/>
-
-    <define name="USE_TRIPLANAR" value="1"/>
-    
-    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
-	<required_texture name="baseTex"/>
+  <alternative material="terrain_base.xml" quality="1"/>
+  <define name="USE_TRIPLANAR" value="1"/>
+  <required_texture name="baseTex"/>
+  <shader effect="terrain_base"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml
+++ binaries/data/mods/public/art/materials/terrain_triplanar_norm.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_base"/>
-    <alternative material="terrain_triplanar.xml" quality="2"/>
-
-    <define name="USE_TRIPLANAR" value="1"/>
-    
-    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <alternative material="terrain_triplanar.xml" quality="2"/>
+  <define name="USE_TRIPLANAR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="terrain_base"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
+++ binaries/data/mods/public/art/materials/terrain_triplanar_norm_spec.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="terrain_base"/>
-    <alternative material="terrain_triplanar_norm.xml" quality="2"/>
-
-    <define name="USE_TRIPLANAR" value="1"/>
-    
-    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
-	<required_texture name="baseTex"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <alternative material="terrain_triplanar_norm.xml" quality="2"/>
+  <define name="USE_TRIPLANAR" value="1"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <shader effect="terrain_base"/>
+  <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/trans_wind.xml
===================================================================
--- binaries/data/mods/public/art/materials/trans_wind.xml
+++ binaries/data/mods/public/art/materials/trans_wind.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model"/>
-    <renderquery name="sim_time"/>
-    <define name="USE_WIND" value="1"/>
-    <uniform name="windData" value="1.0 1.0"/>
-	<required_texture name="baseTex"/>
+  <define name="USE_WIND" value="1"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <shader effect="model"/>
+  <uniform name="windData" value="1.0 1.0"/>
 </material>
Index: binaries/data/mods/public/art/materials/trans_wind_parallax_spec.xml
===================================================================
--- binaries/data/mods/public/art/materials/trans_wind_parallax_spec.xml
+++ binaries/data/mods/public/art/materials/trans_wind_parallax_spec.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_transparent"/>
-    <alpha_blending/>
-    <define name="USE_TRANSPARENT" value="1"/>
-    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
-	
-    <renderquery name="sim_time"/>
-    <define name="USE_WIND" value="1"/>
-    <uniform name="windData" value="1.0 1.0"/>
-
-	<required_texture name="baseTex"/>
-	<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
-	<required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <alpha_blending/>
+  <define name="USE_TRANSPARENT" value="1"/>
+  <define name="USE_WIND" value="1"/>
+  <define name="USE_PARALLAX" value="1"/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <required_texture name="specTex" define="USE_SPECULAR_MAP"/>
+  <required_texture name="normTex" define="USE_NORMAL_MAP"/>
+  <shader effect="model_transparent"/>
+  <uniform name="windData" value="1.0 1.0"/>
+  <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
 </material>
Index: binaries/data/mods/public/art/materials/waterfall.xml
===================================================================
--- binaries/data/mods/public/art/materials/waterfall.xml
+++ binaries/data/mods/public/art/materials/waterfall.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <material>
-    <shader effect="model_waterfall"/>
-    <alpha_blending/>
-    <renderquery name="sim_time"/>
-    <uniform name="translation" value="0.0 -0.4"/>
-    
-    <uniform name="specularPower" value="16.0"/>
-    <uniform name="specularColor" value="1.0 1.0 1.0"/>
-
-	<required_texture name="baseTex"/>
+  <alpha_blending/>
+  <renderquery name="sim_time"/>
+  <required_texture name="baseTex"/>
+  <uniform name="translation" value="0.0 -0.4"/>
+  <uniform name="specularPower" value="16.0"/>
+  <uniform name="specularColor" value="1.0 1.0 1.0"/>
+  <shader effect="model_waterfall"/>
 </material>