From 5c3d4d640113950375217866445fde014eeae342 Mon Sep 17 00:00:00 2001
From: lordhavoc <lordhavoc@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Thu, 20 Apr 2006 12:08:24 +0000
Subject: [PATCH] cleanup added common-spog.pk3 and common.shader for
 GTKRadiant (and to reduce warnings when loading maps)

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1306 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/scripts/blacksky.shader        |    3 +-
 data/scripts/common.shader          |  321 ++++
 data/scripts/dsi.shader             |   85 +-
 data/scripts/e7.shader              |   69 +-
 data/scripts/el3dm1.shader          |  225 +--
 data/scripts/evil3.shader           |  304 ++--
 data/scripts/evil4_techtrims.shader | 2183 +++++++++++++--------------
 data/scripts/evil5.shader           |  692 ++++-----
 data/scripts/evil6.shader           |  119 +-
 data/scripts/evil6_floors.shader    |   16 +-
 data/scripts/evil6_lights.shader    |   92 +-
 data/scripts/evil6_support.shader   |    8 +-
 data/scripts/evil6_trims.shader     |    7 +-
 data/scripts/evil6_walls.shader     |   51 +-
 data/scripts/evil8_base.shader      |  193 +--
 data/scripts/harlequin_sky.shader   |    3 +-
 data/scripts/kaznexctf2.shader      |   14 +-
 data/scripts/liquids.shader         |   18 +-
 data/scripts/nexdm18_rmx.shader     |   18 +-
 data/scripts/official_cmp1.shader   |   43 +-
 data/scripts/reaper.shader          | 1068 +++++++------
 data/scripts/sav-graysky1.shader    |   49 +-
 data/scripts/sav-liquids.shader     |   55 +-
 data/scripts/savdm6ish.shader       |   33 +-
 data/scripts/shaderlist.txt         |    2 +
 data/scripts/stralenex1.shader      |   96 +-
 data/scripts/swamp.shader           |    6 +-
 data/scripts/toxic.shader           |    5 +-
 data/scripts/tznex01.shader         |   11 +-
 29 files changed, 2948 insertions(+), 2841 deletions(-)
 create mode 100644 data/scripts/common.shader

diff --git a/data/scripts/blacksky.shader b/data/scripts/blacksky.shader
index e96c03ab3..455fc228b 100644
--- a/data/scripts/blacksky.shader
+++ b/data/scripts/blacksky.shader
@@ -13,5 +13,4 @@ textures/skies/blacksky
 	q3map_sun 1 .98 .9 100 0 90
 // note: Change the fourth value (100) if you want a brighter or dimmer sun
 	skyparms textures/harlequin_sky/env/nebular - -
-}
-
+}
\ No newline at end of file
diff --git a/data/scripts/common.shader b/data/scripts/common.shader
new file mode 100644
index 000000000..71034b483
--- /dev/null
+++ b/data/scripts/common.shader
@@ -0,0 +1,321 @@
+
+textures/common/areaportal
+{
+	qer_trans 0.50
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm structural
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm areaportal
+}
+
+textures/common/caulk
+{
+	surfaceparm nodraw
+    surfaceparm nolightmap
+	surfaceparm nomarks
+}
+
+textures/common/clip
+{
+	qer_trans 0.40
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm noimpact
+	surfaceparm playerclip
+}
+
+textures/common/clusterportal
+{
+	qer_trans 0.50
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm clusterportal
+}
+
+textures/common/cushion
+{
+	qer_nocarve
+	qer_trans 0.50
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm nodamage
+}
+
+textures/common/donotenter
+{
+	qer_trans 0.50
+	surfaceparm nodraw
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm donotenter
+}
+
+
+// never used
+//
+//textures/common/energypad
+//{
+//	qer_editorimage textures/sfx/bluegoal.tga
+//	surfaceparm nolightmap
+//	cull twosided
+//	{
+//		map textures//bluegoal.tga
+//		blendFunc GL_ONE GL_SRC_ALPHA
+//		tcGen environment
+//		tcMod turb 0 0.25 0 0.05
+//	}
+//}
+
+textures/common/full_clip // silly shader, use weapclip instead
+{
+	qer_trans 0.40
+	surfaceparm nodraw
+	surfaceparm playerclip
+}
+
+textures/common/hint // should NOT use surfaceparm hint.. strange but true
+{
+	qer_nocarve
+	qer_trans 0.30
+	surfaceparm nodraw
+	surfaceparm nonsolid
+	surfaceparm structural
+	surfaceparm trans
+	surfaceparm noimpact
+	surfaceparm hint	// ydnar: yes it should.
+}
+
+textures/common/invisible // solid, transparent polygons, casts shadows
+{
+	surfaceparm nolightmap			
+        {
+                map textures/common/invisible.tga
+                alphaFunc GE128
+		depthWrite
+		rgbGen vertex
+        }
+}
+
+textures/common/mirror1
+{
+	qer_editorimage textures/common/mirror1.tga
+	surfaceparm nolightmap
+	portal
+  
+	{
+		map textures/common/mirror1.tga
+		blendfunc GL_ONE GL_ONE_MINUS_SRC_ALPHA
+		depthWrite
+	}
+       
+        
+
+}
+
+textures/common/mirror2
+{
+	qer_editorimage textures/common/qer_mirror.tga
+	surfaceparm nolightmap
+	portal
+	{
+		map textures/common/mirror1.tga
+		blendfunc GL_ONE GL_ONE_MINUS_SRC_ALPHA
+		depthWrite
+	}
+        {
+               map textures/sfx/mirror.tga
+	       blendFunc GL_ZERO GL_ONE_MINUS_SRC_COLOR
+        }
+
+}
+
+textures/common/missileclip
+{
+	qer_trans 0.40
+	surfaceparm nodamage
+	surfaceparm nomarks
+	surfaceparm nodraw
+	//surfaceparm nonsolid
+	surfaceparm playerclip
+	surfaceparm trans
+}
+
+textures/common/nodraw
+{
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm nomarks
+}
+
+textures/common/nodrawnonsolid
+{
+	surfaceparm nonsolid
+	surfaceparm nolightmap
+	surfaceparm nodraw
+}
+
+textures/common/nodrop
+{
+	qer_nocarve
+	qer_trans 0.5
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm nodrop
+}
+
+
+textures/common/noimpact
+{
+	qer_editorimage textures/common/nolightmap.tga
+	surfaceparm noimpact
+}
+
+textures/common/nolightmap
+{
+	surfaceparm nolightmap
+}
+
+textures/common/origin
+{
+	qer_nocarve
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm origin
+}
+
+textures/common/portal
+{
+	qer_editorimage textures/common/qer_portal.tga
+	surfaceparm nolightmap
+	portal
+	{
+		map textures/common/mirror1.tga
+		tcMod turb 0 0.25 0 0.05
+		blendfunc GL_ONE GL_ONE_MINUS_SRC_ALPHA
+		depthWrite
+
+	}
+}
+
+textures/common/slick
+{
+	qer_trans 0.50
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nomarks
+	surfaceparm trans
+	surfaceparm slick
+}
+
+textures/common/terrain
+{
+	q3map_terrain
+	surfaceparm nodraw
+    surfaceparm nolightmap
+	surfaceparm nomarks
+}
+
+textures/common/terrain2
+{
+	q3map_terrain
+	qer_editorimage textures/common/terrain.tga
+	surfaceparm dust
+	surfaceparm nodraw
+	surfaceparm nomarks
+	surfaceparm nolightmap
+}
+
+textures/common/timportal
+{
+	qer_editorimage textures/common/qer_portal.tga
+	portal
+	surfaceparm nolightmap
+	{
+		map textures/common/portal.tga
+		tcMod turb 0 0.25 0 0.05
+		blendFunc GL_ONE GL_SRC_ALPHA
+		depthWrite
+	}
+}
+
+textures/common/trigger
+{
+	qer_trans 0.50
+	qer_nocarve
+	surfaceparm nodraw
+}
+
+textures/common/weapclip
+{
+	qer_trans 0.40
+	surfaceparm nodraw
+    	surfaceparm nolightmap
+	surfaceparm trans
+	surfaceparm nomarks
+}
+
+textures/common/metalclip
+{
+	qer_trans 0.40
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm noimpact
+	surfaceparm playerclip
+	surfaceparm metalsteps
+}
+
+textures/common/botclip
+{
+	qer_trans 0.40
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	surfaceparm nomarks
+	surfaceparm noimpact
+	surfaceparm botclip
+}
+
+//
+// ydnar q3map lightgrid bounds
+//
+// the min/max bounds of brushes with this shader in a map
+// will define the bounds of the map's lightgrid (model lighting)
+// note: make it as small as possible around player space
+// to minimize bsp size and compile time
+//
+
+textures/common/lightgrid
+{
+	qer_trans 0.5
+	surfaceparm nodraw
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm detail
+	surfaceparm nomarks
+	surfaceparm trans
+	surfaceparm lightgrid
+}
+
diff --git a/data/scripts/dsi.shader b/data/scripts/dsi.shader
index 90a02447f..1038b9c81 100644
--- a/data/scripts/dsi.shader
+++ b/data/scripts/dsi.shader
@@ -1,48 +1,41 @@
 textures/liquids/dsiwater_ripple
+{
+	qer_editorimage textures/liquids/pool3d_3c.tga
+	qer_trans .5
+	q3map_globaltexture
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm water
+	cull disable
+	deformVertexes wave 64 sin .5 .5 0 .5
 	{
-		qer_editorimage textures/liquids/pool3d_3c.tga
-		qer_trans .5
-		q3map_globaltexture
-		surfaceparm trans
-		surfaceparm nonsolid
-		surfaceparm water
-	
-		cull disable
-		deformVertexes wave 64 sin .5 .5 0 .5	
-		
-		{ 
-			map textures/liquids/pool3d_5c.tga
-			blendFunc GL_dst_color GL_one
-			rgbgen identity
-			tcmod scale .5 .5
-			tcmod transform 1.5 0 1.5 1 1 2
-			tcmod scroll -.05 .001
-		}
-	
-		{ 
-			map textures/liquids/pool3d_6c.tga
-			blendFunc GL_dst_color GL_one
-			rgbgen identity
-			tcmod scale .5 .5
-			tcmod transform 0 1.5 1 1.5 2 1
-			tcmod scroll .025 -.001
-		}
-
-		{ 
-			map textures/liquids/pool3d_3c.tga
-			blendFunc GL_dst_color GL_one
-			rgbgen identity
-			tcmod scale .25 .5
-			tcmod scroll .001 .025
-		}
-	
-		{
-			map $lightmap
-			blendFunc GL_dst_color GL_zero
-			rgbgen identity		
-		}
-	
-
+		map textures/liquids/pool3d_5c.tga
+		blendFunc GL_dst_color GL_one
+		rgbgen identity
+		tcmod scale .5 .5
+		tcmod transform 1.5 0 1.5 1 1 2
+		tcmod scroll -.05 .001
+	}
+	{
+		map textures/liquids/pool3d_6c.tga
+		blendFunc GL_dst_color GL_one
+		rgbgen identity
+		tcmod scale .5 .5
+		tcmod transform 0 1.5 1 1.5 2 1
+		tcmod scroll .025 -.001
+	}
+	{
+		map textures/liquids/pool3d_3c.tga
+		blendFunc GL_dst_color GL_one
+		rgbgen identity
+		tcmod scale .25 .5
+		tcmod scroll .001 .025
+	}
+	{
+		map $lightmap
+		blendFunc GL_dst_color GL_zero
+		rgbgen identity
+	}
 }
 
 textures/dsi/weapspawn01
@@ -74,13 +67,13 @@ textures/dsi/dsiglass
 		map textures/dsi/dsitinfx.tga
 		blendfunc add
 		rgbGen identity
-		tcGen environment 
+		tcGen environment
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
diff --git a/data/scripts/e7.shader b/data/scripts/e7.shader
index 1935c7dec..aa9914249 100644
--- a/data/scripts/e7.shader
+++ b/data/scripts/e7.shader
@@ -15,15 +15,15 @@ textures/e7/e7brickfloor01jump
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e7/e7brickfloor01jump_glow.tga
 		blendfunc add
-		rgbGen wave sin 0.5 0.8 0 1.5 
+		rgbGen wave sin 0.5 0.8 0 1.5
 	}
 }
 
@@ -34,9 +34,9 @@ textures/e7/e7mlight
 	surfaceparm nomarks
 	q3map_surfacelight 1500
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e7/e7mlight.tga
@@ -50,7 +50,8 @@ textures/e7/e7mlight
 	}
 }
 
-//smalll light
+//small light
+
 textures/e7/e7slight
 {
 	qer_editorimage textures/e7/e7slight.tga
@@ -58,9 +59,9 @@ textures/e7/e7slight
 	surfaceparm nomarks
 	q3map_surfacelight 2500
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e7/e7slight.tga
@@ -81,9 +82,9 @@ textures/e7/e7trimlight
 	surfaceparm nomarks
 	q3map_surfacelight 700
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e7/e7trimlight.tga
@@ -98,9 +99,10 @@ textures/e7/e7trimlight
 }
 
 //evilgrate
+
 textures/e7/e7wgrate
 {
-    qer_editorimage textures/e7/e7wgrate.tga
+	qer_editorimage textures/e7/e7wgrate.tga
 	surfaceparm alphashadow
 	surfaceparm nomarks
 	surfaceparm metalsteps
@@ -114,15 +116,16 @@ textures/e7/e7wgrate
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
 
 // evil lava - sorta looks bad ingame - imho
+
 textures/e7/e7sfx_lava
 {
 	qer_editorimage textures/e7/e7sfx_lava.tga
@@ -131,7 +134,7 @@ textures/e7/e7sfx_lava
 	surfaceparm nolightmap
 	surfaceparm trans
 	cull disable
-	deformVertexes wave 100 sin 3 2 0.1 0.1 
+	deformVertexes wave 100 sin 3 2 0.1 0.1
 	tessSize 128
 	q3map_surfacelight 1500
 	q3map_globaltexture
@@ -143,6 +146,7 @@ textures/e7/e7sfx_lava
 }
 
 //evil sky of impending doom :P
+
 textures/e7/e7evilsky_1
 {
 	qer_editorimage textures/e7/e7evilsky_1.tga
@@ -175,9 +179,9 @@ textures/e7/e7rain
 	surfaceparm nonsolid
 	surfaceparm trans
 	cull disable
-	deformVertexes move 3 1 0 sin 0 5 0 0.2 
-	deformVertexes move 0.6 3.3 0 sin 0 5 0 0.4 
-	deformVertexes wave 30 sin 0 10 0 0.2 
+	deformVertexes move 3 1 0 sin 0 5 0 0.2
+	deformVertexes move 0.6 3.3 0 sin 0 5 0 0.4
+	deformVertexes wave 30 sin 0 10 0 0.2
 	qer_trans 0.5
 	{
 		map textures/e7/e7rain.tga
@@ -195,20 +199,20 @@ textures/e7/e7rain
 }
 
 //dark redish sky
+
 textures/e7/e7sky_01
 {
 	qer_editorimage textures/e7/e7sky_01.tga
 	surfaceparm noimpact
 	surfaceparm nolightmap
-
-        q3map_sun .9 .9 1 65 65 68
+	q3map_sun .9 .9 1 65 65 68
 	q3map_surfacelight 150
 	skyparms - 512 -
-	{ 
-		map textures/e7/e7sky_01.tga 
-		rgbGen identity 
-		tcMod scroll 0.05 0.03 
-		tcMod scale 2 2 
+	{
+		map textures/e7/e7sky_01.tga
+		rgbGen identity
+		tcMod scroll 0.05 0.03
+		tcMod scale 2 2
 	}
 	{
 		map textures/e7/e7sky_02.tga
@@ -218,7 +222,9 @@ textures/e7/e7sky_01
 		tcMod scale 3 2
 	}
 }
+
 //jump pad 2
+
 textures/e7/e7sbrickfloor_jump
 {
 	qer_editorimage textures/e7/e7sbrickfloor_jump.tga
@@ -230,22 +236,23 @@ textures/e7/e7sbrickfloor_jump
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e7/e7sbrickfloor_jump_glow.tga
 		blendfunc add
-		rgbGen wave sin 0.5 0.8 0 1.5 
+		rgbGen wave sin 0.5 0.8 0 1.5
 	}
 }
 
 //small grate
+
 textures/e7/e7smgrate
 {
-    qer_editorimage textures/e7/e7smgrate.tga
+	qer_editorimage textures/e7/e7smgrate.tga
 	surfaceparm alphashadow
 	surfaceparm metalsteps
 	//surfaceparm trans
@@ -258,10 +265,10 @@ textures/e7/e7smgrate
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
-}
+}
\ No newline at end of file
diff --git a/data/scripts/el3dm1.shader b/data/scripts/el3dm1.shader
index c371a511c..13e278ade 100644
--- a/data/scripts/el3dm1.shader
+++ b/data/scripts/el3dm1.shader
@@ -2,17 +2,18 @@ textures/e8/e8weirdfx1
 {
 	{
 		map textures/e8/e8weirdfx1.tga
-		rgbGen wave sawtooth 0 1 2 3 
+		rgbGen wave sawtooth 0 1 2 3
 		tcMod turb 0 0.5 0 1
 		tcMod scroll 2 0
 	}
 	{
 		map textures/e8/e8weirdfx1.tga
 		blendfunc add
-		rgbGen wave noise 0 1 0 0.4 
+		rgbGen wave noise 0 1 0 0.4
 		tcMod scroll 1 2
 	}
 }
+
 textures/e8/e8blueglow
 {
 	qer_editorimage textures/e8/e8blueglow.tga
@@ -23,9 +24,9 @@ textures/e8/e8blueglow
 		map textures/e8/e8blueglow.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8blueglow.blend.tga
@@ -33,6 +34,7 @@ textures/e8/e8blueglow
 		//rgbGen Vertex
 	}
 }
+
 textures/e8/e8alphaspawn
 {
 	surfaceparm nomarks
@@ -44,6 +46,7 @@ textures/e8/e8alphaspawn
 		rgbGen Vertex
 	}
 }
+
 textures/e8/e8yarrow
 {
 	surfaceparm nomarks
@@ -55,6 +58,7 @@ textures/e8/e8yarrow
 		rgbGen Vertex
 	}
 }
+
 textures/e8/e8lightblue_flicker
 {
 	qer_editorimage textures/e8/e8tinylightblue.tga
@@ -64,58 +68,56 @@ textures/e8/e8lightblue_flicker
 		map textures/e8/e8tinylightblue.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8tinylightblue.blend.tga
 		blendfunc add
-		rgbGen wave noise 0 1 0 0.4 
+		rgbGen wave noise 0 1 0 0.4
 	}
 }
 
-
 //id shader modified..
+
 textures/e8/zap_e8
 {
-        qer_editorimage textures/sfx/zap_scroll.tga
+	qer_editorimage textures/sfx/zap_scroll.tga
 //q3map_surfacelight	300
-        surfaceparm	trans
+	surfaceparm	trans
 	surfaceparm nomarks
 	surfaceparm nolightmap
 	cull none
-	
 	{
 		Map textures/sfx/zap_scroll.tga
 		blendFunc GL_ONE GL_ONE
-                rgbgen wave triangle .8 2 0 7
-                tcMod scroll 0 1
-	}	
-        {
+		rgbgen wave triangle .8 2 0 7
+		tcMod scroll 0 1
+	}
+	{
 		Map textures/sfx/zap_scroll.tga
 		blendFunc GL_ONE GL_ONE
-                rgbgen wave triangle 1 1.4 0 5
-                tcMod scale  -1 1
-                tcMod scroll 0 1
-	}	
-        {
+		rgbgen wave triangle 1 1.4 0 5
+		tcMod scale  -1 1
+		tcMod scroll 0 1
+	}
+	{
 		Map textures/sfx/zap_scroll2.tga
 		blendFunc GL_ONE GL_ONE
-                rgbgen wave triangle 1 1.4 0 6.3
-                tcMod scale  -1 1
-                tcMod scroll 2 1
-	}	
-        {
+		rgbgen wave triangle 1 1.4 0 6.3
+		tcMod scale  -1 1
+		tcMod scroll 2 1
+	}
+	{
 		Map textures/sfx/zap_scroll2.tga
 		blendFunc GL_ONE GL_ONE
-                rgbgen wave triangle 1 1.4 0 7.7
-                tcMod scroll -1.3 1
-	}	
+		rgbgen wave triangle 1 1.4 0 7.7
+		tcMod scroll -1.3 1
+	}
 }
 //end id shader modify
 
-
 textures/e8/e8lighttrim_static
 {
 	qer_editorimage textures/e8/e8lighttrim.tga
@@ -126,15 +128,16 @@ textures/e8/e8lighttrim_static
 		map textures/e8/e8lighttrim.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8lighttrim.blend.tga
 		blendfunc add
 	}
 }
+
 textures/e8/e8lighttrim_glow
 {
 	qer_editorimage textures/e8/e8lighttrim.tga
@@ -145,9 +148,9 @@ textures/e8/e8lighttrim_glow
 		map textures/e8/e8lighttrim.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8lighttrim.blend.tga
@@ -166,9 +169,9 @@ textures/e8/e8lighttrim_b_static
 		map textures/e8/e8lighttrim_b.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8lighttrim_b.blend.tga
@@ -176,6 +179,7 @@ textures/e8/e8lighttrim_b_static
 		//rgbGen identity
 	}
 }
+
 textures/e8/e8lighttrim_b_glow
 {
 	qer_editorimage textures/e8/e8lighttrim_b.tga
@@ -186,9 +190,9 @@ textures/e8/e8lighttrim_b_glow
 		map textures/e8/e8lighttrim_b.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8lighttrim_b.blend.tga
@@ -196,6 +200,7 @@ textures/e8/e8lighttrim_b_glow
 		blendfunc add
 	}
 }
