diff --git a/gldefs.ammo b/gldefs.ammo
index 4753a7ce5..191550ef3 100644
--- a/gldefs.ammo
+++ b/gldefs.ammo
@@ -1,14 +1,22 @@
 HardwareShader Texture "models/Shell_Gold.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Shell_Gold_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Shell_Gold_Used.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Shell_Gold_Used_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 Brightmap Texture "models/SparksterAmmo.png"
 {
@@ -16,9 +24,13 @@ Brightmap Texture "models/SparksterAmmo.png"
 }
 HardwareShader Texture "models/SparksterAmmo.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SparksterAmmo_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/dekaenv.png"
+	Texture "rimtex" "models/envmap/dekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".75"
+	Define "RIMFACT" = ".9"
 }
 Brightmap Texture "models/Fabricator.png"
 {
@@ -38,27 +50,43 @@ Brightmap Texture "models/Fabricator_Tier4.png"
 }
 HardwareShader Texture "models/Fabricator.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".8"
 }
 HardwareShader Texture "models/Fabricator_Tier2.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".8"
 }
 HardwareShader Texture "models/Fabricator.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".8"
 }
 HardwareShader Texture "models/Fabricator_Tier4.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Fabricator_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
+	Define "RIMFACT" = ".9"
 }
 Brightmap Texture "models/Embiggener.png"
 {
@@ -82,33 +110,53 @@ Brightmap Texture "models/Embiggener_Tier5.png"
 }
 HardwareShader Texture "models/Embiggener.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/redmap.png"
+	Texture "envtex" "models/envmap/redenv.png"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier2.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/greenmap.png"
+	Texture "envtex" "models/envmap/greenenv.png"
+	Texture "rimtex" "models/envmap/greenrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier3.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier4.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/purpmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/Embiggener_Tier5.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Embiggener_mask.png"
-	Texture "envtex" "models/matcap/glassmap.png"
+	Texture "envtex" "models/envmap/iceenv.png"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+	Define "RIMFACT" = ".9"
 }
 
 PointLight GOLDSHELLLIGHT
diff --git a/gldefs.candygun b/gldefs.candygun
index 6491d0260..36e2ba2c3 100644
--- a/gldefs.candygun
+++ b/gldefs.candygun
@@ -1,12 +1,22 @@
 HardwareShader Texture "models/CandyGun.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/CandyGun_mask.png"
-	Texture "envtex" "models/matcap/pinkmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".2"
+	Define "RIMFACT" = ".9"
+	Define "RIMSTEP" = "0."
 }
 HardwareShader Texture "models/CandyGun_EmptyMag.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/CandyGun_mask.png"
-	Texture "envtex" "models/matcap/pinkmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".2"
+	Define "RIMFACT" = ".9"
+	Define "RIMSTEP" = "0."
 }
diff --git a/gldefs.envmaps b/gldefs.envmaps
new file mode 100644
index 000000000..11803955c
--- /dev/null
+++ b/gldefs.envmaps
@@ -0,0 +1,219 @@
+HardwareShader Texture "models/envmap/blodenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/blodrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+	Define "RIMFACT" = "1.5"
+	Define "RIMSTEP" = ".35"
+}
+HardwareShader Texture "models/envmap/bluenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/darkenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/darkrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".3"
+	Define "RIMFACT" = "1.1"
+}
+HardwareShader Texture "models/envmap/dekaenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/dekarim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/ekaenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/glassenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/glassrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+}
+HardwareShader Texture "models/envmap/glss2env.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/glss2rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+}
+HardwareShader Texture "models/envmap/glss3env.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/glss3rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+}
+HardwareShader Texture "models/envmap/glss4env.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/glss4rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+}
+HardwareShader Texture "models/envmap/glss5env.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/glss5rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+}
+HardwareShader Texture "models/envmap/glss6env.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/glss6rim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+}
+HardwareShader Texture "models/envmap/goldenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/greenenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/greenrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/iceenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/icerim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".6"
+}
+HardwareShader Texture "models/envmap/kinyenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/kinyrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMFACT" = "1.5"
+	Define "RIMSTEP" = "0."
+}
+HardwareShader Texture "models/envmap/lavaenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/lavarim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMFACT" = "1.5"
+	Define "RIMSTEP" = ".35"
+}
+HardwareShader Texture "models/envmap/leadenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/nokrenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/nokrrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMFACT" = "1.5"
+	Define "RIMSTEP" = "0."
+}
+HardwareShader Texture "models/envmap/nukenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/nukrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".25"
+}
+HardwareShader Texture "models/envmap/ockoenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/ockorim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/pronoenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/pronorim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/puroenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/purorim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/purpenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/redenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/reflenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/reflrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/rfl2env.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/rfl2rim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/silverenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/tarenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/tarrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMFACT" = "1.5"
+	Define "RIMSTEP" = ".25"
+}
+HardwareShader Texture "models/envmap/telenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/telrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "models/envmap/watrenv.png"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/watrrim.png"
+	Define "RIM_LIGHTING"
+}
+HardwareShader Texture "ERRORENV"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
+	Define "AMBIENT_GLOW"
+}
+HardwareShader Texture "BARRIENV"
+{
+	Shader "shaders/glsl/Envmap.fp"
+	Texture "rimtex" "models/envmap/glss3rim.png"
+	Texture "bartex" "models/barrierbar.png"
+	Define "RIM_LIGHTING"
+	Define "BARRIER_MAP"
+	Define "ENVFACT" = ".5"
+	Define "RIMFACT" = "2."
+	Define "RIMSTEP" = ".3"
+}
diff --git a/gldefs.funstuff b/gldefs.funstuff
index c769c53ac..2bc6128ef 100644
--- a/gldefs.funstuff
+++ b/gldefs.funstuff
@@ -28,9 +28,13 @@ Brightmap Texture "models/Chancebox.png"
 }
 HardwareShader Texture "models/Chancebox.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Chancebox_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".7"
+	Define "RIMFACT" = ".9"
 }
 
 PointLight CHANCELIGHT
diff --git a/gldefs.keys b/gldefs.keys
index fb5e3f9c2..0e20eff49 100644
--- a/gldefs.keys
+++ b/gldefs.keys
@@ -32,51 +32,67 @@ Brightmap Texture "models/DoomSilverKey.png"
 }
 HardwareShader Texture "models/DoomRedKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/redmap.png"
