diff --git a/animdefs.misc b/animdefs.misc
index 011133225..7c81333c4 100644
--- a/animdefs.misc
+++ b/animdefs.misc
@@ -1,3 +1,2 @@
-cameratexture LOGOFADE 64 64
+canvastexture LOGOFADE 4 4
 canvastexture SHEENLED 128 128
-canvastexture DEMOT1ST 256 256
diff --git a/gldefs.demolitionist b/gldefs.demolitionist
index 30052d37c..51e4b4f31 100644
--- a/gldefs.demolitionist
+++ b/gldefs.demolitionist
@@ -118,12 +118,3 @@ Brightmap Texture "models/DemoTagsYellow.png"
 {
 	Map "models/DemoTags_bright.png"
 }
-HardwareShader Texture "models/DemoTags1st.png"
-{
-	Shader "shaders/glsl/DemoTags1st.fp"
-	Texture scrtex "DEMOT1ST"
-}
-Brightmap Texture "models/DemoTags1st.png"
-{
-	Map "models/DemoTags_bright.png"
-}
diff --git a/language.version b/language.version
index 77577b40c..adf42b0fd 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r222 \cu(Tue 26 Jul 22:06:46 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r222 \cu(2022-07-26 22:06:46)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r222 \cu(Wed 27 Jul 13:17:18 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r222 \cu(2022-07-27 13:17:18)\c-";
diff --git a/modeldef.candygun b/modeldef.candygun
index 11c300b12..7ccd2ed66 100644
--- a/modeldef.candygun
+++ b/modeldef.candygun
@@ -163,7 +163,7 @@ Model "CandyGun"
 	Path "models"
 
 	Model 1 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "CandyGun.png"
diff --git a/modeldef.deepimpact b/modeldef.deepimpact
index 8d4b817fd..1449d87e0 100644
--- a/modeldef.deepimpact
+++ b/modeldef.deepimpact
@@ -17,7 +17,7 @@ Model "DeepImpact"
 	Path "models"
 
 	Model 1 "DeepImpact1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "DeepImpact.png"
diff --git a/modeldef.eviscerator b/modeldef.eviscerator
index 12c8e7cc1..ed70a6c4d 100644
--- a/modeldef.eviscerator
+++ b/modeldef.eviscerator
@@ -163,7 +163,7 @@ Model "Eviscerator"
 	Path "models"
 
 	Model 1 "Eviscerator1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Eviscerator.png"
diff --git a/modeldef.explodiumgun b/modeldef.explodiumgun
index 4d45af1df..0f64830a9 100644
--- a/modeldef.explodiumgun
+++ b/modeldef.explodiumgun
@@ -135,7 +135,7 @@ Model "ExplodiumGun"
 	Path "models"
 
 	Model 1 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "ExplodiumGun.png"
diff --git a/modeldef.explodiumgun2 b/modeldef.explodiumgun2
index 993ddca42..90c91caea 100644
--- a/modeldef.explodiumgun2
+++ b/modeldef.explodiumgun2
@@ -97,7 +97,7 @@ Model "DualExplodiumGun"
 	Path "models"
 
 	Model 3 "ExplodiumGun1stL_d.3d"
-	SurfaceSkin 3 0 "DemoTags1st.png"
+	SurfaceSkin 3 0 "DemoTags.png"
 	SurfaceSkin 3 1 "DemoArms.png"
 	SurfaceSkin 3 2 "DemoSoft.png"
 	SurfaceSkin 3 3 "ExplodiumGun.png"
@@ -316,7 +316,7 @@ Model "DualExplodiumGun"
 	Path "models"
 
 	Model 1 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "ExplodiumGun.png"
diff --git a/modeldef.gesture b/modeldef.gesture
index 6cfcc4a78..6a9d8269a 100644
--- a/modeldef.gesture
+++ b/modeldef.gesture
@@ -2,7 +2,7 @@ Model "SWWMGesture"
 {
 	Path "models"
 	Model 0 "GestureArms_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	AngleOffset -90
@@ -113,7 +113,7 @@ Model "SWWMGesture"
 {
 	Path "models"
 	Model 0 "Grenade1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "ExplodiumGun.png"
@@ -165,7 +165,7 @@ Model "SWWMGesture"
 {
 	Path "models"
 	Model 0 "QuickPunch1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 
diff --git a/modeldef.hellblazer b/modeldef.hellblazer
index 757f55c65..a3e2535fb 100644
--- a/modeldef.hellblazer
+++ b/modeldef.hellblazer
@@ -390,7 +390,7 @@ Model "Hellblazer"
 	Path "models"
 
 	Model 1 "Hellblazer1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Hellblazer.png"
diff --git a/modeldef.itemgesture b/modeldef.itemgesture
index 35a08b340..bb00fc12d 100644
--- a/modeldef.itemgesture
+++ b/modeldef.itemgesture
@@ -2,7 +2,7 @@ Model "GenericCubeGesture"
 {
 	Path "models"
 	Model 0 "GenericCube1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "PerfectlyGeneric.png"
@@ -37,7 +37,7 @@ Model "AkariProjectGesture"
 {
 	Path "models"
 	Model 0 "AkariProject1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "AkariProject.png"
@@ -72,7 +72,7 @@ Model "LoveSignalsCDGesture"
 {
 	Path "models"
 	Model 0 "LoveSignalsCD1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "LoveSignals.png"
@@ -107,7 +107,7 @@ Model "NutatcoBarGesture"
 {
 	Path "models"
 	Model 0 "NutatcoBar1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "Nutatco.png"
@@ -142,7 +142,7 @@ Model "FrispyCornGesture"
 {
 	Path "models"
 	Model 0 "FrispyCorn1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "FrispyCorn.png"
@@ -177,7 +177,7 @@ Model "SayaBeanGesture"
 {
 	Path "models"
 	Model 0 "SayaBean1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "SayaBean.png"
@@ -216,7 +216,7 @@ Model "MothPlushyGesture"
 {
 	Path "models"
 	Model 0 "MothPlush1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "MothPlush.png"
@@ -261,7 +261,7 @@ Model "DemoPlushGesture"
 {
 	Path "models"
 	Model 0 "DemoPlush1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DemoPlush.png"
@@ -301,7 +301,7 @@ Model "KirinCummiesGesture"
 {
 	Path "models"
 	Model 0 "TootFroot1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "TootFroot.png"
@@ -337,7 +337,7 @@ Model "MilkBreadsGesture"
 {
 	Path "models"
 	Model 0 "MilkBreads1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "MilkBreads.png"
@@ -372,7 +372,7 @@ Model "KirinMangaGesture"
 {
 	Path "models"
 	Model 0 "AkariProject1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "KirinManga.png"
@@ -407,7 +407,7 @@ Model "KirinPlushGesture"
 {
 	Path "models"
 	Model 0 "KirinPlush1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "KirinPlush.png"
diff --git a/modeldef.keygesture b/modeldef.keygesture
index 6db17949b..2580bf8e9 100644
--- a/modeldef.keygesture
+++ b/modeldef.keygesture
@@ -2,7 +2,7 @@ Model "SWWMRedCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomRedKey.png"
@@ -97,7 +97,7 @@ Model "SWWMRedCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -124,7 +124,7 @@ Model "SWWMYellowCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomYellowKey.png"
@@ -219,7 +219,7 @@ Model "SWWMYellowCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -246,7 +246,7 @@ Model "SWWMBlueCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomBlueKey.png"
@@ -341,7 +341,7 @@ Model "SWWMBlueCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -368,7 +368,7 @@ Model "SWWMSilverCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomSilverKey.png"
@@ -463,7 +463,7 @@ Model "SWWMSilverCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -490,7 +490,7 @@ Model "SWWMGreenCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomGreenKey.png"
@@ -585,7 +585,7 @@ Model "SWWMGreenCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -612,7 +612,7 @@ Model "SWWMOrangeCardGesture"
 {
 	Path "models"
 	Model 0 "DoomCard1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomOrangeKey.png"
@@ -707,7 +707,7 @@ Model "SWWMOrangeCardGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -734,7 +734,7 @@ Model "SWWMRedSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomRedSkull.png"
@@ -828,7 +828,7 @@ Model "SWWMRedSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -855,7 +855,7 @@ Model "SWWMYellowSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomYellowSkull.png"
@@ -949,7 +949,7 @@ Model "SWWMYellowSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -976,7 +976,7 @@ Model "SWWMBlueSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomBlueSkull.png"
@@ -1070,7 +1070,7 @@ Model "SWWMBlueSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1097,7 +1097,7 @@ Model "SWWMPurpleSkullGesture"
 {
 	Path "models"
 	Model 0 "DoomSkull1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "DoomPurpleSkull.png"
@@ -1191,7 +1191,7 @@ Model "SWWMPurpleSkullGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1218,7 +1218,7 @@ Model "SWWMGreenKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticGreen1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/greenenv.png"
@@ -1312,7 +1312,7 @@ Model "SWWMGreenKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1339,7 +1339,7 @@ Model "SWWMBlueKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticBlue1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/bluenv.png"
@@ -1433,7 +1433,7 @@ Model "SWWMBlueKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1460,7 +1460,7 @@ Model "SWWMYellowKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticYellow1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/goldenv.png"
@@ -1554,7 +1554,7 @@ Model "SWWMYellowKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
@@ -1581,7 +1581,7 @@ Model "SWWMRedKeyGesture"
 {
 	Path "models"
 	Model 0 "HereticRed1st_d.3d"
-	SurfaceSkin 0 0 "DemoTags1st.png"
+	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoArms.png"
 	SurfaceSkin 0 2 "DemoSoft.png"
 	SurfaceSkin 0 3 "envmap/redenv.png"
@@ -1675,7 +1675,7 @@ Model "SWWMRedKeyGesture"
 {
 	Path "models"
 	Model 1 "QuickPunch1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 
diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg
index 9bfa1c3fc..39b205ba8 100644
--- a/modeldef.sheenhmg
+++ b/modeldef.sheenhmg
@@ -136,7 +136,7 @@ Model "HeavyMahSheenGun"
 	Path "models"
 
 	Model 1 "SheenHMG1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "SheenHMG.png"
diff --git a/modeldef.silverbullet b/modeldef.silverbullet
index 3dcd8b9d7..f715477d0 100644
--- a/modeldef.silverbullet
+++ b/modeldef.silverbullet
@@ -181,7 +181,7 @@ Model "SilverBullet"
 	Path "models"
 
 	Model 1 "Silverbullet1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Silverbullet.png"
diff --git a/modeldef.sparkster b/modeldef.sparkster
index 62428a302..07afb60e2 100644
--- a/modeldef.sparkster
+++ b/modeldef.sparkster
@@ -259,7 +259,7 @@ Model "Sparkster"
 	Path "models"
 
 	Model 1 "Sparkster1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Sparkster.png"
diff --git a/modeldef.spreadgun b/modeldef.spreadgun
index 00c2a1bc3..3a02eed7e 100644
--- a/modeldef.spreadgun
+++ b/modeldef.spreadgun
@@ -220,7 +220,7 @@ Model "Spreadgun"
 	Path "models"
 
 	Model 1 "Spreadgun1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Spreadgun.png"
diff --git a/modeldef.wallbuster b/modeldef.wallbuster
index 1435a26ad..933805365 100644
--- a/modeldef.wallbuster
+++ b/modeldef.wallbuster
@@ -474,7 +474,7 @@ Model "Wallbuster"
 	Path "models"
 
 	Model 1 "Wallbuster1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Wallbuster.png"
diff --git a/modeldef.ynykron b/modeldef.ynykron
index a06621412..3e7665704 100644
--- a/modeldef.ynykron
+++ b/modeldef.ynykron
@@ -371,7 +371,7 @@ Model "Ynykron"
 	Path "models"
 
 	Model 1 "Ynykron1st_d.3d"
-	SurfaceSkin 1 0 "DemoTags1st.png"
+	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Ynykron.png"
diff --git a/models/DemoTags1st.png b/models/DemoTags1st.png
deleted file mode 100644
index bd223d3b3..000000000
Binary files a/models/DemoTags1st.png and /dev/null differ
diff --git a/sprites/LGFDA0.png b/sprites/LGFDA0.png
deleted file mode 100644
index a6f29931f..000000000
Binary files a/sprites/LGFDA0.png and /dev/null differ
diff --git a/zscript/items/swwm_funstuff.zsc b/zscript/items/swwm_funstuff.zsc
index ce2b874b6..ed6889b3c 100644
--- a/zscript/items/swwm_funstuff.zsc
+++ b/zscript/items/swwm_funstuff.zsc
@@ -176,16 +176,16 @@ Class SWWMFlag : Actor
 		switch ( seq )
 		{
 		case 0:
-			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag.png");
+			A_ChangeModel("",0,"","",0,"models","SWWMFlag.png");
 			break;
 		case 1:
-			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Pride.png");
+			A_ChangeModel("",0,"","",0,"models","SWWMFlag_Pride.png");
 			break;
 		case 2:
-			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Trans.png");
+			A_ChangeModel("",0,"","",0,"models","SWWMFlag_Trans.png");
 			break;
 		case 3:
-			A_ChangeModel("",0,"models","SWWMFlag_d.3d",0,"models","SWWMFlag_Enby.png");
+			A_ChangeModel("",0,"","",0,"models","SWWMFlag_Enby.png");
 			break;
 		}
 		A_StartSound("bestsound",CHAN_BODY,CHANF_OVERLAP);
diff --git a/zscript/menu/swwm_title.zsc b/zscript/menu/swwm_title.zsc
index 8a56b2863..18bb9f315 100644
--- a/zscript/menu/swwm_title.zsc
+++ b/zscript/menu/swwm_title.zsc
@@ -15,7 +15,7 @@ Class SWWMTitleStuff : EventHandler
 	ui bool bInitialized;
 	ui TextureID tex[6];
 	ui TextureID letters[13];
-	ui TextureID camtex;	// must be drawn for shaders to actually use it
+	ui Canvas lfade;
 	ui BrokenLines stitle;
 	ui Array<String> scrolls;
 	ui int sline;
@@ -24,7 +24,6 @@ Class SWWMTitleStuff : EventHandler
 	ui TitleExplosion smk[64];
 	ui TextureID smk_frame[19];
 	ui int titletimer;
-	int playtimer;	// required for the logo fader
 	ui int rss;
 	ui int stopinit_t;
 	ui bool bFadeIn;
@@ -69,22 +68,6 @@ Class SWWMTitleStuff : EventHandler
 		}
 	}
 
-	override void WorldLoaded( WorldEvent e )
-	{
-		let f = LogoFader(Actor.Spawn("LogoFader"));
-		f.hnd = self;
-		TexMan.SetCameraToTexture(f,"LOGOFADE",90);
-		// fallback in case netevents fail (old gzdoom)
-		playtimer = -65536;
-	}
-
-	// synchronize ui->play timer
-	override void NetworkProcess( ConsoleEvent e )
-	{
-		if ( e.Name == "swwmtitle.timer" )
-			playtimer = e.Args[0];
-	}
-
 	override void UiTick()
 	{
 		// you're not supposed to be here
@@ -151,8 +134,7 @@ Class SWWMTitleStuff : EventHandler
 	{
 		if ( !mSmallFont ) mSmallFont = Font.GetFont('TewiFont');
 		if ( !mBigFont ) mBigFont = Font.GetFont('TewiFontOutline');
-		if ( !camtex ) camtex = TexMan.CheckForTexture("LOGOFADE",TexMan.Type_Any);
-		Screen.DrawTexture(camtex,false,0,0);
+		if ( !lfade ) lfade = TexMan.GetCanvas("LOGOFADE");
 		if ( !tex[2] ) tex[2] = TexMan.CheckForTexture("graphics/tempbg.png",TexMan.Type_Any);
 		if ( !tex[5] ) tex[5] = TexMan.CheckForTexture("graphics/DemoIcon.png",TexMan.Type_Any);
 		Vector2 tsize, vsize;
@@ -288,6 +270,9 @@ Class SWWMTitleStuff : EventHandler
 		else if ( sar < ar ) vsize = (tsize.y*ar,tsize.y);
 		else vsize = tsize;
 		if ( (titletimer+e.FracTic)/GameTicRate < 22 ) return;
+		double alf1 = clamp((((titletimer+e.FracTic)/GameTicRate)-26.5)*.5,0.,1.);
+		double alf2 = ((titletimer+e.FracTic)/GameTicRate>28)?clamp((double(((titletimer+e.FracTic)-GameTicRate*3)%(GameTicRate*5))/GameTicRate),0.,1.):0.;
+		lfade.Clear(0,0,4,4,Color(int(255*alf1),int(255*alf2),0));
 		if ( bFadeIn ) Screen.Dim("Black",1.-clamp(((titletimer+e.FracTic)/GameTicRate)-22,0.,1.),0,0,Screen.GetWidth(),Screen.GetHeight());
 		if ( (titletimer+e.FracTic)/GameTicRate < 27 )
 		{
@@ -361,68 +346,3 @@ Class SWWMTitleStuff : EventHandler
 		}
 	}
 }
-
-const LOGOFADERBASE = 60000.;
-
-Class LogoFader : Actor
-{
-	Actor base;
-	SWWMTitleStuff hnd;
-
-	Default
-	{
-		+NOGRAVITY;
-		+NOBLOCKMAP;
-		+NOINTERACTION;
-		+DONTSPLASH;
-		Radius .1;
-		Height 0;
-	}
-
-	override void PostBeginPlay()
-	{
-		SetOrigin((LOGOFADERBASE+32,LOGOFADERBASE,0),false);
-		SetZ(floorz);
-		roll = 180;
-		angle = 180;
-		double halfstretch = (1.+level.pixelstretch)/2.;
-		if ( !base ) base = Spawn("LogoFaderSurface",(LOGOFADERBASE,LOGOFADERBASE-32.,floorz+32.*halfstretch));
-	}
-	override void Tick()
-	{
-		// old gzdoom fallback
-		// won't look as nice, but it's better than nothing
-		if ( hnd.playtimer == -65536 )
-		{
-			double alf = clamp(double((gametic-GameTicRate*3)%(GameTicRate*5))/GameTicRate,0.,1.);
-			base.SetShade(Color(255,int(255*alf),0));
-			return;
-		}
-		double alf1 = clamp(((double(hnd.playtimer)/GameTicRate)-26.5)*.5,0.,1.);
-		double alf2 = (hnd.playtimer>28*GameTicRate)?clamp((double((hnd.playtimer-GameTicRate*3)%(GameTicRate*5))/GameTicRate),0.,1.):0.;
-		base.SetShade(Color(int(255*alf1),int(255*alf2),0));
-	}
-}
-
-Class LogoFaderSurface : Actor
-{
-	Default
-	{
-		Radius .1;
-		Height 0.;
-		RenderRadius 256;
-		+NOBLOCKMAP;
-		+NOGRAVITY;
-		+NOINTERACTION;
-		+DONTSPLASH;
-		+WALLSPRITE;
-		RenderStyle "Stencil";
-	}
-	override void Tick(){}
-	States
-	{
-	Spawn:
-		LGFD A -1 Bright;
-		Stop;
-	}
-}
diff --git a/zscript/swwm_gesture.zsc b/zscript/swwm_gesture.zsc
index f2c30da62..9b1215bed 100644
--- a/zscript/swwm_gesture.zsc
+++ b/zscript/swwm_gesture.zsc
@@ -391,6 +391,12 @@ Class SWWMGesture : SWWMWeapon
 		if ( closest != -1 ) p.tracer = hits[closest].a;
 	}
 
+	override void SetTags( String colname )
+	{
+		// gestures use model 0
+		A_ChangeModel("",0,"","",0,"models","DemoTags"..colname..".png",CMDL_USESURFACESKIN,-1);
+	}
+
 	Default
 	{
 		+WEAPON.CHEATNOTWEAPON;
@@ -734,6 +740,12 @@ Class SWWMItemGesture : SWWMWeapon abstract
 		invoker.gotused = true;
 	}
 
+	override void SetTags( String colname )
+	{
+		// gestures use model 0
+		A_ChangeModel("",0,"","",0,"models","DemoTags"..colname..".png",CMDL_USESURFACESKIN,-1);
+	}
+
 	Default
 	{
 		+WEAPON.CHEATNOTWEAPON;
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index 0f017f334..8aa1f0c60 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -181,8 +181,13 @@ Class Demolitionist : PlayerPawn
 		int idx = tagcolor.GetInt();
 		if ( (idx < 0) || (idx >= colname.Size()) ) idx = 0;
 		if ( idx != oldtagcolor )
-			A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",0,"models","DemoTags"..colname[idx]..".png",CMDL_USESURFACESKIN,-1);
+			A_ChangeModel("",0,"","",0,"models","DemoTags"..colname[idx]..".png",CMDL_USESURFACESKIN,-1);
 		oldtagcolor = idx;
+		for ( Inventory i=inv; i; i=i.inv )
+		{
+			if ( !(i is 'SWWMWeapon') ) continue;
+			SWWMWeapon(i).UpdateTags(idx,colname[idx]);
+		}
 	}
 
 	private void UpdateFace()
@@ -276,7 +281,7 @@ Class Demolitionist : PlayerPawn
 		};
 		int faceidx = GetFaceTex();
 		if ( !oldfaceidx || (faceidx != oldfaceidx) )
-			A_ChangeModel("",0,"models","DemolitionistPlayer_d.3d",1,"models","DemoFace_"..facetex[faceidx]..".png",CMDL_USESURFACESKIN,-1);
+			A_ChangeModel("",0,"","",1,"models","DemoFace_"..facetex[faceidx]..".png",CMDL_USESURFACESKIN,-1);
 		oldfaceidx = faceidx;
 	}
 	private int GetFaceTex()
diff --git a/zscript/swwm_statichandler.zsc b/zscript/swwm_statichandler.zsc
index 61c840488..917c67fc1 100644
--- a/zscript/swwm_statichandler.zsc
+++ b/zscript/swwm_statichandler.zsc
@@ -31,9 +31,6 @@ Class SWWMStaticHandler : StaticEventHandler
 	// stupid dumb thing
 	ui int aprcheck;
 	ui Font aprfnt;
-	// hack stuff
-	Canvas tagcv;
-	TextureID tagtex[13];
 
 	override void NewGame()
 	{
@@ -71,34 +68,6 @@ Class SWWMStaticHandler : StaticEventHandler
 			for ( int i=0; i<stinkers.Size(); i++ ) Console.Printf("%s is not STAT_STATIC!",stinkers[i].GetClassName());
 			ThrowAbortException("Panic! %d static thinker%s been tampered with!",stinkers.Size(),(stinkers.Size()==1)?" has":"s have");
 		}
-		// ugly ugly hack
-		static const String colname[] =
-		{
-			"",
-			"Blue",
-			"Cyan",
-			"Dragonfly",
-			"Gold",
-			"Magenta",
-			"Orange",
-			"Peach",
-			"Pink",
-			"Purple",
-			"Red",
-			"Violet",
-			"White",
-			"Yellow"
-		};
-		for ( int i=0; i<13; i++ )
-		{
-			if ( tagtex[i] ) continue;
-			tagtex[i] = TexMan.CheckForTexture("models/DemoTags"..colname[i]..".png",TexMan.Type_Any);
-		}
-		if ( !tagcv ) tagcv = TexMan.GetCanvas("DEMOT1ST");
-		int idx = 0;
-		let demo = Demolitionist(players[consoleplayer].mo);
-		if ( demo ) idx = demo.oldtagcolor;
-		tagcv.DrawTexture(tagtex[idx],false,0,0);
 	}
 
 	override void WorldLoaded( WorldEvent e )
diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc
index 873fa7682..1d8754c1a 100644
--- a/zscript/weapons/swwm_baseweapon.zsc
+++ b/zscript/weapons/swwm_baseweapon.zsc
@@ -362,6 +362,17 @@ Class SWWMWeapon : Weapon abstract
 	virtual ui void RenderTexture( RenderEvent e )
 	{
 	}
+	// update color tags on first person model
+	void UpdateTags( int idx, String colname )
+	{
+		if ( idx != oldtagcolor )
+			SetTags(colname);
+		oldtagcolor = idx;
+	}
+	virtual void SetTags( String colname )
+	{
+		A_ChangeModel("",1,"","",0,"models","DemoTags"..colname..".png",CMDL_USESURFACESKIN,-1);
+	}
 	// animations
 	action void A_PlayerFire()
 	{
diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc
index 02209c40f..1eee28738 100644
--- a/zscript/weapons/swwm_splode.zsc
+++ b/zscript/weapons/swwm_splode.zsc
@@ -310,6 +310,11 @@ Class ExplodiumGun : SWWMWeapon
 		Super.PlayUpSound(origin);
 	}
 
+	override void SetTags( String colname )
+	{
+		A_ChangeModel("",1,"","",0,"models","DemoTags"..colname..".png",CMDL_USESURFACESKIN,-1);
+	}
+
 	Default
 	{
 		Tag "$T_EXPLODIUM";
@@ -755,6 +760,13 @@ Class DualExplodiumGun : SWWMWeapon
 		return SisterWeapon.CreateTossable(amt);
 	}
 
+	override void SetTags( String colname )
+	{
+		Super.SetTags(colname);
+		// also set tag for the second gun
+		A_ChangeModel("",3,"","",0,"models","DemoTags"..colname..".png",CMDL_USESURFACESKIN,-1);
+	}
+
 	Default
 	{
 		Tag "$T_EXPLODIUM2";