+
 textures/e8/e8jumpspawn02
 {
 	surfaceparm metalsteps
@@ -212,12 +217,13 @@ textures/e8/e8jumpspawn02
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
+
 textures/e8/e8jumpspawn02b
 {
 	surfaceparm metalsteps
@@ -234,12 +240,13 @@ textures/e8/e8jumpspawn02b
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
+
 textures/e8/e8jumpspawn02c
 {
 	surfaceparm metalsteps
@@ -256,12 +263,13 @@ textures/e8/e8jumpspawn02c
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
+
 textures/e8/e8jumpspawn02d
 {
 	surfaceparm metalsteps
@@ -278,10 +286,10 @@ textures/e8/e8jumpspawn02d
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -303,13 +311,13 @@ textures/e8/e8_launchpad1
 	{
 		map textures/e8/e8_launchpad1.blend.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 2 1 2 
+		rgbGen wave triangle 0.2 2 1 2
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -352,10 +360,10 @@ textures/e8/e8xgirder
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -370,13 +378,14 @@ textures/e8/e8xgirder_small
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
+
 textures/e8/e8xgirder_small2
 {
 	cull disable
@@ -387,13 +396,14 @@ textures/e8/e8xgirder_small2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
+
 textures/e8/e8mtltrim2
 {
 	surfaceparm alphashadow
@@ -407,10 +417,10 @@ textures/e8/e8mtltrim2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -428,10 +438,10 @@ textures/e8/e8wrntrim2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -449,10 +459,10 @@ textures/e8/e8mtltrim2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -471,10 +481,10 @@ textures/e8/e8bgrate01
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -491,13 +501,14 @@ textures/e8/e8rail
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
+
 textures/e8/e8rail2
 {
 	surfaceparm alphashadow
@@ -510,13 +521,14 @@ textures/e8/e8rail2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
+
 textures/e8/e8icon_red
 {
 	surfaceparm nolightmap
@@ -526,7 +538,7 @@ textures/e8/e8icon_red
 	{
 		map textures/e8/e8icon_red.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.2 
+		rgbGen wave triangle 0.2 0.5 0 0.2
 	}
 }
 
@@ -539,7 +551,7 @@ textures/e8/e8icon_blue
 	{
 		map textures/e8/e8icon_blue.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.2 
+		rgbGen wave triangle 0.2 0.5 0 0.2
 	}
 }
 
@@ -591,7 +603,7 @@ textures/e8/e8circle_red_fade
 	{
 		map textures/e8/e8circle_red_fade.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.5 
+		rgbGen wave triangle 0.2 0.5 0 0.5
 	}
 }
 
@@ -604,7 +616,7 @@ textures/e8/e8circle_blue_fade
 	{
 		map textures/e8/e8circle_blue_fade.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.5 
+		rgbGen wave triangle 0.2 0.5 0 0.5
 	}
 }
 
@@ -614,8 +626,8 @@ textures/e8/e8flag_red
 	surfaceparm nomarks
 	surfaceparm trans
 	cull disable
-	deformVertexes wave 30 sin 0 3 0 0.2 
-	deformVertexes wave 100 sin 0 3 0 0.7 
+	deformVertexes wave 30 sin 0 3 0 0.2
+	deformVertexes wave 100 sin 0 3 0 0.7
 	tessSize 64
 	{
 		map textures/e8/e8flag_red.tga
@@ -624,10 +636,10 @@ textures/e8/e8flag_red
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -638,8 +650,8 @@ textures/e8/e8flag_blue
 	surfaceparm nomarks
 	surfaceparm trans
 	cull disable
-	deformVertexes wave 30 sin 0 3 0 0.2 
-	deformVertexes wave 100 sin 0 3 0 0.7 
+	deformVertexes wave 30 sin 0 3 0 0.2
+	deformVertexes wave 100 sin 0 3 0 0.7
 	tessSize 64
 	{
 		map textures/e8/e8flag_blue.tga
@@ -648,10 +660,10 @@ textures/e8/e8flag_blue
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -671,10 +683,10 @@ textures/e8/e8spawn01b
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -683,9 +695,9 @@ textures/e8/e8trim_bluefx
 	q3map_lightimage textures/e8/e8trimfx_b.tga
 	q3map_surfacelight 100
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8trim_bluefx.tga
@@ -704,9 +716,9 @@ textures/e8/e8trim_redfx
 	q3map_lightimage textures/e8/e8trimfx_r.tga
 	q3map_surfacelight 100
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8trim_redfx.tga
@@ -742,15 +754,16 @@ textures/e8/e8tinylight
 		map textures/e8/e8tinylight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8tinylight.blend.tga
 		blendfunc add
 	}
 }
+
 textures/e8/e8tinylightblue
 {
 	qer_editorimage textures/e8/e8tinylightblue.tga
@@ -761,9 +774,9 @@ textures/e8/e8tinylightblue
 		map textures/e8/e8tinylightblue.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8tinylightblue.blend.tga
@@ -786,6 +799,7 @@ textures/e8/e8beam
 		tcMod scroll 0.3 0
 	}
 }
+
 textures/e8/e8beam_blue
 {
 	qer_editorimage textures/e8/e8beam_blue.tga
@@ -808,7 +822,7 @@ textures/e8/e8metal03c_shiney
 	{
 		map textures/effects/tinfx.tga
 		rgbGen identity
-		tcGen environment 
+		tcGen environment
 	}
 	{
 		map textures/e8/e8metal03c.tga
@@ -816,10 +830,10 @@ textures/e8/e8metal03c_shiney
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -831,8 +845,9 @@ textures/e8/ctf_e8stars
 	surfaceparm nomarks
 	q3map_surfacelight 10
 	q3map_sun 1 0.98 0.9 15 0 90
-	skyParms textures/e8/env/e8 - - 
+	skyParms textures/e8/env/e8 - -
 }
+
 textures/e8/dm_e8stars
 {
 	qer_editorimage textures/e8/e8stars.tga
@@ -841,7 +856,7 @@ textures/e8/dm_e8stars
 	surfaceparm nomarks
 	q3map_surfacelight 30
 	q3map_sun 1 0.98 0.9 55 0 90
-	skyParms textures/e8/env/e8 - - 
+	skyParms textures/e8/env/e8 - -
 }
 
 textures/e8/dm_e8stars2
@@ -852,7 +867,7 @@ textures/e8/dm_e8stars2
 	surfaceparm nomarks
 	q3map_surfacelight 70
 	q3map_sun 1 0.98 0.9 100 0 90
-	skyParms textures/e8/env/e8 - - 
+	skyParms textures/e8/env/e8 - -
 }
 
 textures/e8/e8metal_blue_shiney
@@ -861,7 +876,7 @@ textures/e8/e8metal_blue_shiney
 	{
 		map textures/effects/tinfx.tga
 		rgbGen identity
-		tcGen environment 
+		tcGen environment
 	}
 	{
 		map textures/e8/e8metal_blue.tga
@@ -869,10 +884,10 @@ textures/e8/e8metal_blue_shiney
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -882,7 +897,7 @@ textures/e8/e8metal_red_shiney
 	{
 		map textures/effects/tinfx.tga
 		rgbGen identity
-		tcGen environment 
+		tcGen environment
 	}
 	{
 		map textures/e8/e8metal_red.tga
@@ -890,22 +905,23 @@ textures/e8/e8metal_red_shiney
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
 //broken shader D:
+
 textures/e8/e8trimlight
 {
 	q3map_lightimage textures/e8/e8trimlight_fx.tga
 	q3map_surfacelight 100
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8trimlight.tga
@@ -918,6 +934,7 @@ textures/e8/e8trimlight
 		tcMod scroll -2 0
 	}
 }
+
 textures/e8/e8trimlight2
 {
 	qer_editorimage textures/e8/e8trimlight2.tga
@@ -928,9 +945,9 @@ textures/e8/e8trimlight2
 		map textures/e8/e8trimlight2.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/e8/e8trimlight2.blend.tga
diff --git a/data/scripts/evil3.shader b/data/scripts/evil3.shader
index e19368767..076c45ed1 100644
--- a/data/scripts/evil3.shader
+++ b/data/scripts/evil3.shader
@@ -1,29 +1,24 @@
-// Original shader created by Yves Allaire, 
-// for Evil's Texture Set 3.                
-//                                          
-// [+] http://www.planetquake.com/hfx/    
-//                                          //
-// Cleaned up and fixed by Gary Burgess.   
-//                                          //
-// [+] http://www.inaeo.co.uk/cnd/       
-//
+// Original shader created by Yves Allaire,
+// for Evil's Texture Set 3.
+// [+] http://www.planetquake.com/hfx/
+// Cleaned up and fixed by Gary Burgess.
+// [+] http://www.inaeo.co.uk/cnd/
 //NOTE FROM Yves: Please edit this .shader all you want, there might have some problems...
 //--------------------------------------------
-textures/evil_floors/mtl-wlkway 
+
+textures/evil_floors/mtl-wlkway
 {
 	surfaceparm metalsteps
 	surfaceparm trans
 	cull none
 	nopicmip
-
 	{
-		map textures/evil_floors/mtl-wlkway.tga 
+		map textures/evil_floors/mtl-wlkway.tga
 		blendFunc GL_ONE GL_ZERO
 		alphaFunc GE128
 		depthWrite
 		rgbGen identity
 	}
-
 	{
 		map $lightmap
 		rgbGen identity
@@ -34,20 +29,19 @@ textures/evil_floors/mtl-wlkway
 
 //-------------------------------------------------
 
-textures/evil_floors/mtl-wlkway_end 
+textures/evil_floors/mtl-wlkway_end
 {
 	surfaceparm metalsteps
 	surfaceparm trans
 	cull none
 	nopicmip
-
 	{
-		map textures/evil_floors/mtl-wlkway_end.tga 
+		map textures/evil_floors/mtl-wlkway_end.tga
 		blendFunc GL_ONE GL_ZERO
 		alphaFunc GE128
 		depthWrite
 		rgbGen identity
- 	}
+	}
 	{
 		map $lightmap
 		rgbGen identity
@@ -64,9 +58,8 @@ textures/evil_floors/mtl-wlkway_mid
 	surfaceparm trans
 	cull none
 	nopicmip
-
 	{
-		map textures/evil_floors/mtl-wlkway_mid.tga 
+		map textures/evil_floors/mtl-wlkway_mid.tga
 		blendFunc GL_ONE GL_ZERO
 		alphaFunc GE128
 		depthWrite
@@ -79,173 +72,168 @@ textures/evil_floors/mtl-wlkway_mid
 		depthFunc equal
 	}
 }
+
 //------------------------------------------
 
 textures/evil_floors/t-flr_oddtile_drty
-{        
-	{ 
+{
+	{
 		map textures/evil_floors/t-flr_oddtile_drty_glow.tga
-		tcMod turb 1 1 1 1 
-		tcmod scale 2 1 
-		tcmod scroll 1 2 
-		blendFunc GL_ONE GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil_floors/t-flr_oddtile_drty.tga 
-		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
+		tcMod turb 1 1 1 1
+		tcmod scale 2 1
+		tcmod scroll 1 2
+		blendFunc GL_ONE GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil_floors/t-flr_oddtile_drty.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
 }
 
 //-------------------------------------------------
 
 textures/evil_floors/cemtiledrk_mhbrk
-{        
-	{ 
-		map textures/evil_floors/cemtiledrk_mhbrk_glow.tga 
+{
+	{
+		map textures/evil_floors/cemtiledrk_mhbrk_glow.tga
 		tcMod turb 1.2 1 1.2 1
 		tcmod scale 0 0
-		tcmod scroll .1 .1 
-		blendFunc GL_ONE GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil_floors/cemtiledrk_mhbrk.tga 
-		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-}  
+		tcmod scroll .1 .1
+		blendFunc GL_ONE GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil_floors/cemtiledrk_mhbrk.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
 //-----------------------------------
 
 textures/evil_floors/grt_offmtl
-{ 
-	surfaceparm metalsteps 
-	surfaceparm alphashadow     
-	surfaceparm trans         
-	surfaceparm nonsolid 
-	cull none 
-
-	{ 
-		map textures/evil_floors/grt_offmtl.tga 
-		alphaFunc GE128 
-		depthWrite 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-		blendFunc filter 
-		depthFunc equal 
-	} 
-}  
+{
+	surfaceparm metalsteps
+	surfaceparm alphashadow
+	surfaceparm trans
+	surfaceparm nonsolid
+	cull none
+	{
+		map textures/evil_floors/grt_offmtl.tga
+		alphaFunc GE128
+		depthWrite
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		blendFunc filter
+		depthFunc equal
+	}
+}
 //-------------------------------------------
 
 textures/evil_floors/grtmtl_offt
-{ 
-	surfaceparm metalsteps 
-	surfaceparm alphashadow     
-	surfaceparm trans         
-	surfaceparm nonsolid 
-	cull none 
-
-	{ 
-		map textures/evil_floors/grtmtl_offt.tga 
-		alphaFunc GE128 
-		depthWrite 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-		blendFunc filter 
-		depthFunc equal 
-	} 
-}  
+{
+	surfaceparm metalsteps
+	surfaceparm alphashadow
+	surfaceparm trans
+	surfaceparm nonsolid
+	cull none
+	{
+		map textures/evil_floors/grtmtl_offt.tga
+		alphaFunc GE128
+		depthWrite
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		blendFunc filter
+		depthFunc equal
+	}
+}
 
 //------------------------------------------
 
 textures/evil_floors/grtmtl_offt2
-{ 
-	surfaceparm metalsteps 
-	surfaceparm alphashadow     
-	surfaceparm trans         
-	surfaceparm nonsolid 
-	cull none 
-
-	{ 
-		map textures/evil_floors/grtmtl_offt2.tga 
-		alphaFunc GE128 
-		depthWrite 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-		blendFunc filter 
-		depthFunc equal 
-	} 
-}  
+{
+	surfaceparm metalsteps
+	surfaceparm alphashadow
+	surfaceparm trans
+	surfaceparm nonsolid
+	cull none
+	{
+		map textures/evil_floors/grtmtl_offt2.tga
+		alphaFunc GE128
+		depthWrite
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		blendFunc filter
+		depthFunc equal
+	}
+}
 
 //----------------------------------------------
 
 textures/evil_lights/rlight_a
-{ 
-	qer_editorimage textures/evil_lights/rlight_a.tga 
-	surfaceparm nomarks 
-	q3map_surfacelight 1500 
-
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil_lights/rlight_a.tga 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
+{
+	qer_editorimage textures/evil_lights/rlight_a.tga
+	surfaceparm nomarks
+	q3map_surfacelight 1500
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil_lights/rlight_a.tga
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
 		map textures/evil_lights/rlight_a_blend.tga
-		rgbGen wave sin 0.5 0.5 1 1 
-		blendFunc GL_ONE GL_ONE 
-	} 
+		rgbGen wave sin 0.5 0.5 1 1
+		blendFunc GL_ONE GL_ONE
+	}
 }
 
 //--------------------------------------------
 
 textures/evil_misc/rstbouncefan
-{        
-	cull disable 
-	surfaceparm trans     
-	surfaceparm nolightmap 
-	sort 5 
-
-	{ 
-		clampmap textures/sfx/fan3bladeb.tga 
-		blendFunc blend 
-		tcmod rotate 999 
-            rgbGen identity 
-	} 
-	{ 
-		map textures/evil_misc/rstbouncefan.tga 
-		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-}
-
-//
\ No newline at end of file
+{
+	cull disable
+	surfaceparm trans
+	surfaceparm nolightmap
+	sort 5
+	{
+		clampmap textures/sfx/fan3bladeb.tga
+		blendFunc blend
+		tcmod rotate 999
+		rgbGen identity
+	}
+	{
+		map textures/evil_misc/rstbouncefan.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
\ No newline at end of file
diff --git a/data/scripts/evil4_techtrims.shader b/data/scripts/evil4_techtrims.shader
index 31955e6ad..3d1f4340a 100644
--- a/data/scripts/evil4_techtrims.shader
+++ b/data/scripts/evil4_techtrims.shader
@@ -1,289 +1,286 @@
-// tech floors 
-textures/evil4_techfloors/tfloor3_huge 
-{ 	 
-	cull none    
-	{ 
-		map textures/evil4_techfloors/tfloor3_huge.tga 
-		tcMod scale 2.0 2.0 
-		blendFunc GL_ONE GL_ZERO 
-		alphaFunc GE128 
-		depthWrite 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		depthFunc equal 
-		rgbGen identity 
-	} 
-} 
-textures/evil4_techfloors/tfloor_rndholes 
-{        
-         
-        { 
-		map textures/evil4_techfloors/tfloor_rndholes.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
-textures/evil4_techfloors/tfloor_rndholes_drty 
-{        
-         
-        { 
-		map textures/evil4_techfloors/tfloor_rndholes_drty.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
+// tech floors
+
+textures/evil4_techfloors/tfloor3_huge
+{
+	cull none
+	{
+		map textures/evil4_techfloors/tfloor3_huge.tga
+		tcMod scale 2.0 2.0
+		blendFunc GL_ONE GL_ZERO
+		alphaFunc GE128
+		depthWrite
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ZERO
+		depthFunc equal
+		rgbGen identity
+	}
+}
+
+textures/evil4_techfloors/tfloor_rndholes
+{
+	{
+		map textures/evil4_techfloors/tfloor_rndholes.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
+textures/evil4_techfloors/tfloor_rndholes_drty
+{
+	{
+		map textures/evil4_techfloors/tfloor_rndholes_drty.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
 //********************************************
 //********************************************
 //********************************************
 //**************evil metals section**************
 //********************************************
 //********************************************
-//******************************************** 
-textures/evil4_metals/mtlsportal 
-{  
-	  cull disable	 
-        surfaceparm nomarks 
-        surfaceparm trans 
-        sort additive	  
-        { 
-	        clampmap textures/evil4_metals/mtlsportal_fx1.tga  
-		blendFunc add   
-                tcmod rotate -100 
-                rgbGen identity 
-        } 
-        { 
-	         
-	        clampmap textures/evil4_metals/mtlsportal_fx2.tga 
-		blendFunc add  
-                tcmod rotate 100   
-                rgbGen identity 
-	}
-        { 
-	         
-	        clampmap textures/evil4_metals/mtlsportal_fx3.tga 
-		blendFunc add   
-                tcmod rotate 10   
-                rgbGen identity 
-	}
- 
-        { 
-	        clampmap textures/evil4_metals/mtlsportal.tga 
-		alphaFunc GE128 
-                depthWrite 
-	        rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-		rgbGen identity 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		depthFunc equal 
-	}       
+//********************************************
+
+textures/evil4_metals/mtlsportal
+{
+	cull disable
+	surfaceparm nomarks
+	surfaceparm trans
+	sort additive
+	{
+		clampmap textures/evil4_metals/mtlsportal_fx1.tga
+		blendFunc add
+		tcmod rotate -100
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_metals/mtlsportal_fx2.tga
+		blendFunc add
+		tcmod rotate 100
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_metals/mtlsportal_fx3.tga
+		blendFunc add
+		tcmod rotate 10
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_metals/mtlsportal.tga
+		alphaFunc GE128
+		depthWrite
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		blendFunc GL_DST_COLOR GL_ZERO
+		depthFunc equal
+	}
 }
-textures/evil4_metals/flrgrate 
-{        
-          
-        { 
-		map textures/evil4_metals/flrgrate.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-}  
+
+textures/evil4_metals/flrgrate
+{
+	{
+		map textures/evil4_metals/flrgrate.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
 textures/evil4_metals/mtlflrslots
-{        
-         
-        { 
-		map textures/evil4_metals/mtlflrslots.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
+{
+	{
+		map textures/evil4_metals/mtlflrslots.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
 }
 
-textures/evil4_metals/drkmtl_grlpltmech 
+textures/evil4_metals/drkmtl_grlpltmech
 {
 	{
-		map textures/evil4_metals/drkmtl_grlpltmech.tga 
-		//blendfunc blend  
-		rgbGen identity 
+		map textures/evil4_metals/drkmtl_grlpltmech.tga
+		//blendfunc blend
+		rgbGen identity
 	}
 	{
-		map textures/evil4_metals/drkmtl_grlpltmech_fx2.tga 
-		blendfunc add 
-		tcmod scroll 0 -3          
- 
+		map textures/evil4_metals/drkmtl_grlpltmech_fx2.tga
+		blendfunc add
+		tcmod scroll 0 -3
 	}
 	{
-		map textures/evil4_metals/drkmtl_grlpltmech_fx.tga 
-		blendfunc add 
-		tcmod scroll 0 1.6            
- 
+		map textures/evil4_metals/drkmtl_grlpltmech_fx.tga
+		blendfunc add
+		tcmod scroll 0 1.6
 	}
 	{
-		map textures/evil4_metals/drkmtl_grlpltmech_fx.tga 
-		blendfunc add 
-		tcmod scroll 0 -5            
- 
+		map textures/evil4_metals/drkmtl_grlpltmech_fx.tga
+		blendfunc add
+		tcmod scroll 0 -5
 	}
-{
-		map textures/evil4_metals/drkmtl_grlpltmech_fx.tga 
-		blendfunc add 
-		rgbgen wave sin 1.1 .1 1 1     
-       		tcmod scroll 0  2.8     
-
-  }
 	{
-		map textures/evil4_metals/drkmtl_grlpltmech.tga 
-		blendfunc blend  
-		rgbGen identity 
-	}	
-	
+		map textures/evil4_metals/drkmtl_grlpltmech_fx.tga
+		blendfunc add
+		rgbgen wave sin 1.1 .1 1 1
+		tcmod scroll 0  2.8
+	}
+	{
+		map textures/evil4_metals/drkmtl_grlpltmech.tga
+		blendfunc blend
+		rgbGen identity
+	}
 	{
-		map $lightmap 
-		rgbGen identity 
-		blendfunc filter 
+		map $lightmap
+		rgbGen identity
+		blendfunc filter
 	}
 }
+
 textures/evil4_metals/mtlbrushed
-{    
-qer_editorimage textures/evil4_metals/mtlbrushed.tga 
-        { 
-                map textures/evil4_metals/mtlbrushed_env.tga       
-                tcGen environment 
-                rgbGen identity 
-	}    
-        { 
-		map textures/evil4_metals/mtlbrushed.tga 
-                blendFunc gl_dst_color gl_zero 
-		rgbGen identity 
-	}  
-        { 
-		map $lightmap 
-       		blendfunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA 
-		rgbGen identity 
-	} 
-} 
+{
+	qer_editorimage textures/evil4_metals/mtlbrushed.tga
+	{
+		map textures/evil4_metals/mtlbrushed_env.tga
+		tcGen environment
+		rgbGen identity
+	}
+	{
+		map textures/evil4_metals/mtlbrushed.tga
+		blendFunc gl_dst_color gl_zero
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA
+		rgbGen identity
+	}
+}
+
 textures/evil4_metals/eshinytin
-{    
-qer_editorimage textures/evil4_metals/eshinytin.tga 
-        { 
-                map textures/effects/tinfx.jpg  
-                tcGen environment 
-		rgbGen identity 
-                tcmod scale 0.55 1 
-	}   
-      { 
-		map $lightmap 
-       		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_metals/eshinytin.tga 
-		blendFunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-       		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
+{
+	qer_editorimage textures/evil4_metals/eshinytin.tga
+	{
+		map textures/effects/tinfx.jpg
+		tcGen environment
+		rgbGen identity
+		tcmod scale 0.55 1
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+	{
+		map textures/evil4_metals/eshinytin.tga
+		blendFunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
 }
-textures/evil4_metals/mtlpanel_wrnstripe_ow2         
-{         
-        { 
-		map textures/evil4_metals/mtlpnl_wrnstrpow2_glow.tga 
-       		rgbGen wave sin 0.5 0.5 0 1  
-		blendfunc GL_ONE GL_ONE   
-	} 
-        { 
-		map textures/evil4_metals/mtlpnl_wrnstrpow2_glow.tga 
-       		//rgbGen wave sin 0.5 0.5 0 1  
-		blendfunc GL_ONE GL_ONE   
-	}
-        { 
-		map textures/evil4_metals/mtlpanel_wrnstripe_ow2.tga 
-       		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-
-        { 
-		map $lightmap 
-       		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
+
+textures/evil4_metals/mtlpanel_wrnstripe_ow2
+{
+	{
+		map textures/evil4_metals/mtlpnl_wrnstrpow2_glow.tga
+		rgbGen wave sin 0.5 0.5 0 1
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_metals/mtlpnl_wrnstrpow2_glow.tga
+		//rgbGen wave sin 0.5 0.5 0 1
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_metals/mtlpanel_wrnstripe_ow2.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
 }
-//
+
 textures/evil4_metals/mtltekfloor
-{ 
-	 
-	q3map_surfacelight 100 
-	q3map_lightimage textures/evil4_metal/mtltekfloor_fx.tga     
-	{ 
-		map textures/base_wall/chrome_env.tga  
-	        rgbGen identity 
-		tcGen environment 
-		tcmod scale .25 .25 
-	} 
-	 
-	{ 
-		map textures/evil4_metals/mtltekfloor.tga  
-		blendFunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA	 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc gl_dst_color gl_zero 
-		rgbGen identity 
-	}     
-	{ 
-		map textures/evil4_metals/mtltekfloor_fx.tga 
-		blendFunc GL_ONE GL_ONE 
-		rgbGen wave sin 0.5 0.5 0 .2 
-	} 
-	{ 
-		map textures/evil4_metals/mtltekfloor_fx2.tga 
-		blendFunc GL_ONE GL_ONE 
-		//rgbGen wave sin 0.5 0.5 0 .2 
-	} 
-} 
-textures/evil4_metals/wrnjumppad 
-{ 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_metals/wrnjumppad.tga 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_metals/wrnjumppad_glow.tga 
-		rgbGen wave sin 0.5 0.5 1 1 
-		blendfunc GL_ONE GL_ONE 
-	} 
-}  
+{
+	q3map_surfacelight 100
+	q3map_lightimage textures/evil4_metal/mtltekfloor_fx.tga
+	{
+		map textures/base_wall/chrome_env.tga
+		rgbGen identity
+		tcGen environment
+		tcmod scale .25 .25
+	}
+	{
+		map textures/evil4_metals/mtltekfloor.tga
+		blendFunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc gl_dst_color gl_zero
+		rgbGen identity
+	}
+	{
+		map textures/evil4_metals/mtltekfloor_fx.tga
+		blendFunc GL_ONE GL_ONE
+		rgbGen wave sin 0.5 0.5 0 .2
+	}
+	{
+		map textures/evil4_metals/mtltekfloor_fx2.tga
+		blendFunc GL_ONE GL_ONE
+		//rgbGen wave sin 0.5 0.5 0 .2
+	}
+}
+
+textures/evil4_metals/wrnjumppad
+{
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_metals/wrnjumppad.tga
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_metals/wrnjumppad_glow.tga
+		rgbGen wave sin 0.5 0.5 1 1
+		blendfunc GL_ONE GL_ONE
+	}
+}
+
 //********************************************
 //********************************************
 //********************************************
@@ -291,26 +288,27 @@ textures/evil4_metals/wrnjumppad
 //********************************************
 //********************************************
 //********************************************
+
 textures/evil4_wall/tekwallmulti2
+{
+	{
+		map textures/base_wall/chrome_env.tga
+		rgbGen identity
+		tcGen environment
+		tcmod scale .25 .25
+	}
 	{
-{ 
-		map textures/base_wall/chrome_env.tga  
-	        rgbGen identity 
-		tcGen environment 
-		tcmod scale .25 .25 
-	} 
-	 
-	{ 
-		map textures/evil4_wall/tekwallmulti2.tga  
-		blendFunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA	 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc gl_dst_color gl_zero 
-		rgbGen identity 
-	}     
-} 
+		map textures/evil4_wall/tekwallmulti2.tga
+		blendFunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc gl_dst_color gl_zero
+		rgbGen identity
+	}
+}
+
 //********************************************
 //********************************************
 //********************************************
@@ -318,286 +316,292 @@ textures/evil4_wall/tekwallmulti2
 //********************************************
 //********************************************
 //********************************************
-textures/evil4_lights/steplight 
-{ 
-	surfaceparm nomarks 
-	q3map_surfacelight 1000 
-	//light1 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/steplight.tga  
-		blendFunc GL_DST_COLOR GL_ZERO  
-		rgbGen identity  
-	}  
-	{ 
-		map textures/evil4_lights/steplight_glow.tga  
-		blendfunc GL_ONE GL_ONE  
-	} 
-} 
+
+textures/evil4_lights/steplight
+{
+	surfaceparm nomarks
+	q3map_surfacelight 1000
+	//light1
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/steplight.tga
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/steplight_glow.tga
+		blendfunc GL_ONE GL_ONE
+	}
+}
+
 textures/evil4_lights/drkmtlsupport_light
-{ 
-	surfaceparm nomarks 
-	q3map_surfacelight 1000 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/drkmtlsupport_light.tga 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/drkmtlsupport_light_glow.tga 
-		rgbGen wave sin 0.5 0.5 1 .5   
-		blendfunc GL_ONE GL_ONE 
-	} 
-
-}   
+{
+	surfaceparm nomarks
+	q3map_surfacelight 1000
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/drkmtlsupport_light.tga
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/drkmtlsupport_light_glow.tga
+		rgbGen wave sin 0.5 0.5 1 .5
+		blendfunc GL_ONE GL_ONE
+	}
+}
+
 textures/evil4_lights/s_light
-{ 
-	qer_editorimage textures/evil4_lights/s_light.jpg 
-	surfaceparm nomarks 
-	q3map_surfacelight 1500 
-	{ 
-		map textures/evil4_lights/s_light.jpg 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/s_light_blend.jpg 
-		rgbGen wave sin 0.5 0.5 1 1 
-		blendFunc GL_ONE GL_ONE 
-	} 
-	{ 
-		map $lightmap 
-		rgbGen identity 
+{
+	qer_editorimage textures/evil4_lights/s_light.jpg
+	surfaceparm nomarks
+	q3map_surfacelight 1500
+	{
+		map textures/evil4_lights/s_light.jpg
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/s_light_blend.jpg
+		rgbGen wave sin 0.5 0.5 1 1
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map $lightmap
+		rgbGen identity
 		blendFunc Filter
-	} 
-} 
-textures/evil4_lights/t_mtllight 
-{ 
-	surfaceparm nomarks 
-	q3map_surfacelight 1000 
-	//light1 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/t_mtllight.jpg 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/t_mtllight_blend.jpg 
-		//rgbGen wave sin 0.5 0.5 1 1 
-		blendfunc GL_ONE GL_ONE 
-	} 
-} 
+	}
+}
+
+textures/evil4_lights/t_mtllight
+{
+	surfaceparm nomarks
+	q3map_surfacelight 1000
+	//light1
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/t_mtllight.jpg
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/t_mtllight_blend.jpg
+		//rgbGen wave sin 0.5 0.5 1 1
+		blendfunc GL_ONE GL_ONE
+	}
+}
+
 textures/evil4_lights/mtl_lightsmll
-{ 
-	surfaceparm nomarks 
-	q3map_surfacelight 1000 
-	//light1 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/mtl_lightsmll.jpg 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/mtl_lightsmll_blend.jpg 
-		rgbGen wave sin 0.5 0.5 1 1 
-		blendfunc GL_ONE GL_ONE 
-	} 
+{
+	surfaceparm nomarks
+	q3map_surfacelight 1000
+	//light1
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/mtl_lightsmll.jpg
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/mtl_lightsmll_blend.jpg
+		rgbGen wave sin 0.5 0.5 1 1
+		blendfunc GL_ONE GL_ONE
+	}
 }
+
 //double glowing effect light strips
+
 textures/evil4_lights/l_light_b
-{ 
-	q3map_surfacelight 5000	 
-        q3map_lightimage textures/evil4_lights/l_light_b.jpg 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	}  
-	{ 
-		map textures/evil4_lights/l_light_b.jpg 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-}
-	{ 
-		map textures/evil4_lights/l_light_b_blend.jpg  
-		blendfunc GL_ONE GL_ONE 
+{
+	q3map_surfacelight 5000
+	q3map_lightimage textures/evil4_lights/l_light_b.jpg
+	{
+		map $lightmap
+		rgbGen identity
 	}
-{ 
-		map textures/evil4_lights/l_light_b_blend.jpg 
-		rgbGen wave sin 6 2 1 2 
-		blendfunc GL_ONE GL_ONE 
+	{
+		map textures/evil4_lights/l_light_b.jpg
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/l_light_b_blend.jpg
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_lights/l_light_b_blend.jpg
+		rgbGen wave sin 6 2 1 2
+		blendfunc GL_ONE GL_ONE
 	}
-} 
-textures/evil4_lights/l_light_g
-{ 
-	q3map_surfacelight 5000	 
-        q3map_lightimage textures/evil4_lights/l_light_g.jpg 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	}  
-	{ 
-		map textures/evil4_lights/l_light_g.jpg 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
 }
-	{ 
-		map textures/evil4_lights/l_light_g_blend.jpg  
-		blendfunc GL_ONE GL_ONE 
+
+textures/evil4_lights/l_light_g
+{
+	q3map_surfacelight 5000
+	q3map_lightimage textures/evil4_lights/l_light_g.jpg
+	{
+		map $lightmap
+		rgbGen identity
 	}
-{ 
-		map textures/evil4_lights/l_light_g_blend.jpg 
-		rgbGen wave sin 6 2 1 2 
-		blendfunc GL_ONE GL_ONE 
+	{
+		map textures/evil4_lights/l_light_g.jpg
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/l_light_g_blend.jpg
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_lights/l_light_g_blend.jpg
+		rgbGen wave sin 6 2 1 2
+		blendfunc GL_ONE GL_ONE
 	}
-} 
-textures/evil4_lights/l_light_r
-{ 
-	q3map_surfacelight 5000	 
-        q3map_lightimage textures/evil4_lights/l_light_r.jpg 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	}  
-	{ 
-		map textures/evil4_lights/l_light_r.jpg 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
 }
-	{ 
-		map textures/evil4_lights/l_light_r_blend.jpg  
-		blendfunc GL_ONE GL_ONE 
+
+textures/evil4_lights/l_light_r
+{
+	q3map_surfacelight 5000
+	q3map_lightimage textures/evil4_lights/l_light_r.jpg
+	{
+		map $lightmap
+		rgbGen identity
 	}
-{ 
-		map textures/evil4_lights/l_light_r_blend.jpg 
-		rgbGen wave sin 6 2 1 2 
-		blendfunc GL_ONE GL_ONE 
+	{
+		map textures/evil4_lights/l_light_r.jpg
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
 	}
-} 
+	{
+		map textures/evil4_lights/l_light_r_blend.jpg
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_lights/l_light_r_blend.jpg
+		rgbGen wave sin 6 2 1 2
+		blendfunc GL_ONE GL_ONE
+	}
+}
+
 textures/evil4_lights/l_light_w
-{ 
-	q3map_surfacelight 5000	 
-        q3map_lightimage textures/evil4_lights/l_light_w.jpg 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	}  
-	{ 
-		map textures/evil4_lights/l_light_w.jpg 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
+{
+	q3map_surfacelight 5000
+	q3map_lightimage textures/evil4_lights/l_light_w.jpg
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/l_light_w.jpg
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/l_light_w_blend.jpg
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_lights/l_light_w_blend.jpg
+		rgbGen wave sin 6 2 1 2
+		blendfunc GL_ONE GL_ONE
+	}
 }
-	{ 
-		map textures/evil4_lights/l_light_w_blend.jpg  
-		blendfunc GL_ONE GL_ONE 
-	}
-{ 
-		map textures/evil4_lights/l_light_w_blend.jpg 
-		rgbGen wave sin 6 2 1 2 
-		blendfunc GL_ONE GL_ONE 
-	}
-} 
-//
-textures/evil4_lights/mtl_l1 
+
+textures/evil4_lights/mtl_l1
 {
-	q3map_surfacelight 1000	 
-        q3map_lightimage textures/evil4_lights/mtl_l1.tga 
+	q3map_surfacelight 1000
+	q3map_lightimage textures/evil4_lights/mtl_l1.tga
 	{
-		map textures/evil4_lights/mtl_l1_fx.tga 
-		//blendfunc add 
-       tcmod scale 12 1  
-		rgbGen identity 
-		tcMod scroll 0 1 
-        
+		map textures/evil4_lights/mtl_l1_fx.tga
+		//blendfunc add
+		tcmod scale 12 1
+		rgbGen identity
+		tcMod scroll 0 1
 	}
 	{
-		map textures/evil4_lights/mtl_l1_fx.tga 
-		blendfunc add 
-       //tcmod scale 25 1   
-		rgbGen identity 
-		tcMod scroll 1 0 
-        
+		map textures/evil4_lights/mtl_l1_fx.tga
+		blendfunc add
+		//tcmod scale 25 1
+		rgbGen identity
+		tcMod scroll 1 0
 	}
 	{
-		map textures/evil4_lights/mtl_l1.tga 
-		blendfunc blend  
-		rgbGen identity 
+		map textures/evil4_lights/mtl_l1.tga
+		blendfunc blend
+		rgbGen identity
 	}
 	{
-		map textures/evil4_lights/mtl_l1_fx2.tga 
-		blendfunc add 
-       tcmod scale 1 1  
+		map textures/evil4_lights/mtl_l1_fx2.tga
+		blendfunc add
+		tcmod scale 1 1
 	}
 	{
-		map $lightmap 
-		rgbGen identity 
-		blendfunc filter 
+		map $lightmap
+		rgbGen identity
+		blendfunc filter
 	}
-} 
+}
+
 //border light
+
 textures/evil4_lights/trimtl_grlbtm_light
-{ 
-	q3map_surfacelight 5000 
-	q3map_lightimage textures/evil4_lights/trimtl_grlbtm_light_blnd.tga 
-	qer_editorimage textures/evil4_lights/trimtl_grlbtm_light.tga  
-	 
-	{ 
-		map textures/evil4_lights/trimtl_grlbtm_light.tga 
-		rgbGen identity 
-	} 
-	 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-		blendfunc gl_dst_color gl_zero 
-	}   
-	{ 
-		map textures/evil4_lights/trimtl_grlbtm_light_blnd.tga 
-		blendfunc gl_one gl_one 
-		rgbgen wave sin 1 .1 0 1 
-	}       
-	 
-}
-textures/evil4_lights/s_bluelight 
-{ 
-	q3map_surfacelight 1000	 
-        q3map_lightimage textures/evil4_lights/s_bluelight.tga 
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_lights/s_bluelight.tga 
-		rgbGen identity 
-		blendFunc GL_DST_COLOR GL_ZERO 
-	} 
-	{ 
-		map textures/evil4_lights/s_bluelight_glow.tga 
-       rgbGen wave sin 0.5 0.5 0 .2  
-       blendfunc add 
-
-	} 
-      { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
+{
+	q3map_surfacelight 5000
+	q3map_lightimage textures/evil4_lights/trimtl_grlbtm_light_blnd.tga
+	qer_editorimage textures/evil4_lights/trimtl_grlbtm_light.tga
+	{
+		map textures/evil4_lights/trimtl_grlbtm_light.tga
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		blendfunc gl_dst_color gl_zero
 	}
+	{
+		map textures/evil4_lights/trimtl_grlbtm_light_blnd.tga
+		blendfunc gl_one gl_one
+		rgbgen wave sin 1 .1 0 1
+	}
+}
 
+textures/evil4_lights/s_bluelight
+{
+	q3map_surfacelight 1000
+	q3map_lightimage textures/evil4_lights/s_bluelight.tga
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_lights/s_bluelight.tga
+		rgbGen identity
+		blendFunc GL_DST_COLOR GL_ZERO
+	}
+	{
+		map textures/evil4_lights/s_bluelight_glow.tga
+		rgbGen wave sin 0.5 0.5 0 .2
+		blendfunc add
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
 }
+
 //********************************************
 //********************************************
 //********************************************
@@ -605,242 +609,235 @@ textures/evil4_lights/s_bluelight
 //********************************************
 //********************************************
 //********************************************
-//
 
 // portal
+
 textures/evil4_fx/mtlportal_fx
-{  
+{
 	qer_editorimage textures/evil4_fx/mtlportal.tga
-	cull disable	 
-        surfaceparm nomarks 
-        surfaceparm trans 
-        sort additive	  
-        { 
-	        clampmap textures/evil4_fx/mtlportal_fx1.tga  
-		blendFunc add   
-                tcmod rotate -100 
-                rgbGen identity 
-        } 
-        { 
-	         
-	        clampmap textures/evil4_fx/mtlportal_fx2.tga 
-		blendFunc add  
-                tcmod rotate 100   
-                rgbGen identity 
-	}
- 
-        { 
-	        clampmap textures/evil4_fx/mtlportal.tga 
-		alphaFunc GE128 
-                depthWrite 
-	        rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-		rgbGen identity 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		depthFunc equal 
-	}       
-} 
+	cull disable
+	surfaceparm nomarks
+	surfaceparm trans
+	sort additive
+	{
+		clampmap textures/evil4_fx/mtlportal_fx1.tga
+		blendFunc add
+		tcmod rotate -100
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_fx/mtlportal_fx2.tga
+		blendFunc add
+		tcmod rotate 100
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_fx/mtlportal.tga
+		alphaFunc GE128
+		depthWrite
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		blendFunc GL_DST_COLOR GL_ZERO
+		depthFunc equal
+	}
+}
+
 //matrixy transparent display images
-textures/evil4_fx/mat1 
+
+textures/evil4_fx/mat1
 {
 	{
-		map textures/evil4_fx/mat1.tga 
-		blendfunc GL_ONE GL_ONE 
-		rgbGen identity 
-		rgbGen wave sin 0.5 0.5 0 0.7   
-        
+		map textures/evil4_fx/mat1.tga
+		blendfunc GL_ONE GL_ONE
+		rgbGen identity
+		rgbGen wave sin 0.5 0.5 0 0.7
 	}
 	{
-		map textures/evil4_fx/mat2.tga 
-		blendfunc GL_ONE GL_ONE 
-       		rgbGen identity
-      		rgbGen wave sin 0.5 0.5 0 .2  
+		map textures/evil4_fx/mat2.tga
+		blendfunc GL_ONE GL_ONE
+		rgbGen identity
+		rgbGen wave sin 0.5 0.5 0 .2
 	}
 	{
-		map textures/evil4_fx/mat3.tga 
-		blendfunc GL_ONE GL_ONE 
-		rgbGen identity 
-		tcMod scroll 0 -.1 
-        
+		map textures/evil4_fx/mat3.tga
+		blendfunc GL_ONE GL_ONE
+		rgbGen identity
+		tcMod scroll 0 -.1
 	}
 	{
-		map textures/evil4_fx/mat4.tga 
-		blendfunc GL_ONE GL_ONE  
-		rgbGen identity 
-		tcMod scroll 0 2  
-        
+		map textures/evil4_fx/mat4.tga
+		blendfunc GL_ONE GL_ONE
+		rgbGen identity
+		tcMod scroll 0 2
 	}
 	{
-		map $lightmap 
-		rgbGen identity 
-		blendfunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA	 
+		map $lightmap
+		rgbGen identity
+		blendfunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA
 	}
 }
+
 textures/evil4_fx/b_ray
 {
-      		q3map_surfacelight 200
-      		surfaceparm trans
-      		surfaceparm nonsolid
-		surfaceparm nomarks
-		surfaceparm nolightmap
-		q3map_lightimage textures/evil4_fx/b_ray.tga 
-
-		cull none
-	
+	q3map_surfacelight 200
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nomarks
+	surfaceparm nolightmap
+	q3map_lightimage textures/evil4_fx/b_ray.tga
+	cull none
 	{
-		map textures/evil4_fx/b_ray.tga 
+		map textures/evil4_fx/b_ray.tga
 		blendFunc GL_ONE GL_ONE
 		rgbgen wave triangle 1 9 1 1
-		tcMod scale  0 0 
+		tcMod scale  0 0
 		tcMod scroll 1 0
-	}	
+	}
 	{
-		map textures/evil4_fx/b_ray.tga 
+		map textures/evil4_fx/b_ray.tga
 		blendFunc GL_ONE GL_ONE
 		rgbgen wave triangle 1 1 1 1
 		tcMod scale  1 1
 		tcMod scroll 1 0
-	}	
+	}
 }
 
 //effect2
+
 textures/evil4_fx/b_rayc
 {
-		q3map_surfacelight 200
-		surfaceparm trans
-		surfaceparm nonsolid
-		surfaceparm nomarks
-		surfaceparm nolightmap
-		q3map_lightimage textures/evil4_fx/b_rayc.tga 
-
-		cull none
-	
+	q3map_surfacelight 200
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nomarks
+	surfaceparm nolightmap
+	q3map_lightimage textures/evil4_fx/b_rayc.tga
+	cull none
 	{
-		map textures/evil4_fx/b_rayc.tga 
+		map textures/evil4_fx/b_rayc.tga
 		blendFunc GL_ONE GL_ONE
 		rgbgen wave triangle 1 9 1 1
-		tcMod scale  0 0 
+		tcMod scale  0 0
 		tcMod scroll 2 0
-	}	
+	}
 	{
-		map textures/evil4_fx/b_rayc.tga 
+		map textures/evil4_fx/b_rayc.tga
 		blendFunc GL_ONE GL_ONE
 		rgbgen wave triangle 1 1 1 1
 		tcMod scale  1 1
 		tcMod scroll 2 0
-	}	
-        
-} 
+	}
+}
+
 //snow
+
 textures/evil4_fx/esnow
 {
-		q3map_surfacelight 100 
-		surfaceparm trans 
-		surfaceparm nonsolid 
-		surfaceparm nomarks 
-		surfaceparm nolightmap 
-		q3map_lightimage textures/evil4fx/esnow.tga 
-   		cull none 
-	
-	{
-		map textures/evil4_fx/esnow.tga 
-		blendFunc GL_ONE GL_ONE 
-		tcMod scroll 0 -0.9 
-	}	
-	{
-		map textures/evil4_fx/esnow3.tga 
-		blendFunc GL_ONE GL_ONE 
-		tcMod scroll 0 -0.7  
-	}	
-	{
-		map textures/evil4_fx/esnow2.tga 
-		blendFunc GL_ONE GL_ONE 
-		tcMod scroll 0 -0.5  
-	} 
-	{
-		map textures/evil4_fx/esnow2.tga 
-		blendFunc GL_ONE GL_ONE 
-		tcMod scale  2 2  
-		tcMod scroll 0 -3   
-	}
-        
+	q3map_surfacelight 100
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nomarks
+	surfaceparm nolightmap
+	q3map_lightimage textures/evil4fx/esnow.tga
+	cull none
+	{
+		map textures/evil4_fx/esnow.tga
+		blendFunc GL_ONE GL_ONE
+		tcMod scroll 0 -0.9
+	}
+	{
+		map textures/evil4_fx/esnow3.tga
+		blendFunc GL_ONE GL_ONE
+		tcMod scroll 0 -0.7
+	}
+	{
+		map textures/evil4_fx/esnow2.tga
+		blendFunc GL_ONE GL_ONE
+		tcMod scroll 0 -0.5
+	}
+	{
+		map textures/evil4_fx/esnow2.tga
+		blendFunc GL_ONE GL_ONE
+		tcMod scale  2 2
+		tcMod scroll 0 -3
+	}
 }
-//weirdo waterfallÕish effect  
+
+//weirdo waterfallÕish effect
+
 textures/evil4_fx/e_waterfall
 {
-	q3map_surfacelight 2  
-	surfaceparm trans 
-	surfaceparm nonsolid 
-	surfaceparm nomarks 
-	surfaceparm nolightmap 
-	q3map_lightimage textures/evil4_fx/e_waterfall.tga  
-	
+	q3map_surfacelight 2
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nomarks
+	surfaceparm nolightmap
+	q3map_lightimage textures/evil4_fx/e_waterfall.tga
 	cull none
-	
 	{
-		map textures/evil4_fx/e_waterfall.tga 
-		tcGen environment 
+		map textures/evil4_fx/e_waterfall.tga
+		tcGen environment
 		blendFunc GL_ONE GL_ONE
-		rgbgen wave triangle 2 1 1 5 
-		tcMod scale  5 5 
-		tcMod scroll 0 -1 
-	}	
-      { 
-		map textures/evil4_fx/e_waterfall.tga 
-		tcGen environment 
-		tcmod scale 1 1 
-		tcmod scroll 1 -1 
-                 
-		blendFunc GL_ONE GL_ONE 
-		rgbGen identity  
-	}
-	{ 
-		map $lightmap 
-		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
+		rgbgen wave triangle 2 1 1 5
+		tcMod scale  5 5
+		tcMod scroll 0 -1
+	}
+	{
+		map textures/evil4_fx/e_waterfall.tga
+		tcGen environment
+		tcmod scale 1 1
+		tcmod scroll 1 -1
+		blendFunc GL_ONE GL_ONE
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
 }
-textures/evil4_fx/teleprtr 
-{  
-	  cull disable	 
-        surfaceparm nomarks 
-        surfaceparm trans 
-        sort additive	  
-        { 
-	        clampmap textures/evil4_fx/teleprtr_fx3.tga  
-		          blendFunc add   
-                tcmod rotate -267 
-                rgbGen identity 
-        } 
-        { 
-	         
-	        clampmap textures/evil4_fx/teleprtr_fx1.tga 
-		blendFunc add  
-                tcmod rotate 155  
-                rgbGen identity 
-	} 
-        { 
-	        clampmap textures/evil4_fx/teleprtr_fx2.tga  
-		blendFunc add 
-                tcmod rotate -100  
-                rgbGen identity 
-        } 
- 
-        { 
-	        clampmap textures/evil4_fx/teleprtr.tga 
-		alphaFunc GE128 
-                depthWrite 
-	        rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-		rgbGen identity 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		depthFunc equal 
-	}       
-} 
+
+textures/evil4_fx/teleprtr
+{
+	cull disable
+	surfaceparm nomarks
+	surfaceparm trans
+	sort additive
+	{
+		clampmap textures/evil4_fx/teleprtr_fx3.tga
+		blendFunc add
+		tcmod rotate -267
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_fx/teleprtr_fx1.tga
+		blendFunc add
+		tcmod rotate 155
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_fx/teleprtr_fx2.tga
+		blendFunc add
+		tcmod rotate -100
+		rgbGen identity
+	}
+	{
+		clampmap textures/evil4_fx/teleprtr.tga
+		alphaFunc GE128
+		depthWrite
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		blendFunc GL_DST_COLOR GL_ZERO
+		depthFunc equal
+	}
+}
+
 //********************************************
 //********************************************
 //********************************************
@@ -849,210 +846,209 @@ textures/evil4_fx/teleprtr
 //********************************************
 //********************************************
 
-textures/evil4_techwalls/tech_dw2 
-{ 
-	{ 
-		map textures/evil4_techwalls/tech_dw2.tga 
-		
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-		rgbGen identity 
-	}   
-	{ 
-		map textures/evil4_techwalls/tech_dw2_fx.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 3	 
+textures/evil4_techwalls/tech_dw2
+{
+	{
+		map textures/evil4_techwalls/tech_dw2.tga
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+	}
+	{
+		map textures/evil4_techwalls/tech_dw2_fx.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 3
 	}
 }
-textures/evil4_techwalls/tech_dw2g 
-{ 
-	{ 
-		map textures/evil4_techwalls/tech_dw2g.tga 
-			 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-		rgbGen identity 
-	}   
-	{ 
-		map textures/evil4_techwalls/tech_dw2_fx.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 3	 
+
+textures/evil4_techwalls/tech_dw2g
+{
+	{
+		map textures/evil4_techwalls/tech_dw2g.tga
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+	}
+	{
+		map textures/evil4_techwalls/tech_dw2_fx.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 3
 	}
 }
-textures/evil4_techwalls/tech_dw2gb 
-{ 
-	{ 
-		map textures/evil4_techwalls/tech_dw2gb.tga 
-		 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-		rgbGen identity 
-	}   
-	{ 
-		map textures/evil4_techwalls/tech_dw2_fx.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 3	 
+
+textures/evil4_techwalls/tech_dw2gb
+{
+	{
+		map textures/evil4_techwalls/tech_dw2gb.tga
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+	}
+	{
+		map textures/evil4_techwalls/tech_dw2_fx.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 3
 	}
 }
-//
-textures/evil4_techwalls/tech_wall_dlight 
-{ 
-	surfaceparm nomarks 
-	q3map_surfacelight 5000  
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_techwalls/tech_wall_dlight.tga 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_techwalls/tech_wall_dlight_glw.tga 
-		rgbGen wave sin 0.5 0.5 1 1 
-		blendfunc GL_ONE GL_ONE 
-	} 
-
-} 
-textures/evil4_techwalls/tech_dwteky 
-{        
-         
-        { 
-		map textures/evil4_techwalls/tech_dwteky_glow.tga 
-      tcmod turb 0 3 5 8  
-       blendFunc GL_ONE GL_ONE 
-		 
-	} 
-        { 
-	map textures/evil4_techwalls/tech_dwteky_glow.tga  
- 	blendFunc GL_ONE GL_ONE   
-	tcmod turb 0 1 1 1 
-	}
-        { 
-		map textures/evil4_techwalls/tech_dwteky.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
-textures/evil4_techwalls/tech_drkwll_pnltek 
-{        
-         
-        { 
-	map textures/evil4_techwalls/tech_drkwll_pnltek_glow.tga  
-      	tcmod turb 0 1 1 9  
-       	blendFunc GL_ONE GL_ONE 
-		 
-	} 
-        { 
-		map textures/evil4_techwalls/tech_drkwll_pnltek.tga  
-		blendFunc GL_ONE GL_ONE 
-	}
-        { 
-		map textures/evil4_techwalls/tech_drkwll_pnltek.tga 
-        	blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
+
+textures/evil4_techwalls/tech_wall_dlight
+{
+	surfaceparm nomarks
+	q3map_surfacelight 5000
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_techwalls/tech_wall_dlight.tga
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_techwalls/tech_wall_dlight_glw.tga
+		rgbGen wave sin 0.5 0.5 1 1
+		blendfunc GL_ONE GL_ONE
+	}
 }
-//
-//tech window with a chrome-like appearance, 
+
+textures/evil4_techwalls/tech_dwteky
+{
+	{
+		map textures/evil4_techwalls/tech_dwteky_glow.tga
+		tcmod turb 0 3 5 8
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_techwalls/tech_dwteky_glow.tga
+		blendFunc GL_ONE GL_ONE
+		tcmod turb 0 1 1 1
+	}
+	{
+		map textures/evil4_techwalls/tech_dwteky.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
+textures/evil4_techwalls/tech_drkwll_pnltek
+{
+	{
+		map textures/evil4_techwalls/tech_drkwll_pnltek_glow.tga
+		tcmod turb 0 1 1 9
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_techwalls/tech_drkwll_pnltek.tga
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_techwalls/tech_drkwll_pnltek.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
+//tech window with a chrome-like appearance,
 //uncomment to use and comment the next one
-//textures/evil4_techwalls/tech_window 
-//{    
+//textures/evil4_techwalls/tech_window
 //{
-//             map textures/effects/tinfx.tga       
-//                tcGen environment 
-//                rgbGen identity 
-//	}    
-//        { 
-//		map textures/evil4_techwalls/tech_window.tga   
-//      blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA  
-//		rgbGen identity 
-//	}  
-//        { 
-//		map $lightmap 
-//                blendFunc gl_dst_color gl_zero 
-//		rgbGen identity 
-//	} 
-//} 
-//
+//{
+//             map textures/effects/tinfx.tga
+//                tcGen environment
+//                rgbGen identity
+//	}
+//        {
+//		map textures/evil4_techwalls/tech_window.tga
+//      blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+//		rgbGen identity
+//	}
+//        {
+//		map $lightmap
+//                blendFunc gl_dst_color gl_zero
+//		rgbGen identity
+//	}
+//}
+
 //tech window with transparency
-textures/evil4_techwalls/tech_window 
-{        
-     cull twosided      
-	{ 
-		map textures/evil4_techwalls/tech_windowmask.tga 
-		tcGen environment 
-		tcMod turb 0 0.01 0 0.01	         
-		tcmod scroll .0 .0 
-		blendfunc GL_ONE GL_ONE 
-                }
-        { 
-		map textures/evil4_techwalls/tech_window.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-}  
-textures/evil4_techwalls/drkmtl_lightboard 
-{        
-         
-        { 
-		map textures/evil4_techwalls/drkmtl_lightboard_glow.tga 
-		blendFunc GL_ONE GL_ONE 
-		rgbGen wave sin 0.5 0.5 0 .3    
-	} 
-        { 
-		map textures/evil4_techwalls/drkmtl_lightboard_glow.tga 
-		blendFunc GL_ONE GL_ONE 
-	} 
-        { 
-		map textures/evil4_techwalls/drkmtl_lightboard.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
-textures/evil4_techwalls/drkmtl_dpanelwrnb2 
- {
-       { 
-		map textures/evil_techwalls/drkmtl_dpanelwrnb2.tga  
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
+
+textures/evil4_techwalls/tech_window
+{
+	cull twosided
+	{
+		map textures/evil4_techwalls/tech_windowmask.tga
+		tcGen environment
+		tcMod turb 0 0.01 0 0.01
+		tcmod scroll .0 .0
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_techwalls/tech_window.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
+textures/evil4_techwalls/drkmtl_lightboard
+{
+	{
+		map textures/evil4_techwalls/drkmtl_lightboard_glow.tga
+		blendFunc GL_ONE GL_ONE
+		rgbGen wave sin 0.5 0.5 0 .3
+	}
+	{
+		map textures/evil4_techwalls/drkmtl_lightboard_glow.tga
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_techwalls/drkmtl_lightboard.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
+textures/evil4_techwalls/drkmtl_dpanelwrnb2
+{
+	{
+		map textures/evil_techwalls/drkmtl_dpanelwrnb2.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
 //********************************************
 //********************************************
 //********************************************
@@ -1066,207 +1062,206 @@ textures/evil4_techwalls/drkmtl_dpanelwrnb2
 //********************************************
 //********************************************
 //********************************************
-textures/evil4_d_techwalls/d_tech_dw2 
-{ 
-	{ 
-		map textures/evil4_d_techwalls/d_tech_dw2.tga 
-			 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-		rgbGen identity 
-	}   
-	{ 
-		map textures/evil4_d_techwalls/d_tech_dw2_fx.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 3	 
+
+textures/evil4_d_techwalls/d_tech_dw2
+{
+	{
+		map textures/evil4_d_techwalls/d_tech_dw2.tga
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_dw2_fx.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 3
+	}
+}
+
+textures/evil4_d_techwalls/d_tech_dw2g
+{
+	{
+		map textures/evil4_d_techwalls/d_tech_dw2g.tga
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_dw2_fx.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 3
+	}
+}
+
+textures/evil4_d_techwalls/d_tech_dw2gb
+{
+	{
+		map textures/evil4_d_techwalls/d_tech_dw2gb.tga
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_dw2_fx.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 3
 	}
 }
-textures/evil4_d_techwalls/d_tech_dw2g 
-{ 
-	{ 
-		map textures/evil4_d_techwalls/d_tech_dw2g.tga 
-			 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-		rgbGen identity 
-	}   
-	{ 
-		map textures/evil4_d_techwalls/d_tech_dw2_fx.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 3	 
+
+textures/evil4_d_techwalls/d_tech_wall_dlight
+{
+	surfaceparm nomarks
+	q3map_surfacelight 5000
+	{
+		map $lightmap
+		rgbGen identity
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_wall_dlight.tga
+		blendFunc GL_DST_COLOR GL_ZERO
+		rgbGen identity
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_wall_dlight_glw.tga
+		rgbGen wave sin 0.5 0.5 1 1
+		blendfunc GL_ONE GL_ONE
 	}
 }
-textures/evil4_d_techwalls/d_tech_dw2gb 
-{ 
-	{ 
-		map textures/evil4_d_techwalls/d_tech_dw2gb.tga 
-			 
-		rgbGen identity 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-		rgbGen identity 
-	}   
-	{ 
-		map textures/evil4_d_techwalls/d_tech_dw2_fx.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 3	 
+
+textures/evil4_d_techwalls/d_tech_dwteky
+{
+	{
+		map textures/evil4_d_techwalls/d_tech_dwteky_glow.tga
+		tcmod turb 0 3 5 8
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_dwteky_glow.tga
+		blendFunc GL_ONE GL_ONE
+		tcmod turb 0 1 1 1
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_dwteky.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
 	}
 }
-//
-textures/evil4_d_techwalls/d_tech_wall_dlight 
-{ 
-	surfaceparm nomarks 
-	q3map_surfacelight 5000  
-	{ 
-		map $lightmap 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_d_techwalls/d_tech_wall_dlight.tga 
-		blendFunc GL_DST_COLOR GL_ZERO 
-		rgbGen identity 
-	} 
-	{ 
-		map textures/evil4_d_techwalls/d_tech_wall_dlight_glw.tga 
-		rgbGen wave sin 0.5 0.5 1 1 
-		blendfunc GL_ONE GL_ONE 
-	} 
-
-} 
-textures/evil4_d_techwalls/d_tech_dwteky 
-{        
-         
-        { 
-		map textures/evil4_d_techwalls/d_tech_dwteky_glow.tga 
-      tcmod turb 0 3 5 8  
-       blendFunc GL_ONE GL_ONE 
-		 
-	} 
-        { 
-		map textures/evil4_d_techwalls/d_tech_dwteky_glow.tga  
- 		blendFunc GL_ONE GL_ONE   
-		tcmod turb 0 1 1 1 
-	}
-        { 
-		map textures/evil4_d_techwalls/d_tech_dwteky.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
-textures/evil4_d_techwalls/d_tech_drkwll_pnltek 
-{        
-         
-        { 
-		maptextures/evil4_d_techwalls/d_tech_drkwll_pnltek_glow.tga  
-		tcmod turb 0 1 1 9  
-		blendFunc GL_ONE GL_ONE 
-	} 
-        { 
-		map textures/evil4_d_techwalls/d_tech_drkwll_pnltek.tga  
-		blendFunc GL_ONE GL_ONE 
-	}
-        { 
-		map textures/evil4_d_techwalls/d_tech_drkwll_pnltek.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
+
+textures/evil4_d_techwalls/d_tech_drkwll_pnltek
+{
+	{
+		maptextures/evil4_d_techwalls/d_tech_drkwll_pnltek_glow.tga
+		tcmod turb 0 1 1 9
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_drkwll_pnltek.tga
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_drkwll_pnltek.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
 }
 
-//
-//tech window with a chrome-like appearance, 
+//tech window with a chrome-like appearance,
 //uncomment to use and comment the next one
-//textures/evil4_d_techwalls/tech_window 
-//{    
+//textures/evil4_d_techwalls/tech_window
+//{
 //{
-//             map textures/effects/tinfx.tga       
-//                tcGen environment 
-//                rgbGen identity 
-//	}    
-//        { 
-//		map textures/evil4_d_techwalls/d_tech_window.tga   
-//      blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA  
-//		rgbGen identity 
-//	}  
-//        { 
-//		map $lightmap 
-//                blendFunc gl_dst_color gl_zero 
-//		rgbGen identity 
-//	} 
-//} 
-//
+//             map textures/effects/tinfx.tga
+//                tcGen environment
+//                rgbGen identity
+//	}
+//        {
+//		map textures/evil4_d_techwalls/d_tech_window.tga
+//      blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+//		rgbGen identity
+//	}
+//        {
+//		map $lightmap
+//                blendFunc gl_dst_color gl_zero
+//		rgbGen identity
+//	}
+//}
+
 //tech window with transparency
-textures/evil4_d_techwalls/d_tech_window 
-{        
-     cull twosided      
-	{ 
-		map textures/evil4_d_techwalls/d_tech_windowmask.tga 
-		tcGen environment 
-		tcMod turb 0 0.01 0 0.01	         
-		tcmod scroll .0 .0 
-		blendfunc GL_ONE GL_ONE 
-                }
-        { 
-		map textures/evil4_d_techwalls/d_tech_window.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-}  
-textures/evil4_d_techwalls/d_drkmtl_lightboard 
-{        
-         
-        { 
-		map textures/evil4_d_techwalls/d_drkmtl_lightboard_glow.tga 
-		blendFunc GL_ONE GL_ONE 
-		rgbGen wave sin 0.5 0.5 0 .3    
-	} 
-        { 
-		map textures/evil4_d_techwalls/d_drkmtl_lightboard_glow.tga 
-		blendFunc GL_ONE GL_ONE 
-	} 
-        { 
-		map textures/evil4_d_techwalls/d_drkmtl_lightboard.tga 
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
-textures/evil4_d_techwalls/d_drkmtl_dpanelwrnb2 
- {
-       { 
-		map textures/evil4_d_techwalls/d_drkmtl_dpanelwrnb2.tga  
-                blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
-		rgbGen identity 
-	} 
-        { 
-		map $lightmap 
-                blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA 
-		rgbGen identity 
-	} 
-} 
\ No newline at end of file
+
+textures/evil4_d_techwalls/d_tech_window
+{
+	cull twosided
+	{
+		map textures/evil4_d_techwalls/d_tech_windowmask.tga
+		tcGen environment
+		tcMod turb 0 0.01 0 0.01
+		tcmod scroll .0 .0
+		blendfunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_d_techwalls/d_tech_window.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
+textures/evil4_d_techwalls/d_drkmtl_lightboard
+{
+	{
+		map textures/evil4_d_techwalls/d_drkmtl_lightboard_glow.tga
+		blendFunc GL_ONE GL_ONE
+		rgbGen wave sin 0.5 0.5 0 .3
+	}
+	{
+		map textures/evil4_d_techwalls/d_drkmtl_lightboard_glow.tga
+		blendFunc GL_ONE GL_ONE
+	}
+	{
+		map textures/evil4_d_techwalls/d_drkmtl_lightboard.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
+
+textures/evil4_d_techwalls/d_drkmtl_dpanelwrnb2
+{
+	{
+		map textures/evil4_d_techwalls/d_drkmtl_dpanelwrnb2.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen identity
+	}
+	{
+		map $lightmap
+		blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		rgbGen identity
+	}
+}
\ No newline at end of file
diff --git a/data/scripts/evil5.shader b/data/scripts/evil5.shader
index 6e8e7533e..46a085567 100644
--- a/data/scripts/evil5.shader
+++ b/data/scripts/evil5.shader
@@ -1,6 +1,5 @@
 // Maj Notes
 // =========
-// 
 // Changes:
 // * Indentation fixed
 // * rgbgen identity's that weren't needed were removed
@@ -15,447 +14,412 @@
 // * Removed unnecessary blendfunc blend's from first stage of all lights
 // * Changed a flr_drmtlodhlz.tga to flr_dkmtlodhlz.tga (was drm instead of dkm)
 
-
-//
-//
 //floors
-//
-//
 
-textures/evil5_floor/confllrtile2pad 
-{ 
-	{ 
-		map textures/base_wall/chrome_env.tga 
-		tcGen environment 
-		tcmod scale .25 .25 
-	}  
-	{ 
-		map textures/evil5_floor/confllrtile2pad.tga 
-		blendFunc blend	 
-	} 
-	{ 
-		map $lightmap 
+textures/evil5_floor/confllrtile2pad
+{
+	{
+		map textures/base_wall/chrome_env.tga
+		tcGen environment
+		tcmod scale .25 .25
+	}
+	{
+		map textures/evil5_floor/confllrtile2pad.tga
+		blendFunc blend
+	}
+	{
+		map $lightmap
 		blendfunc filter
-	}     
-} 
+	}
+}
 
-textures/evil5_floor/contekfllr 
+textures/evil5_floor/contekfllr
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/contekfllr.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/contekfllr.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/contekfllr2 
+textures/evil5_floor/contekfllr2
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/contekfllr2.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/contekfllr2.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/contekfllr2b  
+textures/evil5_floor/contekfllr2b
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/contekfllr2b.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/contekfllr2b.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/contekfllr_b 
+textures/evil5_floor/contekfllr_b
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/contekfllr_b.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/contekfllr_b.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/contekfllr_c 
+textures/evil5_floor/contekfllr_c
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/contekfllr_c.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/contekfllr_c.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/contekfllr_single  
+textures/evil5_floor/contekfllr_single
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/contekfllr_single.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/contekfllr_single.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/flr_drmtlodhlz 
+textures/evil5_floor/flr_drmtlodhlz
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/flr_dkmtlodhlz.tga   
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/flr_dkmtlodhlz.tga
 		alphaFunc GE128
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/flr_mtlhls 
+textures/evil5_floor/flr_mtlhls
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/flr_mtlhls.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/flr_mtlhls.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/flr_rstmtlhls 
+textures/evil5_floor/flr_rstmtlhls
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	surfaceparm metalsteps 
-	cull none 
-
-	{ 
-		map textures/evil5_floor/flr_rstmtlhls.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	surfaceparm metalsteps
+	cull none
+	{
+		map textures/evil5_floor/flr_rstmtlhls.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_floor/tekconfllr_fx 
+textures/evil5_floor/tekconfllr_fx
 {
 	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
+	surfaceparm nomarks
 	cull none
-
-	{ 
-		map textures/evil5_floor/tekconfllr_fx.tga 
-		tcmod scroll 0 .9   
+	{
+		map textures/evil5_floor/tekconfllr_fx.tga
+		tcmod scroll 0 .9
 		alphafunc GE128
 		depthwrite
-	} 
-	{ 
-		map textures/evil5_floor/tekconfllr.tga  
+	}
+	{
+		map textures/evil5_floor/tekconfllr.tga
 		alphafunc GE128
 		depthwrite
-	} 
-	{ 
-		map $lightmap 
+	}
+	{
+		map $lightmap
 		blendfunc filter
 		depthfunc equal
-	} 
+	}
 }
 
-//
-//
 //Misc
-//
-//
 
-textures/evil5_misc/pallette_top 
+textures/evil5_misc/pallette_top
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	cull none 
-
-	{ 
-		map textures/evil5_misc/pallette_top.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	cull none
+	{
+		map textures/evil5_misc/pallette_top.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-textures/evil5_misc/pallette_side  
+textures/evil5_misc/pallette_side
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	cull none 
-
-	{ 
-		map textures/evil5_misc/pallette_side.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	cull none
+	{
+		map textures/evil5_misc/pallette_side.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
+		depthFunc equal
+	}
+}
 
-//
-//
 //Trims and steps (lights)
-//
-//
-
-textures/evil5_trim/trim_light_drkrst 
-{ 
-	q3map_surfacelight 100  
-
-	{ 
-		map textures/evil5_trim/trim_light_drkrst.tga 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_trim/trim_light_drkrst_glow.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1	 
-	}     
-}   
- 
-textures/evil5_trim/stepside_mtl4light 
-{ 
-	q3map_surfacelight 100  
 
-	{ 
-		map textures/evil5_trim/stepside_mtl4light.tga 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_trim/stepside_mtl4light_glw.tga  
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1   	 
-	}     
+textures/evil5_trim/trim_light_drkrst
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_trim/trim_light_drkrst.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_trim/trim_light_drkrst_glow.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
 }
 
-textures/evil5_trim/stepside_mtllight 
-{ 
-	q3map_surfacelight 100  
+textures/evil5_trim/stepside_mtl4light
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_trim/stepside_mtl4light.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_trim/stepside_mtl4light_glw.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
+}
 
-	{ 
-		map textures/evil5_trim/stepside_mtllight.tga  
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_trim/stepside_mtllight_blnd.tga  
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1   	 
-	}     
-}    
+textures/evil5_trim/stepside_mtllight
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_trim/stepside_mtllight.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_trim/stepside_mtllight_blnd.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
+}
 
-//
-//
 //walls (lights)
-//
-//
 
-textures/evil5_wall/crete_tblight 
-{ 
-	q3map_surfacelight 100  
+textures/evil5_wall/crete_tblight
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_wall/crete_tblight.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_wall/crete_tblight_blend.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
+}
 
-	{ 
-		map textures/evil5_wall/crete_tblight.tga  
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_wall/crete_tblight_blend.tga  
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1     	 
-	}     
-}  
-textures/evil5_misc/pallette_side  
+textures/evil5_misc/pallette_side
 {
-   	surfaceparm trans	
+	surfaceparm trans
 	surfaceparm alphashadow
-	surfaceparm nomarks	
-	cull none 
-
-	{ 
-		map textures/evil5_misc/pallette_side.tga   
-		alphaFunc GE128 
-		depthWrite 
-	} 
-	{ 
-		map $lightmap 
+	surfaceparm nomarks
+	cull none
+	{
+		map textures/evil5_misc/pallette_side.tga
+		alphaFunc GE128
+		depthWrite
+	}
+	{
+		map $lightmap
 		blendFunc filter
-		depthFunc equal 
-	} 
-} 
-textures/evil5_trim/trim_light_drkrst 
-{ 
-	q3map_surfacelight 100  
-
-	{ 
-		map textures/evil5_trim/trim_light_drkrst.tga 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_trim/trim_light_drkrst_glow.tga 
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1	 
-	}     
-}   
- 
-textures/evil5_trim/stepside_mtl4light 
-{ 
-	q3map_surfacelight 100  
+		depthFunc equal
+	}
+}
 
-	{ 
-		map textures/evil5_trim/stepside_mtl4light.tga 
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_trim/stepside_mtl4light_glw.tga  
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1   	 
-	}     
+textures/evil5_trim/trim_light_drkrst
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_trim/trim_light_drkrst.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_trim/trim_light_drkrst_glow.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
 }
 
-textures/evil5_trim/stepside_mtllight 
-{ 
-	q3map_surfacelight 100  
+textures/evil5_trim/stepside_mtl4light
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_trim/stepside_mtl4light.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_trim/stepside_mtl4light_glw.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
+}
 
-	{ 
-		map textures/evil5_trim/stepside_mtllight.tga  
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_trim/stepside_mtllight_blnd.tga  
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1   	 
-	}     
+textures/evil5_trim/stepside_mtllight
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_trim/stepside_mtllight.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_trim/stepside_mtllight_blnd.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
 }
-textures/evil5_wall/crete_tblight 
-{ 
-	q3map_surfacelight 100  
 
-	{ 
-		map textures/evil5_wall/crete_tblight.tga  
-	} 
-	{ 
-		map $lightmap 
-		blendfunc filter 
-	}   
-	{ 
-		map textures/evil5_wall/crete_tblight_blend.tga  
-		blendFunc add	 
-		rgbGen wave sin .5 .5 0 1     	 
-	}     
-}  
\ No newline at end of file
+textures/evil5_wall/crete_tblight
+{
+	q3map_surfacelight 100
+	{
+		map textures/evil5_wall/crete_tblight.tga
+	}
+	{
+		map $lightmap
+		blendfunc filter
+	}
+	{
+		map textures/evil5_wall/crete_tblight_blend.tga
+		blendFunc add
+		rgbGen wave sin .5 .5 0 1
+	}
+}
\ No newline at end of file
diff --git a/data/scripts/evil6.shader b/data/scripts/evil6.shader
index 3bf24b74d..f32bfc43b 100644
--- a/data/scripts/evil6.shader
+++ b/data/scripts/evil6.shader
@@ -5,7 +5,6 @@ textures/evil6_floors/e6bsegrtflr128_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6bsegrtflr128.tga
 		alphafunc GE128
@@ -25,7 +24,6 @@ textures/evil6_floors/e6bsegrtflr256_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6bsegrtflr256.tga
 		alphafunc GE128
@@ -45,7 +43,6 @@ textures/evil6_floors/e6grate_flr_b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate_flr_b.tga
 		alphafunc GE128
@@ -65,7 +62,6 @@ textures/evil6_floors/e6grate_flr_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate_flr.tga
 		alphafunc GE128
@@ -85,7 +81,6 @@ textures/evil6_floors/e6grtfloorceil_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grtfloorceil.tga
 		alphafunc GE128
@@ -105,7 +100,6 @@ textures/evil6_floors/e6grate2_flr_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate2_flr.tga
 		alphafunc GE128
@@ -125,7 +119,6 @@ textures/evil6_floors/e6grate2_flr_b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate2_flr_b.tga
 		alphafunc GE128
@@ -144,7 +137,6 @@ textures/evil6_floors/e6launchcfloor_s
 	q3map_lightimage textures/evil6_floors/e6launchcfloor_glow.tga
 	q3map_surfacelight 400
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_floors/e6launchcfloor.tga
 	}
@@ -171,7 +163,6 @@ textures/evil6_floors/e6launchengine_s
 	q3map_lightimage textures/evil6_floors/e6launchengine_glow.tga
 	q3map_surfacelight 400
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_floors/e6launchengine.tga
 	}
@@ -198,7 +189,6 @@ textures/evil6_floors/e6launchlfloor_s
 	q3map_lightimage textures/evil6_floors/e6launchlfloor_glow.tga
 	q3map_surfacelight 400
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_floors/e6launchlfloor.tga
 	}
@@ -222,7 +212,6 @@ textures/evil6_floors/e6launchlfloor_s
 textures/evil6_floors/e6tekmtlrflr_h_full_slow
 {
 	qer_editorimage textures/evil6_floors/e6tekmtlrflr_h.tga
-
 	{
 		map textures/evil6_floors/e6tekmtlrflr_h.tga
 	}
@@ -240,7 +229,6 @@ textures/evil6_floors/e6tekmtlrflr_h_full_slow
 textures/evil6_floors/e6tekmtlrflr_h_small_noisy_fast
 {
 	qer_editorimage textures/evil6_floors/e6tekmtlrflr_h.tga
-
 	{
 		map textures/evil6_floors/e6tekmtlrflr_h.tga
 	}
@@ -262,7 +250,6 @@ textures/evil6_floors/e6xgratebasic_b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6xgratebasic_b.tga
 		alphafunc GE128
@@ -282,7 +269,6 @@ textures/evil6_floors/e6xgratebasic_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6xgratebasic.tga
 		alphafunc GE128
@@ -301,7 +287,6 @@ textures/evil6_lights/e6horzlight_s_nolight
 	qer_editorimage textures/evil6_lights/e6horzlight.tga
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6horzlight.tga
 	}
@@ -316,17 +301,15 @@ textures/evil6_lights/e6horzlight_s_nolight
 }
 
 // e6horzovallight.jpg with e6horzovallight_blend.jpg and
-// e6mtltpnl_light_fx.jpg  
+// e6mtltpnl_light_fx.jpg
 // ( e6mtltpnl_light_fx.jpg scrolls up slowly (speed of 2) while
 // e6mtltpnl_light_blend.jpg has the normal q3 light  shader)
-// 
-// 
+
 textures/evil6_lights/e6horzovallight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6horzovallight.tga
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6horzovallight.tga
 	}
@@ -341,15 +324,15 @@ textures/evil6_lights/e6horzovallight_s_nolight
 }
 
 // alpha channel:
+
 textures/evil6_lights/e6horzovallight_s_nolight
 {
-qer_editorimage textures/evil6_lights/e6horzovallight_a.tga
-//q3map_surfacelight ?
-surfaceparm nomarks
-	
-{
-map textures/evil6_lights/e6mtltpnl_light_fx.tga
-tcmod scroll .2 1 
+	qer_editorimage textures/evil6_lights/e6horzovallight_a.tga
+	//q3map_surfacelight ?
+	surfaceparm nomarks
+	{
+		map textures/evil6_lights/e6mtltpnl_light_fx.tga
+		tcmod scroll .2 1
 	}
 	{
 		map textures/evil6_lights/e6horzovallight_a.tga
@@ -365,13 +348,11 @@ tcmod scroll .2 1
 	}
 }
 
-
 textures/evil6_lights/e6platelight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6platelight.tga
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6platelight.tga
 	}
@@ -386,12 +367,12 @@ textures/evil6_lights/e6platelight_s_nolight
 }
 
 // e6platelight_burnt.jpg with e6platelight_burnt_blend.jpg  (default q3 light shader)
+
 textures/evil6_lights/e6platelight_burnt_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6platelight_burnt.tga
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6platelight_burnt.tga
 	}
@@ -406,12 +387,12 @@ textures/evil6_lights/e6platelight_burnt_s_nolight
 }
 
 // e6tinylight.jpg with e6tinylight_blend.jpg  (default q3 light shader)
+
 textures/evil6_lights/e6tinylight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6tinylight.tga
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6tinylight.tga
 	}
@@ -426,12 +407,12 @@ textures/evil6_lights/e6tinylight_s_nolight
 }
 
 // e6v_light.jpg with e6v_light_blend.jpg  (default q3 light shader)
+
 textures/evil6_lights/e6v_light_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6v_light.tga
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6v_light.tga
 	}
@@ -446,12 +427,12 @@ textures/evil6_lights/e6v_light_s_nolight
 }
 
 // e6walllight.jpg with e6walllight_blend.jpg  (default q3 light shader)
+
 textures/evil6_lights/e6walllight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6walllight.tga
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6walllight.tga
 	}
@@ -473,7 +454,6 @@ textures/evil6_lights/e6basicstrip_blue_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_blue.tga
 	}
@@ -485,7 +465,6 @@ textures/evil6_lights/e6basicstrip_green_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_green.tga
 	}
@@ -497,7 +476,6 @@ textures/evil6_lights/e6basicstrip_orange_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_orange.tga
 	}
@@ -509,7 +487,6 @@ textures/evil6_lights/e6basicstrip_red_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_red.tga
 	}
@@ -521,7 +498,6 @@ textures/evil6_lights/e6basicstrip_white_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_white.tga
 	}
@@ -533,7 +509,6 @@ textures/evil6_lights/e6basicstrip_yellow_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_yellow.tga
 	}
@@ -546,7 +521,6 @@ textures/evil6_support/e6h_support_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6h_support.tga
 		alphafunc GE128
@@ -566,7 +540,6 @@ textures/evil6_support/e6holestrip_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6holestrip.tga
 		alphafunc GE128
@@ -584,7 +557,6 @@ textures/evil6_support/e6vertgrt_supp_s_nolight
 	qer_editorimage textures/evil6_support/e6vertgrt_supp.tga
 	q3map_lightimage textures/evil6_support/e6vertgrt_supp_fx.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_support/e6vertgrt_supp.tga
 	}
@@ -607,7 +579,6 @@ textures/evil6_support/e6vlight_supp_s_nolight
 {
 	qer_editorimage textures/evil6_support/e6vlight_supp.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_support/e6vlight_supp.tga
 	}
@@ -628,7 +599,6 @@ textures/evil6_support/e6x_supprt_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6x_supprt.tga
 		alphafunc GE128
@@ -648,7 +618,6 @@ textures/evil6_support/e6xrst_supprt_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6xrst_supprt.tga
 		alphafunc GE128
@@ -660,11 +629,11 @@ textures/evil6_support/e6xrst_supprt_s
 		blendfunc filter
 	}
 }
+
 textures/evil6_trims/e6btrim_light_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6btrim_light.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6btrim_light.tga
 	}
@@ -681,7 +650,6 @@ textures/evil6_trims/e6btrim_light_s_nolight
 textures/evil6_trims/e6metalfan_s
 {
 	qer_editorimage textures/evil6_trims/e6metalfan.tga
-
 	{
 		map textures/evil6_trims/e6metalfan_blade.tga
 		tcmod rotate 5000
@@ -700,7 +668,6 @@ textures/evil6_trims/e6strimlight_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6strimlight.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6strimlight.tga
 	}
@@ -718,7 +685,6 @@ textures/evil6_trims/e6trim_bsrlight_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6trim_bsrlight.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6trim_bsrlight.tga
 	}
@@ -736,7 +702,6 @@ textures/evil6_trims/e6trim_light_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6trim_light.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6trim_light.tga
 	}
@@ -749,9 +714,11 @@ textures/evil6_trims/e6trim_light_s_nolight
 		blendfunc add
 	}
 }
-// textures/evil6_walls/  
+
+// textures/evil6_walls/
 
 // e6girdergrate.tga  (default grate shader)
+
 textures/evil6_walls/e6girdergrate_s
 {
 	qer_editorimage textures/evil6_walls/e6girdergrate.tga
@@ -759,7 +726,6 @@ textures/evil6_walls/e6girdergrate_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6girdergrate.tga
 		alphafunc GE128
@@ -773,6 +739,7 @@ textures/evil6_walls/e6girdergrate_s
 }
 
 // e6girdergrate2b.tga  (default grate shader)
+
 textures/evil6_walls/e6girdergrate2b_s
 {
 	qer_editorimage textures/evil6_walls/e6girdergrate2b.tga
@@ -780,7 +747,6 @@ textures/evil6_walls/e6girdergrate2b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6girdergrate2b.tga
 		alphafunc GE128
@@ -794,6 +760,7 @@ textures/evil6_walls/e6girdergrate2b_s
 }
 
 // e6girdersupport.tga  (default grate shader)
+
 textures/evil6_walls/e6girdersupport_s
 {
 	qer_editorimage textures/evil6_walls/e6girdersupport.tga
@@ -801,7 +768,6 @@ textures/evil6_walls/e6girdersupport_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6girdersupport.tga
 		alphafunc GE128
@@ -815,6 +781,7 @@ textures/evil6_walls/e6girdersupport_s
 }
 
 // e6indsdoor.tga  (default grate shader)
+
 textures/evil6_walls/e6indsdoor_s
 {
 	qer_editorimage textures/evil6_walls/e6indsdoor.tga
@@ -822,7 +789,6 @@ textures/evil6_walls/e6indsdoor_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6indsdoor.tga
 		alphafunc GE128
@@ -837,29 +803,24 @@ textures/evil6_walls/e6indsdoor_s
 
 // e6tdoor.tga with e6tdoor_fx.tga will use this shader:
 // Tech door light effect
-textures/evil6_walls/e6tdoor 
-{         
-        qer_editorimage textures/evil6_walls/e6tdoor.tga 
-        
-        { 
-                map textures/evil6_walls/e6tdoor.tga 
-        } 
-        { 
-                map textures/evil6_walls/e6tdoor_fx.tga  
-                tcmod scroll -1 0  
-                blendFunc add 
-        } 
-        { 
-                map textures/evil6_walls/e6tdoor.tga 
-                blendFunc blend
-        } 
-        { 
-                map $lightmap 
-                blendFunc filter
-        } 
-}
-
-
-
-
 
+textures/evil6_walls/e6tdoor
+{
+	qer_editorimage textures/evil6_walls/e6tdoor.tga
+	{
+		map textures/evil6_walls/e6tdoor.tga
+	}
+	{
+		map textures/evil6_walls/e6tdoor_fx.tga
+		tcmod scroll -1 0
+		blendFunc add
+	}
+	{
+		map textures/evil6_walls/e6tdoor.tga
+		blendFunc blend
+	}
+	{
+		map $lightmap
+		blendFunc filter
+	}
+}
\ No newline at end of file
diff --git a/data/scripts/evil6_floors.shader b/data/scripts/evil6_floors.shader
index 6109bfed1..4e206ae83 100644
--- a/data/scripts/evil6_floors.shader
+++ b/data/scripts/evil6_floors.shader
@@ -5,7 +5,6 @@ textures/evil6_floors/e6bsegrtflr128_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6bsegrtflr128.tga
 		alphafunc GE128
@@ -25,7 +24,6 @@ textures/evil6_floors/e6bsegrtflr256_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6bsegrtflr256.tga
 		alphafunc GE128
@@ -45,7 +43,6 @@ textures/evil6_floors/e6grate_flr_b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate_flr_b.tga
 		alphafunc GE128
@@ -65,7 +62,6 @@ textures/evil6_floors/e6grate_flr_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate_flr.tga
 		alphafunc GE128
@@ -85,7 +81,6 @@ textures/evil6_floors/e6grtfloorceil_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grtfloorceil.tga
 		alphafunc GE128
@@ -105,7 +100,6 @@ textures/evil6_floors/e6grate2_flr_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate2_flr.tga
 		alphafunc GE128
@@ -125,7 +119,6 @@ textures/evil6_floors/e6grate2_flr_b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6grate2_flr_b.tga
 		alphafunc GE128
@@ -144,7 +137,6 @@ textures/evil6_floors/e6launchcfloor_s
 	q3map_lightimage textures/evil6_floors/e6launchcfloor_glow.tga
 	q3map_surfacelight 400
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_floors/e6launchcfloor.tga
 	}
@@ -171,7 +163,6 @@ textures/evil6_floors/e6launchengine_s
 	q3map_lightimage textures/evil6_floors/e6launchengine_glow.tga
 	q3map_surfacelight 400
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_floors/e6launchengine.tga
 	}
@@ -198,7 +189,6 @@ textures/evil6_floors/e6launchlfloor_s
 	q3map_lightimage textures/evil6_floors/e6launchlfloor_glow.tga
 	q3map_surfacelight 400
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_floors/e6launchlfloor.tga
 	}
@@ -222,7 +212,6 @@ textures/evil6_floors/e6launchlfloor_s
 textures/evil6_floors/e6tekmtlrflr_h_full_slow
 {
 	qer_editorimage textures/evil6_floors/e6tekmtlrflr_h.tga
-
 	{
 		map textures/evil6_floors/e6tekmtlrflr_h.tga
 	}
@@ -240,7 +229,6 @@ textures/evil6_floors/e6tekmtlrflr_h_full_slow
 textures/evil6_floors/e6tekmtlrflr_h_small_noisy_fast
 {
 	qer_editorimage textures/evil6_floors/e6tekmtlrflr_h.tga
-
 	{
 		map textures/evil6_floors/e6tekmtlrflr_h.tga
 	}
@@ -262,7 +250,6 @@ textures/evil6_floors/e6xgratebasic_b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6xgratebasic_b.tga
 		alphafunc GE128
@@ -282,7 +269,6 @@ textures/evil6_floors/e6xgratebasic_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_floors/e6xgratebasic.tga
 		alphafunc GE128
@@ -293,4 +279,4 @@ textures/evil6_floors/e6xgratebasic_s
 		depthfunc equal
 		blendfunc filter
 	}
-}
+}
\ No newline at end of file
diff --git a/data/scripts/evil6_lights.shader b/data/scripts/evil6_lights.shader
index f6aa0975f..ddd1c5acf 100644
--- a/data/scripts/evil6_lights.shader
+++ b/data/scripts/evil6_lights.shader
@@ -5,7 +5,6 @@ textures/evil6_lights/e6horzlight_s_nolight
 	qer_editorimage textures/evil6_lights/e6horzlight.jpg
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6horzlight.jpg
 	}
@@ -14,68 +13,34 @@ textures/evil6_lights/e6horzlight_s_nolight
 		blendfunc filter
 	}
 	{
-		map textures/evil6_lights/e6horzlight_blend.jpg
+		map textures/evil6_lights/e6horzlight_glow.jpg
 		blendfunc add
 	}
 }
 
-// e6horzovallight.jpg with e6horzovallight_blend.jpg and
-// e6mtltpnl_light_fx.jpg  
-// ( e6mtltpnl_light_fx.jpg scrolls up slowly (speed of 2) while
-// e6mtltpnl_light_blend.jpg has the normal q3 light  shader)
-// 
-// 
 textures/evil6_lights/e6horzovallight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6horzovallight.jpg
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6horzovallight.jpg
 	}
-	{
-		map textures/evil6_lights/e6horzovallight_blend.jpg
-		blendfunc add
-	}
-	{
-		map $lightmap
-		blendfunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
-	}
-}
-
-// alpha channel:
-textures/evil6_lights/e6horzovallight_s_nolight
-{
-qer_editorimage textures/evil6_lights/e6horzovallight_a.jpg
-//q3map_surfacelight ?
-surfaceparm nomarks
-	
-{
-map textures/evil6_lights/e6mtltpnl_light_fx.jpg
-tcmod scroll .2 1 
-	}
-	{
-		map textures/evil6_lights/e6horzovallight_a.jpg
-		blendfunc blend
-	}
 	{
 		map $lightmap
-		blendfunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
+		blendfunc filter
 	}
 	{
-		map textures/evil6_lights/e6horzovallight_blend.jpg
+		map textures/evil6_lights/e6horzovallight_glow.jpg
 		blendfunc add
 	}
 }
 
-
 textures/evil6_lights/e6platelight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6platelight.jpg
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6platelight.jpg
 	}
@@ -84,18 +49,18 @@ textures/evil6_lights/e6platelight_s_nolight
 		blendfunc filter
 	}
 	{
-		map textures/evil6_lights/e6platelight_blend.jpg
+		map textures/evil6_lights/e6platelight_glow.jpg
 		blendfunc add
 	}
 }
 
-// e6platelight_burnt.jpg with e6platelight_burnt_blend.jpg  (default q3 light shader)
+// e6platelight_burnt.jpg with e6platelight_burnt_glow.jpg  (default q3 light shader)
+
 textures/evil6_lights/e6platelight_burnt_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6platelight_burnt.jpg
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6platelight_burnt.jpg
 	}
@@ -104,18 +69,18 @@ textures/evil6_lights/e6platelight_burnt_s_nolight
 		blendfunc filter
 	}
 	{
-		map textures/evil6_lights/e6platelight_burnt_blend.jpg
+		map textures/evil6_lights/e6platelight_burnt_glow.jpg
 		blendfunc add
 	}
 }
 
-// e6tinylight.jpg with e6tinylight_blend.jpg  (default q3 light shader)
+// e6tinylight.jpg with e6tinylight_glow.jpg  (default q3 light shader)
+
 textures/evil6_lights/e6tinylight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6tinylight.jpg
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6tinylight.jpg
 	}
@@ -124,18 +89,18 @@ textures/evil6_lights/e6tinylight_s_nolight
 		blendfunc filter
 	}
 	{
-		map textures/evil6_lights/e6tinylight_blend.jpg
+		map textures/evil6_lights/e6tinylight_glow.jpg
 		blendfunc add
 	}
 }
 
-// e6v_light.jpg with e6v_light_blend.jpg  (default q3 light shader)
+// e6v_light.jpg with e6v_light_glow.jpg  (default q3 light shader)
+
 textures/evil6_lights/e6v_light_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6v_light.jpg
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6v_light.jpg
 	}
@@ -144,18 +109,17 @@ textures/evil6_lights/e6v_light_s_nolight
 		blendfunc filter
 	}
 	{
-		map textures/evil6_lights/e6v_light_blend.jpg
+		map textures/evil6_lights/e6v_light_glow.jpg
 		blendfunc add
 	}
 }
 
-// e6walllight.jpg with e6walllight_blend.jpg  (default q3 light shader)
+// e6walllight.jpg with e6walllight_glow.jpg  (default q3 light shader)
 textures/evil6_lights/e6walllight_s_nolight
 {
 	qer_editorimage textures/evil6_lights/e6walllight.jpg
 	//q3map_surfacelight ?
 	surfaceparm nomarks
-	
 	{
 		map textures/evil6_lights/e6walllight.jpg
 	}
@@ -164,7 +128,7 @@ textures/evil6_lights/e6walllight_s_nolight
 		blendfunc filter
 	}
 	{
-		map textures/evil6_lights/e6walllight_blend.jpg
+		map textures/evil6_lights/e6walllight_glow.jpg
 		blendfunc add
 	}
 }
@@ -177,7 +141,6 @@ textures/evil6_lights/e6basicstrip_blue_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_blue.jpg
 	}
@@ -189,25 +152,8 @@ textures/evil6_lights/e6basicstrip_green_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
-	{
-		map textures/evil6_lights/e6basicstrip_green.jpg
-	}
 	{
 		map textures/evil6_lights/e6basicstrip_green.jpg
-		blendfunc add
-		rgbGen identity
-	}
-	{
-		map textures/evil6_lights/e6basicstrip_green.jpg
-		blendfunc blend
-		rgbGen identity
-	}
-	{
-		map $lightmap 
-		blendfunc gl_dst_color gl_one_minus_dst_alpha
-		rgbGen identity
-		tcGen lightmap 
 	}
 }
 
@@ -217,7 +163,6 @@ textures/evil6_lights/e6basicstrip_orange_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_orange.jpg
 	}
@@ -229,7 +174,6 @@ textures/evil6_lights/e6basicstrip_red_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_red.jpg
 	}
@@ -241,7 +185,6 @@ textures/evil6_lights/e6basicstrip_white_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_white.jpg
 	}
@@ -253,10 +196,7 @@ textures/evil6_lights/e6basicstrip_yellow_s_nolight
 	//q3map_surfacelight ?
 	surfaceparm nomarks
 	surfaceparm nolightmap
-	
 	{
 		map textures/evil6_lights/e6basicstrip_yellow.jpg
 	}
-}
-
-
+}
\ No newline at end of file
diff --git a/data/scripts/evil6_support.shader b/data/scripts/evil6_support.shader
index fc25e73c5..c9c354252 100644
--- a/data/scripts/evil6_support.shader
+++ b/data/scripts/evil6_support.shader
@@ -5,7 +5,6 @@ textures/evil6_support/e6h_support_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6h_support.tga
 		alphafunc GE128
@@ -25,7 +24,6 @@ textures/evil6_support/e6holestrip_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6holestrip.tga
 		alphafunc GE128
@@ -43,7 +41,6 @@ textures/evil6_support/e6vertgrt_supp_s_nolight
 	qer_editorimage textures/evil6_support/e6vertgrt_supp.tga
 	q3map_lightimage textures/evil6_support/e6vertgrt_supp_fx.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_support/e6vertgrt_supp.tga
 	}
@@ -66,7 +63,6 @@ textures/evil6_support/e6vlight_supp_s_nolight
 {
 	qer_editorimage textures/evil6_support/e6vlight_supp.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_support/e6vlight_supp.tga
 	}
@@ -87,7 +83,6 @@ textures/evil6_support/e6x_supprt_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6x_supprt.tga
 		alphafunc GE128
@@ -107,7 +102,6 @@ textures/evil6_support/e6xrst_supprt_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_support/e6xrst_supprt.tga
 		alphafunc GE128
@@ -118,4 +112,4 @@ textures/evil6_support/e6xrst_supprt_s
 		depthfunc equal
 		blendfunc filter
 	}
-}
+}
\ No newline at end of file
diff --git a/data/scripts/evil6_trims.shader b/data/scripts/evil6_trims.shader
index 1cf0aa240..727ca542f 100644
--- a/data/scripts/evil6_trims.shader
+++ b/data/scripts/evil6_trims.shader
@@ -2,7 +2,6 @@ textures/evil6_trims/e6btrim_light_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6btrim_light.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6btrim_light.tga
 	}
@@ -19,7 +18,6 @@ textures/evil6_trims/e6btrim_light_s_nolight
 textures/evil6_trims/e6metalfan_s
 {
 	qer_editorimage textures/evil6_trims/e6metalfan.tga
-
 	{
 		map textures/evil6_trims/e6metalfan_blade.tga
 		tcmod rotate 5000
@@ -38,7 +36,6 @@ textures/evil6_trims/e6strimlight_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6strimlight.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6strimlight.tga
 	}
@@ -56,7 +53,6 @@ textures/evil6_trims/e6trim_bsrlight_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6trim_bsrlight.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6trim_bsrlight.tga
 	}
@@ -74,7 +70,6 @@ textures/evil6_trims/e6trim_light_s_nolight
 {
 	qer_editorimage textures/evil6_trims/e6trim_light.tga
 	surfaceparm nomarks
-
 	{
 		map textures/evil6_trims/e6trim_light.tga
 	}
@@ -86,4 +81,4 @@ textures/evil6_trims/e6trim_light_s_nolight
 		map textures/evil6_trims/e6trim_light_blend.tga
 		blendfunc add
 	}
-}
+}
\ No newline at end of file
diff --git a/data/scripts/evil6_walls.shader b/data/scripts/evil6_walls.shader
index 2f97ae992..44473d6bb 100644
--- a/data/scripts/evil6_walls.shader
+++ b/data/scripts/evil6_walls.shader
@@ -1,4 +1,4 @@
-// textures/evil6_walls/  
+// textures/evil6_walls/
 
 // e6girdergrate.tga  (default grate shader)
 textures/evil6_walls/e6girdergrate_s
@@ -8,7 +8,6 @@ textures/evil6_walls/e6girdergrate_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6girdergrate.tga
 		alphafunc GE128
@@ -29,7 +28,6 @@ textures/evil6_walls/e6girdergrate2b_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6girdergrate2b.tga
 		alphafunc GE128
@@ -50,7 +48,6 @@ textures/evil6_walls/e6girdersupport_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6girdersupport.tga
 		alphafunc GE128
@@ -71,7 +68,6 @@ textures/evil6_walls/e6indsdoor_s
 	surfaceparm nomarks
 	surfaceparm metalsteps
 	cull none
-
 	{
 		map textures/evil6_walls/e6indsdoor.tga
 		alphafunc GE128
@@ -86,28 +82,23 @@ textures/evil6_walls/e6indsdoor_s
 
 // e6tdoor.tga with e6tdoor_fx.tga will use this shader:
 // Tech door light effect
-textures/evil6_walls/e6tdoor 
-{         
-        qer_editorimage textures/evil6_walls/e6tdoor.tga 
-        
-        { 
-                map textures/evil6_walls/e6tdoor.tga 
-        } 
-        { 
-                map textures/evil6_walls/e6tdoor_fx.tga  
-                tcmod scroll -1 0  
-                blendFunc add 
-        } 
-        { 
-                map textures/evil6_walls/e6tdoor.tga 
-                blendFunc blend
-        } 
-        { 
-                map $lightmap 
-                blendFunc filter
-        } 
-}
-
-
-
-
+textures/evil6_walls/e6tdoor
+{
+	qer_editorimage textures/evil6_walls/e6tdoor.tga
+	{
+		map textures/evil6_walls/e6tdoor.tga
+	}
+	{
+		map textures/evil6_walls/e6tdoor_fx.tga
+		tcmod scroll -1 0
+		blendFunc add
+	}
+	{
+		map textures/evil6_walls/e6tdoor.tga
+		blendFunc blend
+	}
+	{
+		map $lightmap
+		blendFunc filter
+	}
+}
\ No newline at end of file
diff --git a/data/scripts/evil8_base.shader b/data/scripts/evil8_base.shader
index 60d2642a8..4cfd212ec 100644
--- a/data/scripts/evil8_base.shader
+++ b/data/scripts/evil8_base.shader
@@ -8,9 +8,9 @@ textures/evil8_lights/e8btrimlight
 		map textures/evil8_lights/e8btrimlight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8btrimlight.blend.tga
@@ -28,9 +28,9 @@ textures/evil8_lights/e8trimlight
 		map textures/evil8_lights/e8trimlight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8trimlight.blend.tga
@@ -48,9 +48,9 @@ textures/evil8_floor/e8warn2steplight
 		map textures/evil8_floor/e8warn2steplight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_floor/e8warn2steplight.blend.tga
@@ -68,15 +68,16 @@ textures/evil8_floor/e8minitrimlight
 		map textures/evil8_lights/e8minitrimlight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8minitrimlight.blend.tga
 		blendfunc add
 	}
 }
+
 textures/evil8_fx/e8_jumppad02
 {
 	q3map_lightimage textures/evil8_fx/e8_jumppad02_fx.tga
@@ -86,7 +87,7 @@ textures/evil8_fx/e8_jumppad02
 		map textures/evil8_fx/e8_jumppad02_fx.tga
 		blendfunc add
 		tcMod rotate 360
-		tcMod stretch sin 1 0.8 1 0.4 
+		tcMod stretch sin 1 0.8 1 0.4
 	}
 	{
 		map textures/evil8_fx/e8_jumppad02.tga
@@ -99,12 +100,13 @@ textures/evil8_fx/e8_jumppad02
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
+
 textures/evil8_lights/e8_rlightb2
 {
 	qer_editorimage textures/evil8_lights/e8_rlightb2.tga
@@ -115,15 +117,16 @@ textures/evil8_lights/e8_rlightb2
 		map textures/evil8_lights/e8_rlightb2.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8_rlightb2.blend.tga
 		blendfunc add
 	}
 }
+
 textures/evil8_lights/e8_rlightb
 {
 	qer_editorimage textures/evil8_lights/e8_rlightb.tga
@@ -134,9 +137,9 @@ textures/evil8_lights/e8_rlightb
 		map textures/evil8_lights/e8_rlightb.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8_rlightb.blend.tga
@@ -154,9 +157,9 @@ textures/evil8_lights/evil8_rlight
 		map textures/evil8_lights/e8_rlight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8_rlight.blend.tga
@@ -174,9 +177,9 @@ textures/evil8_lights/e8tmtllight
 		map textures/evil8_lights/e8tmtllight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8tmtllight.blend.tga
@@ -194,9 +197,9 @@ textures/evil8_lights/e8tmtllight2
 		map textures/evil8_lights/e8tmtllight2.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8tmtllight2.blend.tga
@@ -214,9 +217,9 @@ textures/evil8_lights/e8tmtllight2b
 		map textures/evil8_lights/e8tmtllight2b.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8tmtllight2b.blend.tga
@@ -234,10 +237,10 @@ textures/evil8_grate/e8xgirder_small2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -275,9 +278,9 @@ textures/evil8_trim/e8lighttrim_static
 		map textures/evil8_trim/e8lighttrim.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8lighttrim.blend.tga
@@ -294,14 +297,14 @@ textures/evil8_trim/e8lighttrim_glow
 		map textures/evil8_trim/e8lighttrim.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8lighttrim.blend.tga
 		blendfunc add
-		rgbGen wave sawtooth 0.2 1 1 0.2 
+		rgbGen wave sawtooth 0.2 1 1 0.2
 	}
 }
 
@@ -314,9 +317,9 @@ textures/evil8_trim/e8lighttrim_b_static
 		map textures/evil8_trim/e8lighttrim_b.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8lighttrim_b.blend.tga
@@ -333,14 +336,14 @@ textures/evil8_trim/e8lighttrim_b_glow
 		map textures/evil8_trim/e8lighttrim_b.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8lighttrim_b.blend.tga
 		blendfunc add
-		rgbGen wave sawtooth 0.2 1 1 0.2 
+		rgbGen wave sawtooth 0.2 1 1 0.2
 	}
 }
 
@@ -360,10 +363,10 @@ textures/evil8_fx/e8jumpspawn02
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -383,10 +386,10 @@ textures/evil8_fx/e8jumpspawn02b
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -406,10 +409,10 @@ textures/evil8_fx/e8jumpspawn02c
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -431,13 +434,13 @@ textures/evil8_fx/e8_launchpad1
 	{
 		map textures/evil8_fx/e8_launchpad1.blend.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 2 1 2 
+		rgbGen wave triangle 0.2 2 1 2
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -480,10 +483,10 @@ textures/evil8_grate/e8xgirder
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -498,10 +501,10 @@ textures/evil8_grate/e8xgirder_small
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -519,10 +522,10 @@ textures/evil8_trim/e8mtltrim2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -540,10 +543,10 @@ textures/evil8_trim/e8wrntrim2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -561,10 +564,10 @@ textures/evil8_trim/e8mtltrim2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -581,10 +584,10 @@ textures/evil8_grate/e8bgrate01
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -601,10 +604,10 @@ textures/evil8_fx/e8rail
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -618,7 +621,7 @@ textures/evil8_fx/e8icon_red
 	{
 		map textures/evil8_fx/e8icon_red.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.2 
+		rgbGen wave triangle 0.2 0.5 0 0.2
 	}
 }
 
@@ -631,7 +634,7 @@ textures/evil8_fx/e8icon_blue
 	{
 		map textures/evil8_fx/e8icon_blue.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.2 
+		rgbGen wave triangle 0.2 0.5 0 0.2
 	}
 }
 
@@ -685,7 +688,7 @@ textures/evil8_fx/e8circle_red_fade
 	{
 		map textures/evil8_fx/e8circle_red.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.5 
+		rgbGen wave triangle 0.2 0.5 0 0.5
 	}
 }
 