+	Texture "envtex" "models/envmap/redenv.png"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomYellowKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomBlueKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomGreenKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/greenmap.png"
+	Texture "envtex" "models/envmap/greenenv.png"
+	Texture "rimtex" "models/envmap/greenrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomOrangeKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomBlackKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/leadmap.png"
+	Texture "envtex" "models/envmap/leadenv.png"
+	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomWhiteKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/DoomSilverKey.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomKey_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
 }
 Brightmap Texture "models/DoomKeyLight.png"
 {
@@ -105,27 +121,39 @@ Brightmap Texture "models/DoomPurpleSkull.png"
 }
 HardwareShader Texture "models/DoomRedSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/redmap.png"
+	Texture "envtex" "models/envmap/redenv.png"
+	Texture "rimtex" "models/envmap/redrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/DoomBlueSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/DoomYellowSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/goldmap.png"
+	Texture "envtex" "models/envmap/goldenv.png"
+	Texture "rimtex" "models/envmap/goldrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/DoomPurpleSkull.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DoomSkull_mask.png"
-	Texture "envtex" "models/matcap/purpmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 
 pointlight SWWMREDKEY
diff --git a/gldefs.pickups b/gldefs.pickups
index 0b7dfd17a..021fabb15 100644
--- a/gldefs.pickups
+++ b/gldefs.pickups
@@ -20,33 +20,45 @@ Brightmap Texture "models/Refresher.png"
 }
 HardwareShader Texture "models/Nugget_Armor.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Nugget_mask.png"
-	Texture "envtex" "models/matcap/greenmap.png"
+	Texture "envtex" "models/envmap/greenenv.png"
+	Texture "rimtex" "models/envmap/greenrim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/Nugget.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Nugget_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
+	Define "RIMSTEP" = ".2"
 }
 HardwareShader Texture "models/TetraHealth.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/TetraHealth_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/CubeHealth.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/CubeHealth_mask.png"
-	Texture "envtex" "models/matcap/blumap.png"
+	Texture "envtex" "models/envmap/bluenv.png"
+	Texture "rimtex" "models/envmap/blurim.png"
+	Define "RIM_LIGHTING"
 }
 HardwareShader Texture "models/Refresher.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Refresher_mask.png"
-	Texture "envtex" "models/matcap/purpmap.png"
+	Texture "envtex" "models/envmap/purpenv.png"
+	Texture "rimtex" "models/envmap/purprim.png"
+	Define "RIM_LIGHTING"
 }
 Brightmap Texture "models/GhostArtifact.png"
 {
@@ -105,9 +117,11 @@ HardwareShader Sprite "DVSPA0"
 }
 HardwareShader Texture "models/DivineSprite.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DivineSprite_mask.png"
-	Texture "envtex" "models/matcap/pearlmap.png"
+	Texture "envtex" "models/envmap/puroenv.png"
+	Texture "rimtex" "models/envmap/purorim.png"
+	Define "RIM_LIGHTING"
 }
 Brightmap Texture "models/DivineSprite.png"
 {
@@ -116,9 +130,13 @@ Brightmap Texture "models/DivineSprite.png"
 }
 HardwareShader Texture "models/DevaSigil.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/DevaSigil_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/ekaenv.png"
+	Texture "rimtex" "models/envmap/ekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".5"
+	Define "RIMFACT" = ".8"
 }
 Brightmap Texture "models/SafetyTether.png"
 {
@@ -127,15 +145,21 @@ Brightmap Texture "models/SafetyTether.png"
 }
 HardwareShader Texture "models/SafetyTether.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SafetyTether_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
 }
 HardwareShader Texture "models/SafetyTether_off.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SafetyTether_mask.png"
-	Texture "envtex" "models/matcap/silvermap.png"
+	Texture "envtex" "models/envmap/silverenv.png"
+	Texture "rimtex" "models/envmap/silverrim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
 }
 
 PointLight ARMORNUGGETLIGHT
diff --git a/gldefs.shinemaps b/gldefs.shinemaps
deleted file mode 100644
index 3baef3e64..000000000
--- a/gldefs.shinemaps
+++ /dev/null
@@ -1,83 +0,0 @@
-HardwareShader Texture "models/matcap/blumap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/darkmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/dekamap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/goldmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/greenmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/invincimap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/pinkmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/puromap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/purpmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/ragemap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/redmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/silvermap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/leadmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/barriermap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-	Define "BARRIER_MAP"
-	Texture "bartex" "models/barrierbar.png"
-}
-HardwareShader Texture "models/matcap/errormap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-	Define "AMBIENT_GLOW"
-}
-HardwareShader Texture "models/matcap/glassmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/kinymap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/nkrknmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/nokromap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
-HardwareShader Texture "models/matcap/pearlmap.png"
-{
-	Shader "shaders/glsl/Shinemap.fp"
-}
diff --git a/gldefs.sparkster b/gldefs.sparkster
index 632fdea0b..e2b00a998 100644
--- a/gldefs.sparkster
+++ b/gldefs.sparkster
@@ -1,14 +1,22 @@
 HardwareShader Texture "models/Sparkster.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/Sparkster_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/dekaenv.png"
+	Texture "rimtex" "models/envmap/dekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".75"
+	Define "RIMFACT" = ".9"
 }
 HardwareShader Texture "models/SparksterBall.png"
 {
-	Shader "shaders/glsl/Shinemask.fp"
+	Shader "shaders/glsl/Envmask.fp"
 	Texture "masktex" "models/SparksterBall_mask.png"
-	Texture "envtex" "models/matcap/dekamap.png"
+	Texture "envtex" "models/envmap/dekaenv.png"
+	Texture "rimtex" "models/envmap/dekarim.png"
+	Define "RIM_LIGHTING"
+	Define "ENVFACT" = ".8"
+	Define "RIMFACT" = ".95"
 }
 
 FlickerLight2 SPARKLIGHT