@@ -699,7 +702,7 @@ textures/evil8_fx/e8circle_blue_fade
 	{
 		map textures/evil8_fx/e8circle_blue.tga
 		blendfunc add
-		rgbGen wave triangle 0.2 0.5 0 0.5 
+		rgbGen wave triangle 0.2 0.5 0 0.5
 	}
 }
 
@@ -718,10 +721,10 @@ textures/evil8_fx/e8spawn01b
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -730,9 +733,9 @@ textures/evil8_trim/e8trim_bluefx
 	q3map_lightimage textures/e8trim/evil8_trimfx_b.tga
 	q3map_surfacelight 100
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8trim_bluefx.tga
@@ -751,9 +754,9 @@ textures/evil8_trim/e8trim_redfx
 	q3map_lightimage textures/evil8_trim/e8trimfx_r.tga
 	q3map_surfacelight 100
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8trim_redfx.tga
@@ -790,9 +793,9 @@ textures/evil8_lights/e8tinylight
 		map textures/evil8_lights/e8tinylight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8tinylight.blend.tga
@@ -809,9 +812,9 @@ textures/evil8_lights/e8tinylightblue
 		map textures/evil8_lights/e8tinylightblue.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8tinylightblue.blend.tga
@@ -857,7 +860,7 @@ textures/evil8_base/e8metal03c_shiney
 	{
 		map textures/effects/tinfx.tga
 		rgbGen identity
-		tcGen environment 
+		tcGen environment
 	}
 	{
 		map textures/evil8_base/e8metal03c.tga
@@ -865,10 +868,10 @@ textures/evil8_base/e8metal03c_shiney
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -878,7 +881,7 @@ textures/evil8_base/e8metal_blue_shiney
 	{
 		map textures/effects/tinfx.tga
 		rgbGen identity
-		tcGen environment 
+		tcGen environment
 	}
 	{
 		map textures/evil8_base/e8metal_blue.tga
@@ -886,10 +889,10 @@ textures/evil8_base/e8metal_blue_shiney
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -899,7 +902,7 @@ textures/evil8_base/e8metal_red_shiney
 	{
 		map textures/effects/tinfx.tga
 		rgbGen identity
-		tcGen environment 
+		tcGen environment
 	}
 	{
 		map textures/evil8_base/e8metal_red.tga
@@ -907,10 +910,10 @@ textures/evil8_base/e8metal_red_shiney
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc gl_dst_color gl_one_minus_dst_alpha
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 }
 
@@ -920,9 +923,9 @@ textures/evil8_trim/e8trimlight
 	q3map_lightimage textures/evil8_trim/e8trimlight_fx.tga
 	q3map_surfacelight 100
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8trimlight.tga
@@ -945,9 +948,9 @@ textures/evil8_trim/e8trimlight2_blue
 		map textures/evil8_trim/e8trimlight2_blue.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8trimlight2_blue.blend.tga
@@ -965,9 +968,9 @@ textures/evil8_trim/e8trimlight2_red
 		map textures/evil8_trim/e8trimlight2_red.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_trim/e8trimlight2_red.blend.tga
@@ -976,7 +979,6 @@ textures/evil8_trim/e8trimlight2_red
 	}
 }
 
-
 //===========================//
 //=======floor sounds========//
 //===========================//
@@ -995,6 +997,7 @@ textures/evil8_floor/e8clangfloor
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor01
 {
 	surfaceparm metalsteps
@@ -1039,6 +1042,7 @@ textures/evil8_floor/e8clangfloor04
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor04_blue
 {
 	surfaceparm metalsteps
@@ -1053,6 +1057,7 @@ textures/evil8_floor/e8clangfloor04_blue
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor04_red
 {
 	surfaceparm metalsteps
@@ -1067,6 +1072,7 @@ textures/evil8_floor/e8clangfloor04_red
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor04b
 {
 	surfaceparm metalsteps
@@ -1081,6 +1087,7 @@ textures/evil8_floor/e8clangfloor04b
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor04warn
 {
 	surfaceparm metalsteps
@@ -1095,6 +1102,7 @@ textures/evil8_floor/e8clangfloor04warn
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor04warn2
 {
 	surfaceparm metalsteps
@@ -1109,6 +1117,7 @@ textures/evil8_floor/e8clangfloor04warn2
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor05
 {
 	surfaceparm metalsteps
@@ -1123,6 +1132,7 @@ textures/evil8_floor/e8clangfloor05
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor05b
 {
 	surfaceparm metalsteps
@@ -1137,6 +1147,7 @@ textures/evil8_floor/e8clangfloor05b
 		rgbGen identity
 	}
 }
+
 textures/evil8_floor/e8clangfloor05c
 {
 	surfaceparm metalsteps
@@ -1150,8 +1161,4 @@ textures/evil8_floor/e8clangfloor05c
 		blendfunc filter
 		rgbGen identity
 	}
-}
-
-//===========================//
-//===========================//
-//===========================//
+}
\ No newline at end of file
diff --git a/data/scripts/harlequin_sky.shader b/data/scripts/harlequin_sky.shader
index 02fb08773..1efa569c5 100644
--- a/data/scripts/harlequin_sky.shader
+++ b/data/scripts/harlequin_sky.shader
@@ -173,5 +173,4 @@ textures/harlequin_sky/jf-palace_noglow
 	skyparms textures/harlequin_sky/env/palace - -
 }
 
-//   ---stop cutting here---
-
+//   ---stop cutting here---
\ No newline at end of file
diff --git a/data/scripts/kaznexctf2.shader b/data/scripts/kaznexctf2.shader
index 6851f7b9b..f1048a2e0 100644
--- a/data/scripts/kaznexctf2.shader
+++ b/data/scripts/kaznexctf2.shader
@@ -5,7 +5,6 @@ textures/kaznexctf2/small_blue
 	q3map_surfacelight 500
 	q3map_lightsubdivide 128
 	surfaceparm nomarks
-
 	{
 		map textures/kaznexctf2/small_blue.tga
 	}
@@ -26,7 +25,6 @@ textures/kaznexctf2/small_red
 	q3map_surfacelight 500
 	q3map_lightsubdivide 128
 	surfaceparm nomarks
-
 	{
 		map textures/kaznexctf2/small_red.tga
 	}
@@ -47,7 +45,6 @@ textures/kaznexctf2/large_blue
 	q3map_surfacelight 500
 	q3map_lightsubdivide 128
 	surfaceparm nomarks
-
 	{
 		map textures/kaznexctf2/large_blue.tga
 	}
@@ -68,7 +65,6 @@ textures/kaznexctf2/large_red
 	q3map_surfacelight 500
 	q3map_lightsubdivide 128
 	surfaceparm nomarks
-
 	{
 		map textures/kaznexctf2/large_red.tga
 	}
@@ -88,7 +84,6 @@ textures/kaznexctf2/long_light
 	q3map_lightimage textures/kaznexctf2/long_light_glow.tga
 	q3map_surfacelight 1500
 	surfaceparm nomarks
-
 	{
 		map textures/kaznexctf2/long_light.tga
 	}
@@ -108,7 +103,6 @@ textures/kaznexctf2/small_light
 	q3map_lightimage textures/kaznexctf2/small_light_glow.tga
 	q3map_surfacelight 1500
 	surfaceparm nomarks
-
 	{
 		map textures/kaznexctf2/small_light.tga
 	}
@@ -137,10 +131,10 @@ textures/kaznexctf2/grate
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -160,10 +154,10 @@ textures/kaznexctf2/grate2
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
\ No newline at end of file
diff --git a/data/scripts/liquids.shader b/data/scripts/liquids.shader
index 315c72d0c..8058fc604 100644
--- a/data/scripts/liquids.shader
+++ b/data/scripts/liquids.shader
@@ -2,22 +2,18 @@
 //Water for Q3texture, temp use.
 //This shader is for DarkPlaces Engine - Nexuiz
 textures/liquids/clear_ripple3
-{ 
+{
 	qer_editorimage textures/water/pool3d_5e.jpg
-      qer_trans 0.5
-	
+	qer_trans 0.5
 	surfaceparm trans
 	surfaceparm nonsolid
-      surfaceparm water
-	
+	surfaceparm water
 	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
-
-      {
+	{
 		map textures/water/pool3d_5e.jpg
-            blendFunc add
-            rgbGen identity
+		blendFunc add
+		rgbGen identity
 	}
-}
-
+}
\ No newline at end of file
diff --git a/data/scripts/nexdm18_rmx.shader b/data/scripts/nexdm18_rmx.shader
index 8d5a5c41a..6a2030ea1 100644
--- a/data/scripts/nexdm18_rmx.shader
+++ b/data/scripts/nexdm18_rmx.shader
@@ -1,36 +1,30 @@
 textures/skies/nex18_rmx
 {
 	qer_editorimage env/stralenex5/b_sky_up.tga
-
 	surfaceparm nolightmap
 	surfaceparm noimpact
 	surfaceparm nomarks
 	surfaceparm sky
-
 	skyparms env/stralenex5/b_sky - -
 	q3map_surfacelight 100
 	q3map_lightimage textures/stralenex5/b_sky_up.tga
 	q3map_sun .69 .75 .97 160 0 90
-
 }
 
 textures/stralenex1/stralenex5_fakesky
-{ 
+{
 	qer_editorimage textures/stralenex1/stralenex5_fakesky.tga
-      qer_trans 0.5
-	
+	qer_trans 0.5
 	surfaceparm trans
 	surfaceparm nonsolid
-      surfaceparm water
-	
+	surfaceparm water
 	//	<div><func><base><amplitude><phase><freq>
 	deformVertexes wave 8000.0 sin 64 1000 0 5
 	Q3map_TessSize 128
 	cull none
-
-      {
+	{
 		map textures/stralenex1/stralenex5_fakesky.tga
-            blendFunc add
-            rgbGen identity
+		blendFunc add
+		rgbGen identity
 	}
 }
\ No newline at end of file
diff --git a/data/scripts/official_cmp1.shader b/data/scripts/official_cmp1.shader
index 73e6f9ae3..ff21cef07 100644
--- a/data/scripts/official_cmp1.shader
+++ b/data/scripts/official_cmp1.shader
@@ -16,7 +16,6 @@ textures/amethyst7/purplenebula-cmp1/purplenebula_skybox
 	skyparms env/amethyst7/purplenebula-cmp1/purplenebula - -
 }
 
-
 //****************************************************//
 //									//
 //	The rest are modified from Evil_Lair's		//
@@ -24,7 +23,6 @@ textures/amethyst7/purplenebula-cmp1/purplenebula_skybox
 //									//
 //****************************************************//
 
-
 textures/cmp1-dm8/e8trimlight2_pur
 {
 	qer_editorimage textures/cmp1-dm8/e8trimlight2_pur.tga
@@ -34,14 +32,14 @@ textures/cmp1-dm8/e8trimlight2_pur
 		map textures/cmp1-dm8/e8trimlight2_pur.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/cmp1-dm8/e8trimlight2_pur.blend.tga
 		blendfunc add
-		rgbGen wave sin 0.7 0.2 0 0.3 
+		rgbGen wave sin 0.7 0.2 0 0.3
 	}
 }
 
@@ -54,14 +52,14 @@ textures/cmp1-dm8/e8tinylightpur
 		map textures/cmp1-dm8/e8tinylightpur.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/cmp1-dm8/e8tinylightpur.blend.tga
 		blendfunc add
-		rgbGen wave noise 0.5 0.3 0 0.2 
+		rgbGen wave noise 0.5 0.3 0 0.2
 	}
 }
 
@@ -74,14 +72,14 @@ textures/cmp1-dm8/e8lighttrim_b_pur
 		map textures/cmp1-dm8/e8lighttrim_pur.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/cmp1-dm8/e8lighttrim_pur.blend.tga
 		blendfunc add
-		rgbGen wave sin 0.4 0.2 0 0.2 
+		rgbGen wave sin 0.4 0.2 0 0.2
 	}
 }
 