diff --git a/language.version b/language.version
index c258c5e33..a2289d1c8 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.16 r1 \cu(Sun  8 May 01:05:13 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.2.16 r1 \cu(2022-05-08 01:05:13)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.2.16 r2 \cu(Sun  8 May 01:05:28 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.2.16 r2 \cu(2022-05-08 01:05:28)\c-";
diff --git a/modeldef.collectibles b/modeldef.collectibles
index 060003f5e..7f74b10f6 100644
--- a/modeldef.collectibles
+++ b/modeldef.collectibles
@@ -109,7 +109,7 @@ Model "KirinCummies"
 
 	Model 0 "TootFroot_d.3d"
 	SurfaceSkin 0 0 "TootFroot.png"
-	SurfaceSkin 0 1 "matcap/silvermap.png"
+	SurfaceSkin 0 1 "envmap/silverenv.png"
 	Scale 0.015 0.015 0.015
 	ZOffset 16
 	PitchOffset 30
diff --git a/modeldef.itemgesture b/modeldef.itemgesture
index 21ce2f2df..bb00fc12d 100644
--- a/modeldef.itemgesture
+++ b/modeldef.itemgesture
@@ -305,7 +305,7 @@ Model "KirinCummiesGesture"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "TootFroot.png"
-	SurfaceSkin 0 4 "matcap/silvermap.png"
+	SurfaceSkin 0 4 "envmap/silverenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
diff --git a/modeldef.keygesture b/modeldef.keygesture
index 64547ad90..2580bf8e9 100644
--- a/modeldef.keygesture
+++ b/modeldef.keygesture
@@ -1221,7 +1221,7 @@ Model "SWWMGreenKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/greenmap.png"
+	SurfaceSkin 0 3 "envmap/greenenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
@@ -1342,7 +1342,7 @@ Model "SWWMBlueKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/blumap.png"
+	SurfaceSkin 0 3 "envmap/bluenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
@@ -1463,7 +1463,7 @@ Model "SWWMYellowKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/goldmap.png"
+	SurfaceSkin 0 3 "envmap/goldenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
@@ -1584,7 +1584,7 @@ Model "SWWMRedKeyGesture"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
-	SurfaceSkin 0 3 "matcap/redmap.png"
+	SurfaceSkin 0 3 "envmap/redenv.png"
 
 	AngleOffset -90
 	Scale -0.005 0.0025 0.005
diff --git a/modeldef.keys b/modeldef.keys
index 65de32746..40b5bed6a 100644
--- a/modeldef.keys
+++ b/modeldef.keys
@@ -213,7 +213,7 @@ Model "SWWMKeyGreen"
 {
 	Path "models"
 	Model 0 "HereticGreenKey_d.3d"
-	Skin 0 "matcap/greenmap.png"
+	Skin 0 "envmap/greenenv.png"
 	Scale 0.05 0.05 0.05
 	RollOffset 15
 	ZOffset 16
@@ -225,7 +225,7 @@ Model "SWWMKeyBlue"
 {
 	Path "models"
 	Model 0 "HereticBlueKey_d.3d"
-	Skin 0 "matcap/blumap.png"
+	Skin 0 "envmap/bluenv.png"
 	Scale 0.04 0.04 0.04
 	RollOffset 15
 	ZOffset 16
@@ -237,7 +237,7 @@ Model "SWWMKeyYellow"
 {
 	Path "models"
 	Model 0 "HereticYellowKey_d.3d"
-	Skin 0 "matcap/goldmap.png"
+	Skin 0 "envmap/goldenv.png"
 	Scale 0.05 0.05 0.05
 	RollOffset 15
 	ZOffset 16
@@ -249,7 +249,7 @@ Model "SWWMKeyRed"
 {
 	Path "models"
 	Model 0 "HereticRedKey_d.3d"
-	Skin 0 "matcap/redmap.png"
+	Skin 0 "envmap/redenv.png"
 	Scale 0.05 0.05 0.05
 	RollOffset 15
 	ZOffset 16
diff --git a/modeldef.misc b/modeldef.misc
index 264d9fe1f..160da78e6 100644
--- a/modeldef.misc
+++ b/modeldef.misc
@@ -3,7 +3,7 @@ Model "Unknown"
 	Path "models"
 
 	Model 0 "extra/IAmError_d.3d"
-	Skin 0 "matcap/errormap.png"
+	Skin 0 "ERRORENV"
 	Scale 0.0625 0.0625 0.0625
 	AngleOffset 90
 	ZOffset 32
@@ -20,33 +20,33 @@ Model "FancyConfetti"
 	USEACTORPITCH
 	USEACTORROLL
 
-	Skin 0 "matcap/goldmap.png"
+	Skin 0 "envmap/goldenv.png"
 	FrameIndex XZW1 A 0 0
-	Skin 0 "matcap/blumap.png"
+	Skin 0 "envmap/bluenv.png"
 	FrameIndex XZW1 B 0 0
-	Skin 0 "matcap/darkmap.png"
+	Skin 0 "envmap/darkenv.png"
 	FrameIndex XZW1 C 0 0
-	Skin 0 "matcap/greenmap.png"
+	Skin 0 "envmap/greenenv.png"
 	FrameIndex XZW1 D 0 0
-	Skin 0 "matcap/invincimap.png"
+	Skin 0 "envmap/ekaenv.png"
 	FrameIndex XZW1 E 0 0
-	Skin 0 "matcap/pinkmap.png"
+	Skin 0 "envmap/watrenv.png"
 	FrameIndex XZW1 F 0 0
-	Skin 0 "matcap/purpmap.png"
+	Skin 0 "envmap/purpenv.png"
 	FrameIndex XZW1 G 0 0
-	Skin 0 "matcap/ragemap.png"
+	Skin 0 "envmap/telenv.png"
 	FrameIndex XZW1 H 0 0
-	Skin 0 "matcap/redmap.png"
+	Skin 0 "envmap/redenv.png"
 	FrameIndex XZW1 I 0 0
-	Skin 0 "matcap/silvermap.png"
+	Skin 0 "envmap/silverenv.png"
 	FrameIndex XZW1 J 0 0
-	Skin 0 "matcap/dekamap.png"
+	Skin 0 "envmap/dekaenv.png"
 	FrameIndex XZW1 K 0 0
-	Skin 0 "matcap/glassmap.png"
+	Skin 0 "envmap/iceenv.png"
 	FrameIndex XZW1 L 0 0
-	Skin 0 "matcap/leadmap.png"
+	Skin 0 "envmap/leadenv.png"
 	FrameIndex XZW1 M 0 0
-	Skin 0 "matcap/puromap.png"
+	Skin 0 "envmap/puroenv.png"
 	FrameIndex XZW1 N 0 0
 }
 
@@ -255,7 +255,7 @@ Model "SWWMShadow"
 	FrameIndex XZW1 A 0 0
 }
 
-Model "ShinemapDebugSphere"
+Model "EnvmapDebugSphere"
 {
 	Path "models"
 	Model 0 "extra/UnitSphere.obj"
@@ -263,44 +263,68 @@ Model "ShinemapDebugSphere"
 	ZOffset 32
 	DONTCULLBACKFACES
 
-	Skin 0 "matcap/barriermap.png"
+	Skin 0 "envmap/blodenv.png"
 	FrameIndex XZW1 A 0 0
-	Skin 0 "matcap/blumap.png"
+	Skin 0 "envmap/bluenv.png"
 	FrameIndex XZW1 B 0 0
-	Skin 0 "matcap/darkmap.png"
+	Skin 0 "envmap/darkenv.png"
 	FrameIndex XZW1 C 0 0
-	Skin 0 "matcap/dekamap.png"
+	Skin 0 "envmap/dekaenv.png"
 	FrameIndex XZW1 D 0 0
-	Skin 0 "matcap/errormap.png"
+	Skin 0 "envmap/ekaenv.png"
 	FrameIndex XZW1 E 0 0
-	Skin 0 "matcap/glassmap.png"
+	Skin 0 "envmap/glassenv.png"
 	FrameIndex XZW1 F 0 0
-	Skin 0 "matcap/goldmap.png"
+	Skin 0 "envmap/glss2env.png"
 	FrameIndex XZW1 G 0 0
-	Skin 0 "matcap/greenmap.png"
+	Skin 0 "envmap/glss3env.png"
 	FrameIndex XZW1 H 0 0
-	Skin 0 "matcap/invincimap.png"
+	Skin 0 "envmap/glss4env.png"
 	FrameIndex XZW1 I 0 0
-	Skin 0 "matcap/kinymap.png"
+	Skin 0 "envmap/glss5env.png"
 	FrameIndex XZW1 J 0 0
-	Skin 0 "matcap/leadmap.png"
+	Skin 0 "envmap/glss6env.png"
 	FrameIndex XZW1 K 0 0
-	Skin 0 "matcap/nkrknmap.png"
+	Skin 0 "envmap/goldenv.png"
 	FrameIndex XZW1 L 0 0
-	Skin 0 "matcap/nokromap.png"
+	Skin 0 "envmap/greenenv.png"
 	FrameIndex XZW1 M 0 0
-	Skin 0 "matcap/pearlmap.png"
+	Skin 0 "envmap/iceenv.png"
 	FrameIndex XZW1 N 0 0
-	Skin 0 "matcap/pinkmap.png"
+	Skin 0 "envmap/kinyenv.png"
 	FrameIndex XZW1 O 0 0
-	Skin 0 "matcap/puromap.png"
+	Skin 0 "envmap/lavaenv.png"
 	FrameIndex XZW1 P 0 0
-	Skin 0 "matcap/purpmap.png"
+	Skin 0 "envmap/leadenv.png"
 	FrameIndex XZW1 Q 0 0
-	Skin 0 "matcap/ragemap.png"
+	Skin 0 "envmap/nokrenv.png"
 	FrameIndex XZW1 R 0 0
-	Skin 0 "matcap/redmap.png"
+	Skin 0 "envmap/nukenv.png"
 	FrameIndex XZW1 S 0 0
-	Skin 0 "matcap/silvermap.png"
+	Skin 0 "envmap/ockoenv.png"
 	FrameIndex XZW1 T 0 0
+	Skin 0 "envmap/pronoenv.png"
+	FrameIndex XZW1 U 0 0
+	Skin 0 "envmap/puroenv.png"
+	FrameIndex XZW1 V 0 0
+	Skin 0 "envmap/purpenv.png"
+	FrameIndex XZW1 W 0 0
+	Skin 0 "envmap/redenv.png"
+	FrameIndex XZW1 X 0 0
+	Skin 0 "envmap/reflenv.png"
+	FrameIndex XZW1 Y 0 0
+	Skin 0 "envmap/rfl2env.png"
+	FrameIndex XZW1 Z 0 0
+	Skin 0 "envmap/silverenv.png"
+	FrameIndex XZW2 A 0 0
+	Skin 0 "envmap/tarenv.png"
+	FrameIndex XZW2 B 0 0
+	Skin 0 "envmap/telenv.png"
+	FrameIndex XZW2 C 0 0
+	Skin 0 "envmap/watrenv.png"
+	FrameIndex XZW2 D 0 0
+	Skin 0 "ERRORENV"
+	FrameIndex XZW2 E 0 0
+	Skin 0 "BARRIENV"
+	FrameIndex XZW2 F 0 0
 }
diff --git a/modeldef.pickups b/modeldef.pickups
index 5b7c40940..4956e5c65 100644
--- a/modeldef.pickups
+++ b/modeldef.pickups
@@ -100,7 +100,7 @@ Model "GrilledCheeseSandwich"
 {
 	Path "models"
 	Model 0 "Sandwich_d.3d"
-	SurfaceSkin 0 0 "matcap/goldmap.png"
+	SurfaceSkin 0 0 "envmap/goldenv.png"
 	SurfaceSkin 0 1 "Sandwich.png"
 	Scale 0.04 0.04 0.04
 	PitchOffset -45
@@ -125,7 +125,7 @@ Model "GhostArtifactX"
 {
 	Path "models"
 	Model 0 "GhostArtifact_d.3d"
-	SurfaceSkin 0 0 "matcap/darkmap.png"
+	SurfaceSkin 0 0 "envmap/darkenv.png"
 	Scale 0.05 0.05 0.05
 	ZOffset 16
 
@@ -147,7 +147,7 @@ Model "GravityX"
 {
 	Path "models"
 	Model 0 "Gravity_d.3d"
-	SurfaceSkin 0 1 "matcap/silvermap.png"
+	SurfaceSkin 0 1 "envmap/watrenv.png"
 	Scale 0.06 0.06 0.06
 	ZOffset 16
 
@@ -169,7 +169,7 @@ Model "InvinciballX"
 {
 	Path "models"
 	Model 0 "Invinciball_d.3d"
-	SurfaceSkin 0 1 "matcap/invincimap.png"
+	SurfaceSkin 0 1 "envmap/redenv.png"
 	Scale 0.04 0.04 0.04
 	ZOffset 16
 
@@ -191,7 +191,7 @@ Model "RagekitX"
 {
 	Path "models"
 	Model 0 "Ragekit_d.3d"
-	SurfaceSkin 0 1 "matcap/ragemap.png"
+	SurfaceSkin 0 1 "envmap/lavaenv.png"
 	Scale 0.05 0.05 0.05
 	ZOffset 16
 
@@ -278,7 +278,7 @@ Model "EBarrierX"
 {
 	Path "models"
 	Model 0 "Barrier_d.3d"
-	SurfaceSkin 0 1 "matcap/barriermap.png"
+	SurfaceSkin 0 1 "BARRIENV"
 	Scale 0.05 0.05 0.05
 	ZOffset 16
 	DONTCULLBACKFACES
diff --git a/modeldef.spreadgun b/modeldef.spreadgun
index 08b0adb10..268b2fabb 100644
--- a/modeldef.spreadgun
+++ b/modeldef.spreadgun
@@ -170,7 +170,7 @@ Model "TheBall"
 	Path "models"
 
 	Model 0 "extra/BaseSphere_d.3d"
-	Skin 0 "matcap/leadmap.png"
+	Skin 0 "envmap/leadenv.png"
 	Scale 0.006 0.006 0.006
 	ZOffset 1
 
diff --git a/models/envmap/blodenv.png b/models/envmap/blodenv.png
new file mode 100644
index 000000000..0ab86ad2b
Binary files /dev/null and b/models/envmap/blodenv.png differ
diff --git a/models/envmap/blodrim.png b/models/envmap/blodrim.png
new file mode 100644
index 000000000..360f3b970
Binary files /dev/null and b/models/envmap/blodrim.png differ
diff --git a/models/envmap/bluenv.png b/models/envmap/bluenv.png
new file mode 100644
index 000000000..a10f30fc1
Binary files /dev/null and b/models/envmap/bluenv.png differ
diff --git a/models/envmap/blurim.png b/models/envmap/blurim.png
new file mode 100644
index 000000000..f10757921
Binary files /dev/null and b/models/envmap/blurim.png differ
diff --git a/models/envmap/darkenv.png b/models/envmap/darkenv.png
new file mode 100644
index 000000000..7658a7133
Binary files /dev/null and b/models/envmap/darkenv.png differ
diff --git a/models/envmap/darkrim.png b/models/envmap/darkrim.png
new file mode 100644
index 000000000..1c3e7b664
Binary files /dev/null and b/models/envmap/darkrim.png differ
diff --git a/models/envmap/dekaenv.png b/models/envmap/dekaenv.png
new file mode 100644
index 000000000..df2d41df4
Binary files /dev/null and b/models/envmap/dekaenv.png differ
diff --git a/models/envmap/dekarim.png b/models/envmap/dekarim.png
new file mode 100644
index 000000000..922369c4b
Binary files /dev/null and b/models/envmap/dekarim.png differ
diff --git a/models/envmap/ekaenv.png b/models/envmap/ekaenv.png
new file mode 100644
index 000000000..d1694811c
Binary files /dev/null and b/models/envmap/ekaenv.png differ
diff --git a/models/envmap/ekarim.png b/models/envmap/ekarim.png
new file mode 100644
index 000000000..5c3b19dcd
Binary files /dev/null and b/models/envmap/ekarim.png differ
diff --git a/models/envmap/glassenv.png b/models/envmap/glassenv.png
new file mode 100644
index 000000000..4ecbbce25
Binary files /dev/null and b/models/envmap/glassenv.png differ
diff --git a/models/envmap/glassrim.png b/models/envmap/glassrim.png
new file mode 100644
index 000000000..48ef7a69d
Binary files /dev/null and b/models/envmap/glassrim.png differ
diff --git a/models/envmap/glss2env.png b/models/envmap/glss2env.png
new file mode 100644
index 000000000..64f454d58
Binary files /dev/null and b/models/envmap/glss2env.png differ
diff --git a/models/envmap/glss2rim.png b/models/envmap/glss2rim.png
new file mode 100644
index 000000000..81c3d8d04
Binary files /dev/null and b/models/envmap/glss2rim.png differ
diff --git a/models/envmap/glss3env.png b/models/envmap/glss3env.png
new file mode 100644
index 000000000..e592bf755
Binary files /dev/null and b/models/envmap/glss3env.png differ
diff --git a/models/envmap/glss3rim.png b/models/envmap/glss3rim.png
new file mode 100644
index 000000000..bfd04b7a5
Binary files /dev/null and b/models/envmap/glss3rim.png differ
diff --git a/models/envmap/glss4env.png b/models/envmap/glss4env.png
new file mode 100644
index 000000000..d2b35c594
Binary files /dev/null and b/models/envmap/glss4env.png differ
diff --git a/models/envmap/glss4rim.png b/models/envmap/glss4rim.png
new file mode 100644
index 000000000..a53b500de
Binary files /dev/null and b/models/envmap/glss4rim.png differ
diff --git a/models/envmap/glss5env.png b/models/envmap/glss5env.png
new file mode 100644
index 000000000..255debaa6
Binary files /dev/null and b/models/envmap/glss5env.png differ
diff --git a/models/envmap/glss5rim.png b/models/envmap/glss5rim.png
new file mode 100644
index 000000000..b39aef0a6
Binary files /dev/null and b/models/envmap/glss5rim.png differ
diff --git a/models/envmap/glss6env.png b/models/envmap/glss6env.png
new file mode 100644
index 000000000..4dd7945f5
Binary files /dev/null and b/models/envmap/glss6env.png differ
diff --git a/models/envmap/glss6rim.png b/models/envmap/glss6rim.png
new file mode 100644
index 000000000..e6fadac11
Binary files /dev/null and b/models/envmap/glss6rim.png differ
diff --git a/models/envmap/goldenv.png b/models/envmap/goldenv.png
new file mode 100644
index 000000000..3f429250b
Binary files /dev/null and b/models/envmap/goldenv.png differ
diff --git a/models/envmap/goldrim.png b/models/envmap/goldrim.png
new file mode 100644
index 000000000..d16b20f13
Binary files /dev/null and b/models/envmap/goldrim.png differ
diff --git a/models/envmap/greenenv.png b/models/envmap/greenenv.png
new file mode 100644
index 000000000..03ed682c1
Binary files /dev/null and b/models/envmap/greenenv.png differ
diff --git a/models/envmap/greenrim.png b/models/envmap/greenrim.png
new file mode 100644
index 000000000..e82eab417
Binary files /dev/null and b/models/envmap/greenrim.png differ
diff --git a/models/envmap/iceenv.png b/models/envmap/iceenv.png
new file mode 100644
index 000000000..5db2bda2e
Binary files /dev/null and b/models/envmap/iceenv.png differ
diff --git a/models/envmap/icerim.png b/models/envmap/icerim.png
new file mode 100644
index 000000000..aa69a6941
Binary files /dev/null and b/models/envmap/icerim.png differ
diff --git a/models/envmap/kinyenv.png b/models/envmap/kinyenv.png
new file mode 100644
index 000000000..3a3343741
Binary files /dev/null and b/models/envmap/kinyenv.png differ
diff --git a/models/envmap/kinyrim.png b/models/envmap/kinyrim.png
new file mode 100644
index 000000000..84d96842b
Binary files /dev/null and b/models/envmap/kinyrim.png differ
diff --git a/models/envmap/lavaenv.png b/models/envmap/lavaenv.png
new file mode 100644
index 000000000..ff7e18bf2
Binary files /dev/null and b/models/envmap/lavaenv.png differ
diff --git a/models/envmap/lavarim.png b/models/envmap/lavarim.png
new file mode 100644
index 000000000..7538f6b0b
Binary files /dev/null and b/models/envmap/lavarim.png differ
diff --git a/models/envmap/leadenv.png b/models/envmap/leadenv.png
new file mode 100644
index 000000000..4efbc1ac4
Binary files /dev/null and b/models/envmap/leadenv.png differ
diff --git a/models/envmap/leadrim.png b/models/envmap/leadrim.png
new file mode 100644
index 000000000..e8b3df32d
Binary files /dev/null and b/models/envmap/leadrim.png differ
diff --git a/models/envmap/nokrenv.png b/models/envmap/nokrenv.png
new file mode 100644
index 000000000..c8f08fad5
Binary files /dev/null and b/models/envmap/nokrenv.png differ
diff --git a/models/envmap/nokrrim.png b/models/envmap/nokrrim.png
new file mode 100644
index 000000000..0dcd696ff
Binary files /dev/null and b/models/envmap/nokrrim.png differ
diff --git a/models/envmap/nukenv.png b/models/envmap/nukenv.png
new file mode 100644
index 000000000..ebfb8c32e
Binary files /dev/null and b/models/envmap/nukenv.png differ
diff --git a/models/envmap/nukrim.png b/models/envmap/nukrim.png
new file mode 100644
index 000000000..14ed4de92
Binary files /dev/null and b/models/envmap/nukrim.png differ
diff --git a/models/envmap/ockoenv.png b/models/envmap/ockoenv.png
new file mode 100644
index 000000000..4065339d8
Binary files /dev/null and b/models/envmap/ockoenv.png differ
diff --git a/models/envmap/ockorim.png b/models/envmap/ockorim.png
new file mode 100644
index 000000000..bc3128a79
Binary files /dev/null and b/models/envmap/ockorim.png differ
diff --git a/models/envmap/pronoenv.png b/models/envmap/pronoenv.png
new file mode 100644
index 000000000..d4b991c0a
Binary files /dev/null and b/models/envmap/pronoenv.png differ
diff --git a/models/envmap/pronorim.png b/models/envmap/pronorim.png
new file mode 100644
index 000000000..2beff2211
Binary files /dev/null and b/models/envmap/pronorim.png differ
diff --git a/models/envmap/puroenv.png b/models/envmap/puroenv.png
new file mode 100644
index 000000000..91fcfdacc
Binary files /dev/null and b/models/envmap/puroenv.png differ
diff --git a/models/envmap/purorim.png b/models/envmap/purorim.png
new file mode 100644
index 000000000..ce1164a6b
Binary files /dev/null and b/models/envmap/purorim.png differ
diff --git a/models/envmap/purpenv.png b/models/envmap/purpenv.png
new file mode 100644
index 000000000..afa615062
Binary files /dev/null and b/models/envmap/purpenv.png differ
diff --git a/models/envmap/purprim.png b/models/envmap/purprim.png
new file mode 100644
index 000000000..4c1368fdf
Binary files /dev/null and b/models/envmap/purprim.png differ
diff --git a/models/envmap/redenv.png b/models/envmap/redenv.png
new file mode 100644
index 000000000..b22dd602e
Binary files /dev/null and b/models/envmap/redenv.png differ
diff --git a/models/envmap/redrim.png b/models/envmap/redrim.png
new file mode 100644
index 000000000..2baa3ae66
Binary files /dev/null and b/models/envmap/redrim.png differ
diff --git a/models/envmap/reflenv.png b/models/envmap/reflenv.png
new file mode 100644
index 000000000..f4cddc5ba
Binary files /dev/null and b/models/envmap/reflenv.png differ
diff --git a/models/envmap/reflrim.png b/models/envmap/reflrim.png
new file mode 100644
index 000000000..5134d3aa9
Binary files /dev/null and b/models/envmap/reflrim.png differ
diff --git a/models/envmap/rfl2env.png b/models/envmap/rfl2env.png
new file mode 100644
index 000000000..1db842496
Binary files /dev/null and b/models/envmap/rfl2env.png differ
diff --git a/models/envmap/rfl2rim.png b/models/envmap/rfl2rim.png
new file mode 100644
index 000000000..7d3d56320
Binary files /dev/null and b/models/envmap/rfl2rim.png differ
diff --git a/models/envmap/silverenv.png b/models/envmap/silverenv.png
new file mode 100644
index 000000000..a1c50acaf
Binary files /dev/null and b/models/envmap/silverenv.png differ
diff --git a/models/envmap/silverrim.png b/models/envmap/silverrim.png
new file mode 100644
index 000000000..aa3cc6c38
Binary files /dev/null and b/models/envmap/silverrim.png differ
diff --git a/models/envmap/tarenv.png b/models/envmap/tarenv.png
new file mode 100644
index 000000000..ecea10341
Binary files /dev/null and b/models/envmap/tarenv.png differ
diff --git a/models/envmap/tarrim.png b/models/envmap/tarrim.png
new file mode 100644
index 000000000..11dccc6a8
Binary files /dev/null and b/models/envmap/tarrim.png differ
diff --git a/models/envmap/telenv.png b/models/envmap/telenv.png
new file mode 100644
index 000000000..078cc56d9
Binary files /dev/null and b/models/envmap/telenv.png differ
diff --git a/models/envmap/telrim.png b/models/envmap/telrim.png
new file mode 100644
index 000000000..de48ef431
Binary files /dev/null and b/models/envmap/telrim.png differ
diff --git a/models/envmap/watrenv.png b/models/envmap/watrenv.png
new file mode 100644
index 000000000..4875e96f7
Binary files /dev/null and b/models/envmap/watrenv.png differ
diff --git a/models/envmap/watrrim.png b/models/envmap/watrrim.png
new file mode 100644
index 000000000..667bcfeff
Binary files /dev/null and b/models/envmap/watrrim.png differ
diff --git a/models/matcap/barriermap.png b/models/matcap/barriermap.png
deleted file mode 100644
index 7750dba21..000000000
Binary files a/models/matcap/barriermap.png and /dev/null differ
diff --git a/models/matcap/blumap.png b/models/matcap/blumap.png
deleted file mode 100644
index 7e429ffdb..000000000
Binary files a/models/matcap/blumap.png and /dev/null differ
diff --git a/models/matcap/darkmap.png b/models/matcap/darkmap.png
deleted file mode 100644
index b42e2f981..000000000
Binary files a/models/matcap/darkmap.png and /dev/null differ
diff --git a/models/matcap/dekamap.png b/models/matcap/dekamap.png
deleted file mode 100644
index 95278a6d9..000000000
Binary files a/models/matcap/dekamap.png and /dev/null differ
diff --git a/models/matcap/errormap.png b/models/matcap/errormap.png
deleted file mode 100644
index e9f53ec99..000000000
Binary files a/models/matcap/errormap.png and /dev/null differ
diff --git a/models/matcap/glassmap.png b/models/matcap/glassmap.png
deleted file mode 100644
index 944153d5a..000000000
Binary files a/models/matcap/glassmap.png and /dev/null differ
diff --git a/models/matcap/goldmap.png b/models/matcap/goldmap.png
deleted file mode 100644
index fd84e37aa..000000000
Binary files a/models/matcap/goldmap.png and /dev/null differ
diff --git a/models/matcap/greenmap.png b/models/matcap/greenmap.png
deleted file mode 100644
index 1e9abcf4c..000000000
Binary files a/models/matcap/greenmap.png and /dev/null differ
diff --git a/models/matcap/invincimap.png b/models/matcap/invincimap.png
deleted file mode 100644
index f4d5a8995..000000000
Binary files a/models/matcap/invincimap.png and /dev/null differ
diff --git a/models/matcap/kinymap.png b/models/matcap/kinymap.png
deleted file mode 100644
index a93b427c7..000000000
Binary files a/models/matcap/kinymap.png and /dev/null differ
diff --git a/models/matcap/leadmap.png b/models/matcap/leadmap.png
deleted file mode 100644
index 178616e43..000000000
Binary files a/models/matcap/leadmap.png and /dev/null differ
diff --git a/models/matcap/nkrknmap.png b/models/matcap/nkrknmap.png
deleted file mode 100644
index 50eb0aa4c..000000000
Binary files a/models/matcap/nkrknmap.png and /dev/null differ
diff --git a/models/matcap/nokromap.png b/models/matcap/nokromap.png
deleted file mode 100644
index 18234fea6..000000000
Binary files a/models/matcap/nokromap.png and /dev/null differ
diff --git a/models/matcap/pearlmap.png b/models/matcap/pearlmap.png
deleted file mode 100644
index 97840fca4..000000000
Binary files a/models/matcap/pearlmap.png and /dev/null differ
diff --git a/models/matcap/pinkmap.png b/models/matcap/pinkmap.png
deleted file mode 100644
index edf4dbc58..000000000
Binary files a/models/matcap/pinkmap.png and /dev/null differ
diff --git a/models/matcap/puromap.png b/models/matcap/puromap.png
deleted file mode 100644
index 86bfadeec..000000000
Binary files a/models/matcap/puromap.png and /dev/null differ
diff --git a/models/matcap/purpmap.png b/models/matcap/purpmap.png
deleted file mode 100644
index 400268c38..000000000
Binary files a/models/matcap/purpmap.png and /dev/null differ
diff --git a/models/matcap/ragemap.png b/models/matcap/ragemap.png
deleted file mode 100644
index 53f9d4773..000000000
Binary files a/models/matcap/ragemap.png and /dev/null differ
diff --git a/models/matcap/redmap.png b/models/matcap/redmap.png
deleted file mode 100644
index 7f66d8f21..000000000
Binary files a/models/matcap/redmap.png and /dev/null differ
diff --git a/models/matcap/silvermap.png b/models/matcap/silvermap.png
deleted file mode 100644
index 6b435d0aa..000000000
Binary files a/models/matcap/silvermap.png and /dev/null differ
diff --git a/shaders/glsl/Envmap.fp b/shaders/glsl/Envmap.fp
new file mode 100644
index 000000000..ef6753521
--- /dev/null
+++ b/shaders/glsl/Envmap.fp
@@ -0,0 +1,43 @@
+// equirectangular envmap + gradient rim
+#define RECIPROCAL_PI2 0.15915494
+
+#ifndef RIMSTEP
+#define RIMSTEP .5
+#endif
+#ifndef ENVFACT
+#define ENVFACT 1.
+#endif
+#ifndef RIMFACT
+#define RIMFACT 1.
+#endif
+
+void SetupMaterial( inout Material mat )
+{
+	vec3 norm = normalize(vWorldNormal.xyz);
+	vec3 eye = normalize(uCameraPos.xyz-pixelpos.xyz);
+	vec3 rvec = normalize(reflect(eye,norm));
+	vec2 uv = vec2(atan(rvec.z,rvec.x)*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
+	vec2 uv2 = vec2(atan(rvec.z,abs(rvec.x))*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
+	vec3 envcol = textureGrad(tex,uv,dFdx(uv2),dFdy(uv2)).rgb*ENVFACT;
+#ifdef RIM_LIGHTING
+	float rim = smoothstep(RIMSTEP,1.,1.-clamp(dot(eye,norm),0.,1.));
+	vec3 rimcol = texture(rimtex,vec2(.25+.5*rim,.5)).rgb;
+	envcol = mix(envcol,rimcol,rim*RIMFACT);
+#endif
+#ifdef BARRIER_MAP
+	vec3 grad = texture(bartex,vec2(0.,vTexCoord.t*5.+timer)).rgb;
+	envcol = (envcol+grad)*.25;
+#endif
+	mat.Base = vec4(envcol,1.);
+	mat.Normal = ApplyNormalMap(vTexCoord.st);
+}
+
+vec4 ProcessLight( Material mat, vec4 color )
+{
+#ifdef AMBIENT_GLOW
+	float glow = .75+.25*sin(timer*8);
+	return vec4(vec3(glow),color.a);
+#else
+	return color;
+#endif
+}
diff --git a/shaders/glsl/Envmask.fp b/shaders/glsl/Envmask.fp
new file mode 100644
index 000000000..6ce74a447
--- /dev/null
+++ b/shaders/glsl/Envmask.fp
@@ -0,0 +1,33 @@
+// basic texture + masked equirectangular envmap + gradient rim
+#define RECIPROCAL_PI2 0.15915494
+
+#ifndef RIMSTEP
+#define RIMSTEP .5
+#endif
+#ifndef ENVFACT
+#define ENVFACT 1.
+#endif
+#ifndef RIMFACT
+#define RIMFACT 1.
+#endif
+
+void SetupMaterial( inout Material mat )
+{
+	vec4 base = getTexel(vTexCoord.st);
+	float mask = texture(masktex,vTexCoord.st).x;
+	vec3 norm = normalize(vWorldNormal.xyz);
+	vec3 eye = normalize(uCameraPos.xyz-pixelpos.xyz);
+	vec3 rvec = normalize(reflect(eye,norm));
+	vec2 uv = vec2(atan(rvec.z,rvec.x)*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
+	vec2 uv2 = vec2(atan(rvec.z,abs(rvec.x))*RECIPROCAL_PI2+.5,asin(rvec.y)*RECIPROCAL_PI2+.5);
+	vec3 envcol = textureGrad(envtex,uv,dFdx(uv2),dFdy(uv2)).rgb*ENVFACT;
+#ifdef RIM_LIGHTING
+	float rim = smoothstep(RIMSTEP,1.,1.-clamp(dot(eye,norm),0.,1.));
+	vec3 rimcol = texture(rimtex,vec2(.25+.5*rim,.5)).rgb;
+	envcol = mix(envcol,rimcol,rim*RIMFACT);
+#endif
+	mat.Base = vec4(base.rgb+envcol*mask,base.a);
+	mat.Normal = ApplyNormalMap(vTexCoord.st);
+	if ( (uTextureMode&TEXF_Brightmap) != 0 )
+		mat.Bright = texture(brighttexture,vTexCoord.st);
+}
diff --git a/shaders/glsl/Shinemap.fp b/shaders/glsl/Shinemap.fp
deleted file mode 100644
index 7d5d573d9..000000000
--- a/shaders/glsl/Shinemap.fp
+++ /dev/null
@@ -1,26 +0,0 @@
-// pseudo-matcap
-
-void SetupMaterial( inout Material mat )
-{
-	vec3 rnorm = normalize(vEyeNormalOrig.xyz)*vec3(1,-1,1);
-#ifdef BARRIER_MAP
-	vec4 basemap = getTexel(rnorm.xy*.49+.5);
-	basemap.rgb *= .25;
-	vec3 grad = texture(bartex,vec2(0.,vTexCoord.t*5.+timer)).rgb;
-	grad *= .25;
-	mat.Base = basemap+vec4(grad,0.);
-#else
-	mat.Base = getTexel(rnorm.xy*.49+.5);
-#endif
-	mat.Normal = ApplyNormalMap(vTexCoord.st);
-}
-
-vec4 ProcessLight( Material mat, vec4 color )
-{
-#ifdef AMBIENT_GLOW
-	float glow = .75+.25*sin(timer*8);
-	return vec4(vec3(glow),color.a);
-#else
-	return color;
-#endif
-}
diff --git a/shaders/glsl/Shinemask.fp b/shaders/glsl/Shinemask.fp
deleted file mode 100644
index 14983f162..000000000
--- a/shaders/glsl/Shinemask.fp
+++ /dev/null
@@ -1,12 +0,0 @@
-// basic texture + masked pseudo-matcap
-
-void SetupMaterial( inout Material mat )
-{
-	vec4 base = getTexel(vTexCoord.st);
-	float mask = texture(masktex,vTexCoord.st).x;
-	vec3 rnorm = normalize(vEyeNormalOrig.xyz)*vec3(1,-1,1);
-	mat.Base = vec4(base.rgb+texture(envtex,rnorm.xy*.49+.5).rgb*mask,base.a);
-	mat.Normal = ApplyNormalMap(vTexCoord.st);
-	if ( (uTextureMode&TEXF_Brightmap) != 0 )
-		mat.Bright = texture(brighttexture,vTexCoord.st);
-}
diff --git a/textures.envmap b/textures.envmap
new file mode 100644
index 000000000..5b6b9bb8c
--- /dev/null
+++ b/textures.envmap
@@ -0,0 +1,9 @@
+// duplicate envmaps for two special materials
+Texture "ERRORENV", 512, 512
+{
+	Patch "models/envmap/redenv.png", 0, 0
+}
+Texture "BARRIENV", 512, 512
+{
+	Patch "models/envmap/glss3env.png", 0, 0
+}
diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc
index c68dd81b2..5e36d1733 100644
--- a/zscript/utility/swwm_utility.zsc
+++ b/zscript/utility/swwm_utility.zsc
@@ -2319,7 +2319,7 @@ Class RadiusDebugSphere : Actor
 	}
 }
 
-Class ShinemapDebugSphere : Actor
+Class EnvmapDebugSphere : Actor
 {
 	override bool Used( Actor user )
 	{
@@ -2331,33 +2331,45 @@ Class ShinemapDebugSphere : Actor
 	override void Tick() {}
 	Default
 	{
-		RenderStyle "Add";
+		RenderStyle "Normal";
 		Radius 16;
 		Height 48;
 	}
 	States
 	{
 	Spawn:
-		XZW1 A -1 Bright NoDelay A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 A -1 NoDelay A_SetRenderStyle(1.,STYLE_Normal);
 		XZW1 B -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 C -1 Bright A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 C -1 A_SetRenderStyle(1.,STYLE_Add);
 		XZW1 D -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 E -1 Bright A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 E -1 A_SetRenderStyle(1.,STYLE_Normal);
 		XZW1 F -1 A_SetRenderStyle(1.,STYLE_Add);
-		XZW1 G -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 H -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 I -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 J -1 Bright A_SetRenderStyle(1.,STYLE_Add);
-		XZW1 K -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 L -1 Bright A_SetRenderStyle(1.,STYLE_Add);
-		XZW1 M -1 Bright A_SetRenderStyle(1.,STYLE_Add);
-		XZW1 N -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 O -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 P -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 G -1 A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 H -1 A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 I -1 A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 J -1 A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 K -1 A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 L -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 M -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 N -1 A_SetRenderStyle(1.,STYLE_Add);
+		XZW1 O -1 Bright A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 P -1 Bright A_SetRenderStyle(1.,STYLE_Normal);
 		XZW1 Q -1 A_SetRenderStyle(1.,STYLE_Normal);
-		XZW1 R -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 R -1 Bright A_SetRenderStyle(1.,STYLE_Normal);
 		XZW1 S -1 A_SetRenderStyle(1.,STYLE_Normal);
 		XZW1 T -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 U -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 V -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 W -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 X -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 Y -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW1 Z -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW2 A -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW2 B -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW2 C -1 A_SetRenderStyle(1.,STYLE_Normal);
+		XZW2 D -1 A_SetRenderStyle(1.,STYLE_Add);
+		XZW2 E -1 Bright A_SetRenderStyle(1.,STYLE_Normal);
+		XZW2 F -1 Bright A_SetRenderStyle(1.,STYLE_Add);
 		Loop;
 	}
 }