@@ -94,14 +92,14 @@ textures/cmp1-dm8/e8lighttrim_pur
 		map textures/cmp1-dm8/e8lighttrim_p.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/cmp1-dm8/e8lighttrim_p.blend.tga
 		blendfunc add
-		rgbGen wave sin 0.4 0.2 0 0.2 
+		rgbGen wave sin 0.4 0.2 0 0.2
 	}
 }
 
@@ -117,7 +115,7 @@ textures/cmp1-dm8/e8circle_pur
 	{
 		clampmap textures/cmp1-dm8/e8circle_pur.tga
 		blendfunc blend
-		rgbGen wave sin 0.9 0.2 0 0.5 
+		rgbGen wave sin 0.9 0.2 0 0.5
 		tcMod rotate 45
 	}
 }
@@ -126,9 +124,9 @@ textures/cmp1-dm8/e8clangfloor
 {
 	surfaceparm metalsteps
 	{
-		map $lightmap 
+		map $lightmap
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/cmp1-dm8/e8clangfloor.tga
@@ -146,7 +144,7 @@ textures/cmp1-dm8/logo
 	{
 		map textures/cmp1-dm8/logo.tga
 		blendfunc add
-		rgbGen wave sin 0.9 0.2 0 0.2 
+		rgbGen wave sin 0.9 0.2 0 0.2
 	}
 }
 
@@ -180,12 +178,11 @@ textures/cmp1-dm8/ame7glass
 	{
 		map textures/cmp1-dm8/ame7light.tga
 		blendfunc add
-		tcGen environment 
+		tcGen environment
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
-}
-
+}
\ No newline at end of file
diff --git a/data/scripts/reaper.shader b/data/scripts/reaper.shader
index 26871178a..1dcfb257c 100644
--- a/data/scripts/reaper.shader
+++ b/data/scripts/reaper.shader
@@ -1,545 +1,525 @@
-// H.Reaper Q3Shader File V 1.5
-
-//Multisampling & High Lightmap resolution
-textures/Reaptxt/Notext
-{
-qer_editorimage textures/Reaptxt/Notext.jpg
-q3map_lightmapSampleSize 1
-       {
-	map textures/Reaptxt/Notext.jpg
-	rgbGen identity
-       }
-       {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-       }
-       {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-       }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaptxt/solsjrA
-{
-qer_editorimage textures/Reaptxt/solsjrA.tga
-q3map_lightmapSampleSize 1
-       {
-	map textures/Reaptxt/solsjrA.tga
-	rgbGen identity
-       }
-       {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-       }
-       {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-       }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaptxt/p1sjr
-{
-qer_editorimage textures/Reaptxt/p1sjr.jpg
-q3map_lightmapSampleSize 1
-       {
-	map textures/Reaptxt/p1sjr.jpg
-	rgbGen identity
-       }
-       {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-       }
-       {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-       }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaptxt/frizsjr
-{
-qer_editorimage textures/Reaptxt/frizsjr.jpg
-q3map_lightmapSampleSize 1
-       {
-	map textures/Reaptxt/frizsjr.jpg
-	rgbGen identity
-       }
-       {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-       }
-       {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-       }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaptxt/p1chbr
-{
-qer_editorimage textures/Reaptxt/p1chbr.jpg
-q3map_lightmapSampleSize 1
-       {
-	map textures/Reaptxt/p1chbr.jpg
-	rgbGen identity
-       }
-       {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-       }
-       {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-       }
-}
-
-//Multisampling, BumpMapping Lightmap Emulation & High Lightmap resolution
-textures/Reaptxt/tuilestoit
-{
-qer_editorimage textures/Reaptxt/tuilestoit.tga
-q3map_lightmapSampleSize 1
-q3map_normalimage textures/Reaptxt/tuilestoit_norm.tga
-       {
-	map textures/Reaptxt/tuilestoit.tga
-	rgbGen identity
-       }
-       {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-       }
-       {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-       }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaptxt/murext
-{
-qer_editorimage textures/Reaptxt/murext.tga
-q3map_lightmapSampleSize 1
-       {
-	map textures/Reaptxt/murext.tga
-	rgbGen identity
-       }
-       {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-       }
-       {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-       }
-}
-
-//Multisampling, BumpMapping Lightmap Emulation & High Lightmap resolution
-textures/Reaptxt/brownstone
-{
-qer_editorimage textures/Reaptxt/brownstone.jpg
-q3map_lightmapSampleSize 1
-q3map_normalImage textures/Reaptxt/brownstone_norm.jpg
-
-	  {
-	 map textures/Reaptxt/brownstone.jpg
-	 rgbGen identity
-	  }
-	  {
-	 map textures/Reaptxt/detail.jpg
-	 blendfunc gl_dst_color gl_src_color
-	 rgbGen identity
-	 tcMod scale 2 2
-	  }
-        {
-	 map $lightmap
-	 blendfunc filter
-	 rgbGen identity
-	 tcGen lightmap
-	  }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaptxt/Notext2
-{
-qer_editorimage textures/Reaptxt/Notext2.jpg
-q3map_lightmapSampleSize 1
-      {
-	map textures/Reaptxt/Notext2.jpg
-	rgbGen identity
-      }
-      {
-	map textures/Reaptxt/detail.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-      }
-      {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-      }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaper_dirt/grass7
-{
-qer_editorimage textures/Reaper_dirt/grass7.jpg
-q3map_lightmapSampleSize 1
-      {
-	map textures/Reaper_dirt/grass7.jpg
-	rgbGen identity
-      }
-      {
-	map textures/Reaper_dirt/grass7.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-      }
-      {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-      }
-}
-
-//Multisampling & High Lightmap resolution
-textures/Reaper_dirt/grass8
-{
-qer_editorimage textures/Reaper_dirt/grass8.jpg
-q3map_lightmapSampleSize 1
-      {
-	map textures/Reaper_dirt/grass8.jpg
-	rgbGen identity
-      }
-      {
-	map textures/Reaper_dirt/grass8.jpg
-	blendfunc gl_dst_color gl_src_color
-	rgbGen identity
-	tcMod scale 2 2
-      }
-      {
-	map $lightmap 
-	blendfunc filter
-	rgbGen identity
-	tcGen lightmap 
-      }
-}
-
-//Corona Shader, texture by HipShot
-textures/Reaptxt/HSglow01
-{ 
-qer_editorimage textures/Reaptxt/HSglow01.jpg
-      surfaceparm trans
-	surfaceparm nonsolid
-      cull disable	
-      surfaceparm nomarks	
-      surfaceparm nolightmap 
-      deformVertexes autosprite
-
-      {
-		clampmap textures/Reaptxt/HSglow01.jpg
-		tcMod stretch sin .8 0.2 0 .2
-		tcmod rotate 5
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//EnvBox Shader, EnvBox by HipShot
-textures/Reaptxt/rnorm
-{
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	q3map_sunExt 1 .5 0 75 350 20 2 16
-	q3map_skyLight 135 4
-	qer_editorimage textures/Reaptxt/rnorm.jpg
-	skyparms textures/Reaptxt/env/restnormal - -
-}
-
-//Fog Shader
-textures/Reaptxt/fog_restdusk
-{
-qer_editorimage textures/Reaptxt/fog_restdusk.jpg
-		surfaceparm	trans
-		surfaceparm	nonsolid
-		surfaceparm	fog
-		surfaceparm	nolightmap
-		fogparms ( .177 .173 .21 ) 128
-
-}
-
-//Fog Shader
-textures/Reaptxt/fog_restnormal
-{
-qer_editorimage textures/Reaptxt/fog_restnormal.jpg
-		surfaceparm	trans
-		surfaceparm	nonsolid
-		surfaceparm	fog
-		surfaceparm	nolightmap
-		fogparms ( .997 .985 .863 ) 1024
-}
-
-//Corona Shader, texture by HipShot
-textures/Reaptxt/sun
-{ 
-qer_editorimage textures/Reaptxt/sun.jpg
-        cull disable
-	  surfaceparm nonsolid	
-        surfaceparm nomarks	
-        surfaceparm nolightmap 
-        deformVertexes autosprite
-
-        {
-		clampmap textures/Reaptxt/sun.jpg
-            //    tcMod stretch sin .2 0.2 0 .2
-            tcmod rotate 5
-            blendFunc add
-            rgbGen identity
-	  }
-}
-
-//Alpha Channel, Texture by Lud
-textures/research_detail/lud_atomic.tga
-{
-		qer_editorimage textures/research_detail/lud_atomic.tga
-		qer_trans 0.5
-		cull none
-            surfaceparm playerclip
-	{
-		map textures/research_detail/lud_atomic.tga
-            blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-            rgbGen vertex
-      }
-
-}
-
-//Volumetric Shadow
-textures/shad/shad
-{
-	qer_editorimage textures/shad/shad.tga
-	surfaceparm alphashadow
-	surfaceparm nolightmap
-	surfaceparm nonsolid
-	surfaceparm trans
-	{
-		map *default
-		alphaFunc GT0
-		alphagen const 0.0
-	}
-}
-
-//Corona for lud_Corona.tga
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/Reaptxt/lud_Corona
-{ 
-	qer_editorimage textures/Reaptxt/lud_Corona.tga
-      surfaceparm trans
-	surfaceparm nonsolid	
-      surfaceparm nolightmap 
-      deformVertexes autosprite
-	cull disable
-
-      {
-		clampmap textures/Reaptxt/lud_Corona.jpg
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//Corona for sun.tga by HipShot
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/Reaptxt/lud_Corona
-{ 
-	qer_editorimage textures/Reaptxt/sun.jpg
-      surfaceparm trans
-	surfaceparm nonsolid	
-      surfaceparm nolightmap 
-      deformVertexes autosprite
-	cull disable
-
-      {
-		clampmap textures/Reaptxt/sun.jpg
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//Water for Q3texture, temp use.
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/water/pool3d_5e
-{ 
-	qer_editorimage textures/water/pool3d_5e.jpg
-      qer_trans 0.5
-	
-	surfaceparm trans
-	surfaceparm nonsolid
-      surfaceparm water
-	
-	deformVertexes wave 150.0 sin 2 5 0.25 0.1
-	Q3map_TessSize 128
-	cull none
-
-      {
-		map textures/water/pool3d_5e.jpg
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//Water for Q3texture, temp use.
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/liquids/slime1
-{ 
-	qer_editorimage textures/liquids/slime1.jpg
-      qer_trans 0.5
-	
-	surfaceparm trans
-	surfaceparm nonsolid
-      surfaceparm slime
-	
-	deformVertexes wave 150.0 sin 2 5 0.25 0.1
-	Q3map_TessSize 128
-	cull none
-
-      {
-		map textures/liquids/slime1.jpg
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-textures/liquids/protolava
-{ 
-	qer_editorimage textures/liquids/protolava.jpg
-      qer_trans 0.5
-	
-	surfaceparm trans
-	surfaceparm nonsolid
-      surfaceparm lava
-	
-	deformVertexes wave 150.0 sin 2 5 0.25 0.1
-	Q3map_TessSize 128
-	cull none
-
-      {
-		map textures/liquids/protolava.jpg
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//Corona for HRglow01.tga
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/Reaptxt/HRglow01
-{ 
-	qer_editorimage textures/Reaptxt/HRglow01.tga
-      surfaceparm trans
-	surfaceparm nonsolid	
-      surfaceparm nolightmap 
-      deformVertexes autosprite
-	cull disable
-
-      {
-		clampmap textures/Reaptxt/HRglow01.tga
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//Corona for HRglow02.tga
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/Reaptxt/HRglow02
-{ 
-	qer_editorimage textures/Reaptxt/HRglow02.tga
-      surfaceparm trans
-	surfaceparm nonsolid	
-      surfaceparm nolightmap 
-      deformVertexes autosprite
-	cull disable
-
-      {
-		clampmap textures/Reaptxt/HRglow02.tga
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//Corona for HRglow03.tga
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/Reaptxt/HRglow03
-{ 
-	qer_editorimage textures/Reaptxt/HRglow03.tga
-      surfaceparm trans
-	surfaceparm nonsolid	
-      surfaceparm nolightmap 
-      deformVertexes autosprite
-	cull disable
-
-      {
-		clampmap textures/Reaptxt/HRglow03.tga
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//Corona for HRsun01.tga
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/Reaptxt/HRsun01
-{ 
-	qer_editorimage textures/Reaptxt/HRsun01.tga
-      surfaceparm trans
-	surfaceparm nonsolid	
-      surfaceparm nolightmap 
-      deformVertexes autosprite
-	cull disable
-
-      {
-		clampmap textures/Reaptxt/HRsun01.tga
-            blendFunc add
-            rgbGen identity
-	}
-}
-
-//EnvBox Shader, EnvBox by H.Reaper
-textures/Reaptxt/HRSky
-{
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	surfaceparm sky
-	surfaceparm nomarks
-	q3map_sunExt 0 .7 3 10 360 80 2 16
-	q3map_skyLight 50 3
-	qer_editorimage textures/Reaptxt/HRSky.jpg
-	skyparms env/rsky - -
+// H.Reaper Q3Shader File V 1.5
+
+//Multisampling & High Lightmap resolution
+textures/Reaptxt/Notext
+{
+	qer_editorimage textures/Reaptxt/Notext.jpg
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaptxt/Notext.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaptxt/solsjrA
+{
+	qer_editorimage textures/Reaptxt/solsjrA.tga
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaptxt/solsjrA.tga
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaptxt/p1sjr
+{
+	qer_editorimage textures/Reaptxt/p1sjr.jpg
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaptxt/p1sjr.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaptxt/frizsjr
+{
+	qer_editorimage textures/Reaptxt/frizsjr.jpg
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaptxt/frizsjr.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaptxt/p1chbr
+{
+	qer_editorimage textures/Reaptxt/p1chbr.jpg
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaptxt/p1chbr.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling, BumpMapping Lightmap Emulation & High Lightmap resolution
+textures/Reaptxt/tuilestoit
+{
+	qer_editorimage textures/Reaptxt/tuilestoit.tga
+	q3map_lightmapSampleSize 1
+	q3map_normalimage textures/Reaptxt/tuilestoit_norm.tga
+	{
+		map textures/Reaptxt/tuilestoit.tga
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaptxt/murext
+{
+	qer_editorimage textures/Reaptxt/murext.tga
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaptxt/murext.tga
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling, BumpMapping Lightmap Emulation & High Lightmap resolution
+textures/Reaptxt/brownstone
+{
+	qer_editorimage textures/Reaptxt/brownstone.jpg
+	q3map_lightmapSampleSize 1
+	q3map_normalImage textures/Reaptxt/brownstone_norm.jpg
+	{
+		map textures/Reaptxt/brownstone.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaptxt/Notext2
+{
+	qer_editorimage textures/Reaptxt/Notext2.jpg
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaptxt/Notext2.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaptxt/detail.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaper_dirt/grass7
+{
+	qer_editorimage textures/Reaper_dirt/grass7.jpg
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaper_dirt/grass7.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaper_dirt/grass7.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Multisampling & High Lightmap resolution
+textures/Reaper_dirt/grass8
+{
+	qer_editorimage textures/Reaper_dirt/grass8.jpg
+	q3map_lightmapSampleSize 1
+	{
+		map textures/Reaper_dirt/grass8.jpg
+		rgbGen identity
+	}
+	{
+		map textures/Reaper_dirt/grass8.jpg
+		blendfunc gl_dst_color gl_src_color
+		rgbGen identity
+		tcMod scale 2 2
+	}
+	{
+		map $lightmap
+		blendfunc filter
+		rgbGen identity
+		tcGen lightmap
+	}
+}
+
+//Corona Shader, texture by HipShot
+textures/Reaptxt/HSglow01
+{
+	qer_editorimage textures/Reaptxt/HSglow01.jpg
+	surfaceparm trans
+	surfaceparm nonsolid
+	cull disable
+	surfaceparm nomarks
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	{
+		clampmap textures/Reaptxt/HSglow01.jpg
+		tcMod stretch sin .8 0.2 0 .2
+		tcmod rotate 5
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//EnvBox Shader, EnvBox by HipShot
+textures/Reaptxt/rnorm
+{
+	surfaceparm noimpact
+	surfaceparm nolightmap
+	q3map_sunExt 1 .5 0 75 350 20 2 16
+	q3map_skyLight 135 4
+	qer_editorimage textures/Reaptxt/rnorm.jpg
+	skyparms textures/Reaptxt/env/restnormal - -
+}
+
+//Fog Shader
+textures/Reaptxt/fog_restdusk
+{
+	qer_editorimage textures/Reaptxt/fog_restdusk.jpg
+	surfaceparm	trans
+	surfaceparm	nonsolid
+	surfaceparm	fog
+	surfaceparm	nolightmap
+	fogparms ( .177 .173 .21 ) 128
 }
+
+//Fog Shader
+textures/Reaptxt/fog_restnormal
+{
+	qer_editorimage textures/Reaptxt/fog_restnormal.jpg
+	surfaceparm	trans
+	surfaceparm	nonsolid
+	surfaceparm	fog
+	surfaceparm	nolightmap
+	fogparms ( .997 .985 .863 ) 1024
+}
+
+//Corona Shader, texture by HipShot
+textures/Reaptxt/sun
+{
+	qer_editorimage textures/Reaptxt/sun.jpg
+	cull disable
+	surfaceparm nonsolid
+	surfaceparm nomarks
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	{
+		clampmap textures/Reaptxt/sun.jpg
+		//    tcMod stretch sin .2 0.2 0 .2
+		tcmod rotate 5
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Alpha Channel, Texture by Lud
+textures/research_detail/lud_atomic.tga
+{
+	qer_editorimage textures/research_detail/lud_atomic.tga
+	qer_trans 0.5
+	cull none
+	surfaceparm playerclip
+	{
+		map textures/research_detail/lud_atomic.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbGen vertex
+	}
+}
+
+//Volumetric Shadow
+textures/shad/shad
+{
+	qer_editorimage textures/shad/shad.tga
+	surfaceparm alphashadow
+	surfaceparm nolightmap
+	surfaceparm nonsolid
+	surfaceparm trans
+	{
+		map *default
+		alphaFunc GT0
+		alphagen const 0.0
+	}
+}
+
+//Corona for lud_Corona.tga
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/Reaptxt/lud_Corona
+{
+	qer_editorimage textures/Reaptxt/lud_Corona.tga
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	cull disable
+	{
+		clampmap textures/Reaptxt/lud_Corona.jpg
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Corona for sun.tga by HipShot
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/Reaptxt/lud_Corona
+{
+	qer_editorimage textures/Reaptxt/sun.jpg
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	cull disable
+	{
+		clampmap textures/Reaptxt/sun.jpg
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Water for Q3texture, temp use.
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/water/pool3d_5e
+{
+	qer_editorimage textures/water/pool3d_5e.jpg
+	qer_trans 0.5
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm water
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/water/pool3d_5e.jpg
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Water for Q3texture, temp use.
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/liquids/slime1
+{
+	qer_editorimage textures/liquids/slime1.jpg
+	qer_trans 0.5
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/liquids/slime1.jpg
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+textures/liquids/protolava
+{
+	qer_editorimage textures/liquids/protolava.jpg
+	qer_trans 0.5
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm lava
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/liquids/protolava.jpg
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Corona for HRglow01.tga
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/Reaptxt/HRglow01
+{
+	qer_editorimage textures/Reaptxt/HRglow01.tga
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	cull disable
+	{
+		clampmap textures/Reaptxt/HRglow01.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Corona for HRglow02.tga
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/Reaptxt/HRglow02
+{
+	qer_editorimage textures/Reaptxt/HRglow02.tga
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	cull disable
+	{
+		clampmap textures/Reaptxt/HRglow02.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Corona for HRglow03.tga
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/Reaptxt/HRglow03
+{
+	qer_editorimage textures/Reaptxt/HRglow03.tga
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	cull disable
+	{
+		clampmap textures/Reaptxt/HRglow03.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//Corona for HRsun01.tga
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/Reaptxt/HRsun01
+{
+	qer_editorimage textures/Reaptxt/HRsun01.tga
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm nolightmap
+	deformVertexes autosprite
+	cull disable
+	{
+		clampmap textures/Reaptxt/HRsun01.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+//EnvBox Shader, EnvBox by H.Reaper
+textures/Reaptxt/HRSky
+{
+	surfaceparm noimpact
+	surfaceparm nolightmap
+	surfaceparm sky
+	surfaceparm nomarks
+	q3map_sunExt 0 .7 3 10 360 80 2 16
+	q3map_skyLight 50 3
+	qer_editorimage textures/Reaptxt/HRSky.jpg
+	skyparms env/rsky - -
+}
\ No newline at end of file
diff --git a/data/scripts/sav-graysky1.shader b/data/scripts/sav-graysky1.shader
index b83b842ce..756552f5b 100644
--- a/data/scripts/sav-graysky1.shader
+++ b/data/scripts/sav-graysky1.shader
@@ -1,28 +1,35 @@
 textures/sav-graysky1/sav-graysky1_skybox
 {
-qer_editorimage env/med-troubadour-gray/med-troubadour-gray_up.tga
-surfaceparm noimpact
-surfaceparm nolightmap
-surfaceparm sky
-surfaceparm nomarks
-q3map_sun .5 .5 .7 200 0 90
-q3map_surfacelight 300
-
-skyparms env/med-troubadour-gray/med-troubadour-gray - -
-
+	qer_editorimage env/med-troubadour-gray/med-troubadour-gray_up.tga
+	surfaceparm noimpact
+	surfaceparm nolightmap
+	surfaceparm sky
+	surfaceparm nomarks
+	q3map_sun .5 .5 .7 200 0 90
+	q3map_surfacelight 300
+	skyparms env/med-troubadour-gray/med-troubadour-gray - -
 }
 
-
 textures/sav-graysky1/sav-graysky2_skybox
 {
-qer_editorimage env/med-troubadour-gray/med-troubadour-gray_up.tga
-surfaceparm noimpact
-surfaceparm nolightmap
-surfaceparm sky
-surfaceparm nomarks
-q3map_sun .5 .5 .7 50 0 90
-q3map_surfacelight 300
-
-skyparms env/med-troubadour-gray/med-troubadour-gray - -
-
+	qer_editorimage env/med-troubadour-gray/med-troubadour-gray_up.tga
+	surfaceparm noimpact
+	surfaceparm nolightmap
+	surfaceparm sky
+	surfaceparm nomarks
+	q3map_sun .5 .5 .7 50 0 90
+	q3map_surfacelight 300
+	skyparms env/med-troubadour-gray/med-troubadour-gray - -
 }
+
+textures/sav-graysky1/sav-graysky3lowerlight_skybox
+{
+	qer_editorimage env/med-troubadour-gray/med-troubadour-gray_up.tga
+	surfaceparm noimpact
+	surfaceparm nolightmap
+	surfaceparm sky
+	surfaceparm nomarks
+	q3map_sun .5 .5 .7 50 0 90
+	q3map_surfacelight 150
+	skyparms env/med-troubadour-gray/med-troubadour-gray - -
+}
\ No newline at end of file
diff --git a/data/scripts/sav-liquids.shader b/data/scripts/sav-liquids.shader
index 2c39001bb..b8a5d798e 100644
--- a/data/scripts/sav-liquids.shader
+++ b/data/scripts/sav-liquids.shader
@@ -1,38 +1,33 @@
-//Water for Q3texture, temp use.
-//This shader is for DarkPlaces Engine - Nexuiz
-textures/sav-liquids/slime1
-{ 
+//Water for Q3texture, temp use.
+//This shader is for DarkPlaces Engine - Nexuiz
+textures/sav-liquids/slime1
+{
 	qer_editorimage textures/liquids/slime1.jpg
-	qer_trans 0.5
-	
+	qer_trans 0.5
 	surfaceparm noimpact
-	surfaceparm trans
-	surfaceparm nonsolid
-	surfaceparm slime
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
 	q3map_surfacelight 250
-	
-	deformVertexes wave 150.0 sin 2 5 0.25 0.1
-	Q3map_TessSize 128
-	cull none
-
-      {
-	    map textures/liquids/slime1.jpg
-            blendFunc add
-            rgbGen identity
-	}
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/liquids/slime1.jpg
+		blendFunc add
+		rgbGen identity
+	}
 }
 
-textures/sav-liquids/glass_tube
-{ 
+textures/sav-liquids/glass_tube
+{
 	qer_editorimage textures/evil_basewall/mtl_gray.jpg
-	qer_trans 0.5
-	
-	cull none
+	qer_trans 0.5
+	cull none
 	surfaceparm trans
-
 	{
-		map textures/evil_basewall/mtl_gray.jpg
-		blendFunc add
-		rgbGen identity
-	}
-}
+		map textures/evil_basewall/mtl_gray.jpg
+		blendFunc add
+		rgbGen identity
+	}
+}
\ No newline at end of file
diff --git a/data/scripts/savdm6ish.shader b/data/scripts/savdm6ish.shader
index e026efba6..3dde56ef3 100644
--- a/data/scripts/savdm6ish.shader
+++ b/data/scripts/savdm6ish.shader
@@ -1,46 +1,55 @@
 textures/savdm6ish/#lava1
-	{
+{
 	qer_editorimage textures/savdm6ish/#lava1.jpg
 	#qer_nocarve
-	surfaceparm noimpact	
+	surfaceparm noimpact
 	surfaceparm lava
 	surfaceparm nolightmap
 	q3map_surfacelight 3000
 	cull disable
 	#tessSize 256
-	#deformVertexes wave 100sin 5 5 .5 0.02	
+	#deformVertexes wave 100sin 5 5 .5 0.02
 	{
-	map textures/savdm6ish/#lava1.jpg
+		map textures/savdm6ish/#lava1.jpg
 	}
 }
 
 textures/savdm6ish/#teleport
-	{
+{
 	qer_editorimage textures/savdm6ish/#teleport.jpg
 	qer_nocarve
-	surfaceparm noimpact	
+	surfaceparm noimpact
 	surfaceparm water
 	surfaceparm nolightmap
 	q3map_surfacelight 1000
 	cull disable
 	#tessSize 256
-	#deformVertexes wave 100sin 5 5 .5 0.02	
+	#deformVertexes wave 100sin 5 5 .5 0.02
 	{
-	map textures/savdm6ish/#teleport.jpg
+		map textures/savdm6ish/#teleport.jpg
 	}
 }
 
 textures/savdm6ish/wall14_5
+{
+	q3map_lightmapSampleSize 8
 	{
-        q3map_lightmapSampleSize 8
+		map textures/savdm6ish/wall14_5.jpg
+	}
 }
 
 textures/savdm6ish/wiz1_4
+{
+	q3map_lightmapSampleSize 8
 	{
-        q3map_lightmapSampleSize 8
+		map textures/savdm6ish/wiz1_4.jpg
+	}
 }
 
 textures/savdm6ish/floor01_5
+{
+	q3map_lightmapSampleSize 8
 	{
-        q3map_lightmapSampleSize 8
-}
+		map textures/savdm6ish/floor01_5.jpg
+	}
+}
\ No newline at end of file
diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt
index 60bea4162..8fb7bb8ff 100644
--- a/data/scripts/shaderlist.txt
+++ b/data/scripts/shaderlist.txt
@@ -1,6 +1,7 @@
 common
 toxic
 blacksky
+common
 dsi
 e7
 el3dm1
@@ -26,3 +27,4 @@ sav-liquids
 stralenex1
 swamp
 tznex01
+zenex1
diff --git a/data/scripts/stralenex1.shader b/data/scripts/stralenex1.shader
index 785e3c2f7..164805abd 100644
--- a/data/scripts/stralenex1.shader
+++ b/data/scripts/stralenex1.shader
@@ -8,15 +8,16 @@ textures/evil8_lights/e8minitrimlight
 		map textures/evil8_lights/e8minitrimlight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8minitrimlight.blend.tga
 		blendfunc add
 	}
 }
+
 textures/evil8_lights/e8tinylight2k
 {
 	qer_editorimage textures/evil8_lights/e8tinylight.tga
@@ -27,9 +28,9 @@ textures/evil8_lights/e8tinylight2k
 		map textures/evil8_lights/e8tinylight.tga
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8tinylight.blend.tga
@@ -49,9 +50,9 @@ textures/evil8_lights/e8tinylightblue2k
 		rgbGen identity
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
-		tcGen lightmap 
+		tcGen lightmap
 	}
 	{
 		map textures/evil8_lights/e8tinylightblue.blend.tga
@@ -60,43 +61,40 @@ textures/evil8_lights/e8tinylightblue2k
 }
 
 textures/stralenex1/light_tube_green
-{	 
+{
 	qer_editorimage textures/stralenex1/light_tube_green.tga
-        q3map_lightimage textures/stralenex1/light_tube_green_glow.tga 
-	q3map_surfacelight 1000	
+	q3map_lightimage textures/stralenex1/light_tube_green_glow.tga
+	q3map_surfacelight 1000
 	{
-		map textures/light_tube_green_glow.tga 
-		//blendfunc add 
-       tcmod scale 12 1  
-		rgbGen identity 
-		tcMod scroll 0 1 
-        
+		map textures/light_tube_green_glow.tga
+		//blendfunc add
+		tcmod scale 12 1
+		rgbGen identity
+		tcMod scroll 0 1
 	}
 	{
-		map textures/light_tube_green_glow.tga 
-		blendfunc add 
-       //tcmod scale 25 1   
-		rgbGen identity 
-		tcMod scroll 1 0 
-        
+		map textures/light_tube_green_glow.tga
+		blendfunc add
+		//tcmod scale 25 1
+		rgbGen identity
+		tcMod scroll 1 0
 	}
 	{
-		map textures/stralenex1/light_tube_green.tga 
-		blendfunc blend  
-		rgbGen identity 
+		map textures/stralenex1/light_tube_green.tga
+		blendfunc blend
+		rgbGen identity
 	}
 	{
-		map textures/stralenex1/light_tube_green_glow.tga 
-		blendfunc add 
-       tcmod scale 1 1  
+		map textures/stralenex1/light_tube_green_glow.tga
+		blendfunc add
+		tcmod scale 1 1
 	}
 	{
-		map $lightmap 
-		rgbGen identity 
-		blendfunc filter 
+		map $lightmap
+		rgbGen identity
+		blendfunc filter
 	}
-} 
-
+}
 
 textures/stralenex1/e8_bluestrip
 {
@@ -123,22 +121,19 @@ textures/stralenex1/e8_redstrip
 }
 
 textures/stralenex1/stralenex5_water
-{ 
+{
 	qer_editorimage textures/stralenex1/stralenex5_water.tga
-      qer_trans 0.5
-	
+	qer_trans 0.5
 	surfaceparm trans
 	surfaceparm nonsolid
-      surfaceparm water
-	
+	surfaceparm water
 	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
-
-      {
+	{
 		map textures/stralenex1/stralenex5_water.tga
-            blendFunc add
-            rgbGen identity
+		blendFunc add
+		rgbGen identity
 	}
 }
 
@@ -156,79 +151,66 @@ textures/stralenex1/e6xrst_supprt
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
 
-
 textures/stralenex1/strale_grey_box
 {
 	qer_editorimage env/strale_grey/ygrey_up.tga
-
 	surfaceparm nolightmap
 	surfaceparm noimpact
 	surfaceparm nomarks
 	surfaceparm sky
-
 	skyparms env/strale_grey/ygrey - -
 	q3map_surfacelight 60
 	q3map_lightimage textures/strale_grey/ygrey_up.tga
 	q3map_sun .9 .9 1 70 65 78
-
 }
 
 textures/stralenex1/strale_brown_box
 {
 	qer_editorimage env/strale_grey/ygrey_up.tga
-
 	surfaceparm nolightmap
 	surfaceparm noimpact
 	surfaceparm nomarks
 	surfaceparm sky
-
 	skyparms env/strale_grey/ygrey - -
 	q3map_surfacelight 100
 	q3map_lightimage textures/strale_grey/ygrey_up.tga
 	q3map_sun .75 .65 .6 130 255 80
-
 }
 
 textures/stralenex1/greennebula
 {
 	qer_editorimage env/stralenex5/greennebula_bk.tga
-
 	surfaceparm nolightmap
 	surfaceparm noimpact
 	surfaceparm nomarks
 	surfaceparm sky
-
 	skyparms env/stralenex5/greennebula - -
 	q3map_surfacelight 80
 	q3map_lightimage textures/stralenex5/stralenex5_up.tga
 	q3map_sun 0.3 0.33 0.3 60 80 20
 	/*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
-
 }
 
 textures/stralenex1/stralenex5
 {
 	qer_editorimage env/stralenex5/stralenex5_up.tga
-
 	surfaceparm nolightmap
 	surfaceparm noimpact
 	surfaceparm nomarks
 	surfaceparm sky
-
 	skyparms env/stralenex5/stralenex5 - -
 	q3map_surfacelight 60
 	q3map_lightimage textures/stralenex5/stralenex5_up.tga
 	q3map_sun .627 .525 0.392 60 300 40
 	/*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
-
 }
 
 //copied from harlequin-sky.shader
@@ -239,13 +221,11 @@ textures/harlequin_sky/strale_jf-nebula_sky
 	surfaceparm noimpact
 	surfaceparm nolightmap
 	surfaceparm nomarks
-	
 	skyparms textures/harlequin_sky/env/nebular - -
 	q3map_surfacelight 45
 // note: Change the surfacelight value if you want more ambient light from the sky.
 	q3map_sun 0.88 .71 .71 80 0 90
 // note: Change the fourth value (80) if you want a brighter or dimmer sun
-	
 }
 
 textures/stralenex1/stralenex_trimlight
diff --git a/data/scripts/swamp.shader b/data/scripts/swamp.shader
index 4d5f10f78..9345e56e9 100644
--- a/data/scripts/swamp.shader
+++ b/data/scripts/swamp.shader
@@ -1,8 +1,7 @@
 textures/swamp/ndslime
-{ 
+{
 	qer_editorimage textures/liquids/slime1.jpg
 	qer_trans 0.5
-
 	surfaceparm noimpact
 	surfaceparm trans
 	surfaceparm nonsolid
@@ -10,10 +9,9 @@ textures/swamp/ndslime
 	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
-
 	{
 		map textures/liquids/slime1.jpg
 		blendFunc add
 		rgbGen identity
 	}
-}
+}
\ No newline at end of file
diff --git a/data/scripts/toxic.shader b/data/scripts/toxic.shader
index 69fd9a97c..9e0708276 100644
--- a/data/scripts/toxic.shader
+++ b/data/scripts/toxic.shader
@@ -6,7 +6,7 @@ textures/toxic/toxic_slime
 	surfaceparm slime
 	surfaceparm trans
 	cull disable
-	deformVertexes wave 150 sin 2 5 0.25 0.1 
+	deformVertexes wave 150 sin 2 5 0.25 0.1
 	tessSize 128
 	qer_trans 0.5
 	q3map_surfacelight 1200
@@ -29,5 +29,4 @@ textures/toxic/toxic_sky
 	q3map_surfacelight 150
 	q3map_sun 0.75 0.65 0.6 130 255 80
 	skyParms env/strale_grey/ygrey 128 -
-}
-
+}
\ No newline at end of file
diff --git a/data/scripts/tznex01.shader b/data/scripts/tznex01.shader
index a1b57e91d..b9a5d37c7 100644
--- a/data/scripts/tznex01.shader
+++ b/data/scripts/tznex01.shader
@@ -13,10 +13,10 @@ textures/tznex01/stained_glass_nexlogo_blue
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
 }
@@ -36,11 +36,10 @@ textures/tznex01/stained_glass_nexlogo_red
 		alphaFunc GE128
 	}
 	{
-		map $lightmap 
+		map $lightmap
 		blendfunc filter
 		rgbGen identity
-		tcGen lightmap 
+		tcGen lightmap
 		depthFunc equal
 	}
-}
-
+}
\ No newline at end of file
-- 
2.39.2