diff --git a/fonts/MiniHUDOutline/002D.png b/fonts/MiniHUDOutline/002D.png
index a179fadcc..df6a1f8c7 100644
Binary files a/fonts/MiniHUDOutline/002D.png and b/fonts/MiniHUDOutline/002D.png differ
diff --git a/fonts/MiniHUDOutline/002E.png b/fonts/MiniHUDOutline/002E.png
new file mode 100644
index 000000000..24b1893ab
Binary files /dev/null and b/fonts/MiniHUDOutline/002E.png differ
diff --git a/fonts/MiniHUDOutline/0051.png b/fonts/MiniHUDOutline/0051.png
index 6e19f22b4..27226c20e 100644
Binary files a/fonts/MiniHUDOutline/0051.png and b/fonts/MiniHUDOutline/0051.png differ
diff --git a/fonts/MiniHUDOutline/207A.png b/fonts/MiniHUDOutline/207A.png
index 1b4374d65..8228ec994 100644
Binary files a/fonts/MiniHUDOutline/207A.png and b/fonts/MiniHUDOutline/207A.png differ
diff --git a/fonts/MiniHUDShadow/002D.png b/fonts/MiniHUDShadow/002D.png
index dae3bb0fa..abca679e0 100644
Binary files a/fonts/MiniHUDShadow/002D.png and b/fonts/MiniHUDShadow/002D.png differ
diff --git a/fonts/MiniHUDShadow/002E.png b/fonts/MiniHUDShadow/002E.png
new file mode 100644
index 000000000..4a3bc5eb9
Binary files /dev/null and b/fonts/MiniHUDShadow/002E.png differ
diff --git a/fonts/MiniHUDShadow/004C.png b/fonts/MiniHUDShadow/004C.png
index b623faf65..ae01e6756 100644
Binary files a/fonts/MiniHUDShadow/004C.png and b/fonts/MiniHUDShadow/004C.png differ
diff --git a/gldefs/dlc1/dlcammo.txt b/gldefs/dlc1/dlcammo.txt
index 342b46bfc..1cfb1695e 100644
--- a/gldefs/dlc1/dlcammo.txt
+++ b/gldefs/dlc1/dlcammo.txt
@@ -107,7 +107,7 @@ Object QuadravolAmmo3
 	Frame XZW1 { light QUADAMMOLIGHT }
 }
 
-PointLight KINYLUMAMMOLIGHT
+/*PointLight KINYLUMAMMOLIGHT
 {
 	Color 0.2 0.8 1.0
 	Size 20
@@ -144,7 +144,7 @@ Object SparksterRAmmo2
 Object SparksterRAmmo3
 {
 	Frame XZW1 { light NOKRONAMMOLIGHT }
-}
+}*/
 
 PointLight MISTERAMMOLIGHT
 {
diff --git a/gldefs/weapons/eviscerator.txt b/gldefs/weapons/eviscerator.txt
index 0aed54a06..67f07c280 100644
--- a/gldefs/weapons/eviscerator.txt
+++ b/gldefs/weapons/eviscerator.txt
@@ -6,4 +6,5 @@ Material Texture "models/Eviscerator.png"
 	Texture "masktex" "models/Eviscerator_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
 }
diff --git a/gldefs/weapons/spreadgun.txt b/gldefs/weapons/spreadgun.txt
index 41ca4439b..91b07a174 100644
--- a/gldefs/weapons/spreadgun.txt
+++ b/gldefs/weapons/spreadgun.txt
@@ -6,4 +6,5 @@ Material Texture "models/Spreadgun.png"
 	Texture "masktex" "models/Spreadgun_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
 }
diff --git a/gldefs/weapons/wallbuster.txt b/gldefs/weapons/wallbuster.txt
index 437d1e4a0..000b7b3e5 100644
--- a/gldefs/weapons/wallbuster.txt
+++ b/gldefs/weapons/wallbuster.txt
@@ -6,4 +6,5 @@ Material Texture "models/Wallbuster.png"
 	Texture "masktex" "models/Wallbuster_mask.png"
 	Texture "envtex" "models/envmap/leadenv.png"
 	Texture "rimtex" "models/envmap/leadrim.png"
+	Define "RIM_LIGHTING"
 }
diff --git a/language.version b/language.version
index 23f159837..b87c2f89b 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r752 \cu(Tue 28 Feb 00:00:43 CET 2023)\c-";
-SWWM_SHORTVER="\cw1.3pre r752 \cu(2023-02-28 00:00:43)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r753 \cu(Tue 28 Feb 00:01:03 CET 2023)\c-";
+SWWM_SHORTVER="\cw1.3pre r753 \cu(2023-02-28 00:01:03)\c-";
diff --git a/modeldef/demolitionist.txt b/modeldef/demolitionist.txt
index b2ca6dea2..0a6657f25 100644
--- a/modeldef/demolitionist.txt
+++ b/modeldef/demolitionist.txt
@@ -2,7 +2,7 @@
 Model "Demolitionist"
 {
 	Path "models"
-	Model 0 "DemolitionistPlayer_d.3d"
+	Model 0 "DemolitionistPlayer.iqm"
 	SurfaceSkin 0 0 "DemoTags.png"
 	SurfaceSkin 0 1 "DemoFace_Default.png"
 	SurfaceSkin 0 2 "DemoBody.png"
@@ -14,7 +14,8 @@ Model "Demolitionist"
 	SurfaceSkin 0 8 "DemoKeys.png"
 	SurfaceSkin 0 9 "ExplodiumGun.png"
 	SurfaceSkin 0 10 "ExplodiumGun.png"
-	Scale 0.0025 0.0025 0.0025
+	AngleOffset -90
+	Scale 40.96 40.96 40.96
 	IGNORETRANSLATION
 
 	// Still/Walk
diff --git a/modeldef/dlc1/dlcammo.txt b/modeldef/dlc1/dlcammo.txt
index 7ec912455..65cc43149 100644
--- a/modeldef/dlc1/dlcammo.txt
+++ b/modeldef/dlc1/dlcammo.txt
@@ -167,11 +167,11 @@ Model "QuadravolAmmo3"
 
 Model "SparksterBAmmo"
 {
-	Path "models"
+	Path "models/extra"
 
-	Model 0 "ModernSparksterAmmo_d.3d"
-	Skin 0 "DefaultT"
-	Scale 0.8 0.8 0.8
+	Model 0 "BaseCube.obj"
+	Skin 0 "CHIPTILY"
+	Scale 5 5 5
 	ZOffset 16
 	PitchOffset 30
 	CORRECTPIXELSTRETCH
@@ -180,33 +180,37 @@ Model "SparksterBAmmo"
 }
 Model "SparksterBAmmo2"
 {
-	Path "models"
+	Path "models/extra"
 
-	Model 0 "ModernSparksterAmmo2_d.3d"
-	Skin 0 "DefaultT"
-	Scale 0.8 0.8 0.8
+	Model 0 "BaseCube.obj"
+	Skin 0 "CHIPTILY"
+	Scale 5 5 5
 	ZOffset 16
+	PitchOffset 30
+	CORRECTPIXELSTRETCH
 
 	FrameIndex XZW1 A 0 0
 }
 Model "SparksterBAmmo3"
 {
-	Path "models"
+	Path "models/extra"
 
-	Model 0 "ModernSparksterAmmo3_d.3d"
-	Skin 0 "DefaultT"
-	Scale 0.8 0.8 0.8
+	Model 0 "BaseCube.obj"
+	Skin 0 "CHIPTILY"
+	Scale 5 5 5
 	ZOffset 16
+	PitchOffset 30
+	CORRECTPIXELSTRETCH
 
 	FrameIndex XZW1 A 0 0
 }
 Model "SparksterRAmmo"
 {
-	Path "models"
+	Path "models/extra"
 
-	Model 0 "ModernSparksterAmmo_d.3d"
-	Skin 0 "DefaultT"
-	Scale 0.8 0.8 0.8
+	Model 0 "BaseCube.obj"
+	Skin 0 "CHIPTILY"
+	Scale 5 5 5
 	ZOffset 16
 	PitchOffset 30
 	CORRECTPIXELSTRETCH
@@ -215,23 +219,27 @@ Model "SparksterRAmmo"
 }
 Model "SparksterRAmmo2"
 {
-	Path "models"
+	Path "models/extra"
 
-	Model 0 "ModernSparksterAmmo2_d.3d"
-	Skin 0 "DefaultT"
-	Scale 0.8 0.8 0.8
+	Model 0 "BaseCube.obj"
+	Skin 0 "CHIPTILY"
+	Scale 5 5 5
 	ZOffset 16
+	PitchOffset 30
+	CORRECTPIXELSTRETCH
 
 	FrameIndex XZW1 A 0 0
 }
 Model "SparksterRAmmo3"
 {
-	Path "models"
+	Path "models/extra"
 
-	Model 0 "ModernSparksterAmmo3_d.3d"
-	Skin 0 "DefaultT"
-	Scale 0.8 0.8 0.8
+	Model 0 "BaseCube.obj"
+	Skin 0 "CHIPTILY"
+	Scale 5 5 5
 	ZOffset 16
+	PitchOffset 30
+	CORRECTPIXELSTRETCH
 
 	FrameIndex XZW1 A 0 0
 }
diff --git a/modeldef/weapons/candygun.txt b/modeldef/weapons/candygun.txt
index 8143665bd..f79e59781 100644
--- a/modeldef/weapons/candygun.txt
+++ b/modeldef/weapons/candygun.txt
@@ -93,16 +93,17 @@ Model "CandyGun"
 	Path "models"
 
 	Model 0 "ExplodiumGunPickup.iqm"
-	Skin 0 "CandyGun.png"
+	SurfaceSkin 0 0 "CandyGun.png"
 	Scale 12 12 12
 	ZOffset 16
 	AngleOffset 180
 
+	SurfaceSkin 0 1 "CandyGun.png"
 	FrameIndex XZW1 A 0 0
-	Model 0 "ExplodiumGunPickupNoMag.iqm"
+	SurfaceSkin 0 1 ""
 	FrameIndex XZW1 B 0 0
-	Model 0 "ExplodiumGunPickupEmpty.iqm"
-	FrameIndex XZW1 C 0 0
+	SurfaceSkin 0 1 "CandyGun_EmptyMag.png"
+	FrameIndex XZW1 C 0 1
 }
 
 Model "CandyGun"
@@ -140,14 +141,14 @@ Model "CandyGun"
 {
 	Path "models"
 
-	Model 3 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 3 4 "CandyCasing_Used.png"
+	Model 3 "ExplodiumGun1st_Casing.iqm"
+	SurfaceSkin 3 0 "CandyCasing_Used.png"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 0 0 -2
 
-	// Casing
+	// Casing Drop
 	FrameIndex XZWC A 3 14
 	FrameIndex XZWC B 3 15
 	FrameIndex XZWC C 3 16
@@ -158,20 +159,41 @@ Model "CandyGun"
 	FrameIndex XZWC H 3 21
 	FrameIndex XZWC I 3 22
 	FrameIndex XZWC J 3 23
+	// Casing Check
+	SurfaceSkin 3 0 "CandyCasing.png"
+	FrameIndex XZWF B 3 157
+	FrameIndex XZWF C 3 158
+	FrameIndex XZWF D 3 159
+	FrameIndex XZWF E 3 160
+	FrameIndex XZWF F 3 161
+	FrameIndex XZWF G 3 162
+	FrameIndex XZWF H 3 163
+	FrameIndex XZWF I 3 164
+	FrameIndex XZWF J 3 165
+	FrameIndex XZWF K 3 166
+	FrameIndex XZWF L 3 167
+	FrameIndex XZWF M 3 168
+	FrameIndex XZWF N 3 169
+	FrameIndex XZWF O 3 170
+	FrameIndex XZWF P 3 171
+	FrameIndex XZWF Q 3 172
+	FrameIndex XZWF R 3 173
+	FrameIndex XZWF S 3 174
+	FrameIndex XZWF T 3 175
 }
 
 Model "CandyGun"
 {
 	Path "models"
 
-	Model 1 "ExplodiumGun1st_d.3d"
+	Model 1 "ExplodiumGun1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "CandyGun.png"
-	SurfaceSkin 1 5 "CandyGun.png"
+	SurfaceSkin 1 4 "CandyGun.png"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 0 0 -2
 
@@ -221,7 +243,7 @@ Model "CandyGun"
 	FrameIndex XZW3 H 1 39
 	FrameIndex XZW3 I 1 40
 	// Reload (Part 1 w/ Empty Mag)
-	SurfaceSkin 1 5 "CandyGun_EmptyMag.png"	// empty mag
+	SurfaceSkin 1 4 "CandyGun_EmptyMag.png"	// empty mag
 	FrameIndex XZW3 J 1 25
 	FrameIndex XZW3 K 1 26
 	FrameIndex XZW3 L 1 27
@@ -239,8 +261,8 @@ Model "CandyGun"
 	FrameIndex XZW3 X 1 39
 	FrameIndex XZW3 Y 1 40
 	// Reload (Part 2)
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "CandyGun.png"	// show new mag
+	SurfaceSkin 1 4 ""	// hide mag
+	SurfaceSkin 1 5 "CandyGun.png"	// show new mag
 	FrameIndex XZW3 Z 1 41
 	FrameIndex XZW4 A 1 42
 	FrameIndex XZW4 B 1 43
@@ -249,11 +271,11 @@ Model "CandyGun"
 	FrameIndex XZW4 E 1 46
 	FrameIndex XZW4 F 1 47
 	FrameIndex XZW4 G 1 48
-	SurfaceSkin 1 6 ""	// hide new mag
+	SurfaceSkin 1 5 ""	// hide new mag
 	FrameIndex XZW4 H 1 49
 	FrameIndex XZW4 I 1 50
 	FrameIndex XZW4 J 1 51
-	SurfaceSkin 1 5 "CandyGun.png"	// show mag
+	SurfaceSkin 1 4 "CandyGun.png"	// show mag
 	FrameIndex XZW4 K 1 52
 	FrameIndex XZW4 L 1 53
 	FrameIndex XZW4 M 1 54
@@ -307,8 +329,8 @@ Model "CandyGun"
 	FrameIndex XZW6 G 1 102
 	FrameIndex XZW6 H 1 103
 	FrameIndex XZW6 I 1 104
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "CandyGun.png"	// show new mag
+	SurfaceSkin 1 4 ""	// hide mag
+	SurfaceSkin 1 5 "CandyGun.png"	// show new mag
 	FrameIndex XZW6 J 1 105
 	FrameIndex XZW6 K 1 106
 	FrameIndex XZW6 L 1 107
@@ -319,7 +341,7 @@ Model "CandyGun"
 	FrameIndex XZW6 Q 1 112
 	FrameIndex XZW6 R 1 113
 	FrameIndex XZW6 S 1 114
-	SurfaceSkin 1 6 ""	// hide new mag
+	SurfaceSkin 1 5 ""	// hide new mag
 	FrameIndex XZW6 T 1 115
 	FrameIndex XZW6 U 1 116
 	FrameIndex XZW6 V 1 117
@@ -327,9 +349,8 @@ Model "CandyGun"
 	FrameIndex XZW6 X 1 119
 	FrameIndex XZW6 Y 1 120
 	FrameIndex XZW6 Z 1 121
-	SurfaceSkin 1 5 "CandyGun.png"	// show mag
+	SurfaceSkin 1 4 "CandyGun.png"	// show mag
 	// Check Bullet
-	SurfaceSkin 1 4 "CandyCasing.png"	// show casing
 	FrameIndex XZW7 A 1 157
 	FrameIndex XZW7 B 1 158
 	FrameIndex XZW7 C 1 159
@@ -349,7 +370,6 @@ Model "CandyGun"
 	FrameIndex XZW7 Q 1 173
 	FrameIndex XZW7 R 1 174
 	FrameIndex XZW7 S 1 175
-	SurfaceSkin 1 4 ""	// hide casing
 	// Melee
 	FrameIndex XZW7 T 1 177
 	FrameIndex XZW7 U 1 178
@@ -430,7 +450,7 @@ Model "CandyGun"
 	FrameIndex XZWB Q 1 145
 	FrameIndex XZWB R 1 146
 	SurfaceSkin 1 3 ""	// hide gun
-	SurfaceSkin 1 5 ""	// hide mag
+	SurfaceSkin 1 4 ""	// hide mag
 	FrameIndex XZWB S 1 147
 	FrameIndex XZWB T 1 148
 	FrameIndex XZWB U 1 149
@@ -441,7 +461,7 @@ Model "CandyGun"
 	FrameIndex XZWB Z 1 154
 	/// LAST ROUND
 	SurfaceSkin 1 3 "CandyGun.png"
-	SurfaceSkin 1 5 "CandyGun.png"
+	SurfaceSkin 1 4 "CandyGun.png"
 	// Fire
 	FrameIndex XZWC K 1 237
 	FrameIndex XZWC L 1 238
@@ -455,7 +475,7 @@ Model "CandyGun"
 	// Still
 	FrameIndex XZW9 X 1 248
 	// Reload (Part 1)
-	SurfaceSkin 1 5 "CandyGun_EmptyMag.png"	// empty mag
+	SurfaceSkin 1 4 "CandyGun_EmptyMag.png"	// empty mag
 	FrameIndex XZW9 Z 1 249
 	FrameIndex XZWC X 1 250
 	FrameIndex XZWC Y 1 251
@@ -473,8 +493,8 @@ Model "CandyGun"
 	FrameIndex XZWD K 1 263
 	FrameIndex XZWD L 1 264
 	// Reload (Part 2)
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "CandyGun.png"	// show new mag
+	SurfaceSkin 1 4 ""	// hide mag
+	SurfaceSkin 1 5 "CandyGun.png"	// show new mag
 	FrameIndex XZWD M 1 265
 	FrameIndex XZWD N 1 266
 	FrameIndex XZWD O 1 267
@@ -483,11 +503,11 @@ Model "CandyGun"
 	FrameIndex XZWD R 1 270
 	FrameIndex XZWD S 1 271
 	FrameIndex XZWD T 1 272
-	SurfaceSkin 1 6 ""	// hide new mag
+	SurfaceSkin 1 5 ""	// hide new mag
 	FrameIndex XZWD U 1 273
 	FrameIndex XZWD V 1 274
 	FrameIndex XZWD W 1 275
-	SurfaceSkin 1 5 "CandyGun.png"	// show mag
+	SurfaceSkin 1 4 "CandyGun.png"	// show mag
 	FrameIndex XZWD X 1 276
 	FrameIndex XZWD Y 1 277
 	FrameIndex XZWD Z 1 278
diff --git a/modeldef/weapons/deepimpact.txt b/modeldef/weapons/deepimpact.txt
index 6b26766fd..ba5fb3b60 100644
--- a/modeldef/weapons/deepimpact.txt
+++ b/modeldef/weapons/deepimpact.txt
@@ -14,13 +14,13 @@ Model "DeepImpact"
 {
 	Path "models"
 
-	Model 1 "DeepImpact1st_d.3d"
+	Model 1 "DeepImpact1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "DeepImpact.png"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 0 0 -2
 
diff --git a/modeldef/weapons/eviscerator.txt b/modeldef/weapons/eviscerator.txt
index 10dfc393f..719f7f8d6 100644
--- a/modeldef/weapons/eviscerator.txt
+++ b/modeldef/weapons/eviscerator.txt
@@ -99,8 +99,7 @@ Model "Eviscerator"
 	ZOffset 20
 
 	FrameIndex XZW1 A 0 0
-	Model 0 "EvisceratorPickupExt.iqm"
-	FrameIndex XZW1 B 0 0
+	FrameIndex XZW1 B 0 1
 }
 
 Model "Eviscerator"
@@ -135,9 +134,9 @@ Model "Eviscerator"
 {
 	Path "models"
 
-	Model 3 "Eviscerator1st_d.3d"
-	SurfaceSkin 3 4 "EvisceratorShell.png"
-	Scale -0.005 0.0025 0.005
+	Model 3 "Eviscerator1st_Casing.iqm"
+	SurfaceSkin 3 0 "EvisceratorShell.png"
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 0 2 0
 
@@ -158,12 +157,12 @@ Model "Eviscerator"
 {
 	Path "models"
 
-	Model 1 "Eviscerator1st_d.3d"
+	Model 1 "Eviscerator1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Eviscerator.png"
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 0 2 0
 
diff --git a/modeldef/weapons/explodiumgun.txt b/modeldef/weapons/explodiumgun.txt
index 30959ea8c..154d413ee 100644
--- a/modeldef/weapons/explodiumgun.txt
+++ b/modeldef/weapons/explodiumgun.txt
@@ -37,20 +37,20 @@ Model "ExplodiumMagProj"
 {
 	Path "models"
 
-	Model 0 "ExplodiumMagPrimed.iqm"
+	Model 0 "ExplodiumMag.iqm"
 	Skin 0 "ExplodiumGun.png"
 	Scale 8 8 8
 	USEACTORPITCH
 	USEACTORROLL
 	CORRECTPIXELSTRETCH
 
-	FrameIndex XZW1 A 0 0
+	FrameIndex XZW1 A 0 1
 }
 Model "ExplodiumMagAttach"
 {
 	Path "models"
 
-	Model 0 "ExplodiumMagPrimed.iqm"
+	Model 0 "ExplodiumMag.iqm"
 	Skin 0 "ExplodiumGun.png"
 	Scale 8 8 8
 	USEACTORPITCH
@@ -58,11 +58,11 @@ Model "ExplodiumMagAttach"
 	CORRECTPIXELSTRETCH
 	AngleOffset 90
 
-	FrameIndex XZW1 A 0 0
+	FrameIndex XZW1 A 0 1
 	RollOffset 90
-	FrameIndex XZW1 B 0 0
+	FrameIndex XZW1 B 0 1
 	RollOffset -90
-	FrameIndex XZW1 C 0 0
+	FrameIndex XZW1 C 0 1
 }
 
 Model "ExplodiumGun"
@@ -113,14 +113,14 @@ Model "ExplodiumGun"
 {
 	Path "models"
 
-	Model 3 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 3 4 "ExplodiumCasing_Used.png"
+	Model 3 "ExplodiumGun1st_Casing.iqm"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 0 0 -2
 
-	// Casing
+	// Casing Drop
+	SurfaceSkin 3 0 "ExplodiumCasing_Used.png"
 	FrameIndex XZWA A 3 14
 	FrameIndex XZWA B 3 15
 	FrameIndex XZWA C 3 16
@@ -131,20 +131,41 @@ Model "ExplodiumGun"
 	FrameIndex XZWA H 3 21
 	FrameIndex XZWA I 3 22
 	FrameIndex XZWA J 3 23
+	// Casing Check
+	SurfaceSkin 3 0 "ExplodiumCasing.png"
+	FrameIndex XZWC Q 3 157
+	FrameIndex XZWC R 3 158
+	FrameIndex XZWC S 3 159
+	FrameIndex XZWC T 3 160
+	FrameIndex XZWC U 3 161
+	FrameIndex XZWC V 3 162
+	FrameIndex XZWC W 3 163
+	FrameIndex XZWC X 3 164
+	FrameIndex XZWC Y 3 165
+	FrameIndex XZWC Z 3 166
+	FrameIndex XZWD A 3 167
+	FrameIndex XZWD B 3 168
+	FrameIndex XZWD C 3 169
+	FrameIndex XZWD D 3 170
+	FrameIndex XZWD E 3 171
+	FrameIndex XZWD F 3 172
+	FrameIndex XZWD G 3 173
+	FrameIndex XZWD H 3 174
+	FrameIndex XZWD I 3 175
 }
 
 Model "ExplodiumGun"
 {
 	Path "models"
 
-	Model 1 "ExplodiumGun1st_d.3d"
+	Model 1 "ExplodiumGun1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "ExplodiumGun.png"
-	SurfaceSkin 1 5 "ExplodiumGun.png"
+	SurfaceSkin 1 4 "ExplodiumGun.png"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 0 0 -2
 
@@ -194,7 +215,7 @@ Model "ExplodiumGun"
 	FrameIndex XZW3 H 1 39
 	FrameIndex XZW3 I 1 40
 	// Reload (Part 1 w/ Empty Mag)
-	SurfaceSkin 1 5 "ExplodiumGun_EmptyMag.png"	// empty mag
+	SurfaceSkin 1 4 "ExplodiumGun_EmptyMag.png"	// empty mag
 	FrameIndex XZW3 J 1 25
 	FrameIndex XZW3 K 1 26
 	FrameIndex XZW3 L 1 27
@@ -212,8 +233,8 @@ Model "ExplodiumGun"
 	FrameIndex XZW3 X 1 39
 	FrameIndex XZW3 Y 1 40
 	// Reload (Part 2)
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
+	SurfaceSkin 1 4 ""	// hide mag
+	SurfaceSkin 1 5 "ExplodiumGun.png"	// show new mag
 	FrameIndex XZW3 Z 1 41
 	FrameIndex XZW4 A 1 42
 	FrameIndex XZW4 B 1 43
@@ -222,11 +243,11 @@ Model "ExplodiumGun"
 	FrameIndex XZW4 E 1 46
 	FrameIndex XZW4 F 1 47
 	FrameIndex XZW4 G 1 48
-	SurfaceSkin 1 6 ""	// hide new mag
+	SurfaceSkin 1 5 ""	// hide new mag
 	FrameIndex XZW4 H 1 49
 	FrameIndex XZW4 I 1 50
 	FrameIndex XZW4 J 1 51
-	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
+	SurfaceSkin 1 4 "ExplodiumGun.png"	// show mag
 	FrameIndex XZW4 K 1 52
 	FrameIndex XZW4 L 1 53
 	FrameIndex XZW4 M 1 54
@@ -280,8 +301,8 @@ Model "ExplodiumGun"
 	FrameIndex XZW6 G 1 102
 	FrameIndex XZW6 H 1 103
 	FrameIndex XZW6 I 1 104
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
+	SurfaceSkin 1 4 ""	// hide mag
+	SurfaceSkin 1 5 "ExplodiumGun.png"	// show new mag
 	FrameIndex XZW6 J 1 105
 	FrameIndex XZW6 K 1 106
 	FrameIndex XZW6 L 1 107
@@ -292,7 +313,7 @@ Model "ExplodiumGun"
 	FrameIndex XZW6 Q 1 112
 	FrameIndex XZW6 R 1 113
 	FrameIndex XZW6 S 1 114
-	SurfaceSkin 1 6 ""	// hide new mag
+	SurfaceSkin 1 5 ""	// hide new mag
 	FrameIndex XZW6 T 1 115
 	FrameIndex XZW6 U 1 116
 	FrameIndex XZW6 V 1 117
@@ -300,9 +321,8 @@ Model "ExplodiumGun"
 	FrameIndex XZW6 X 1 119
 	FrameIndex XZW6 Y 1 120
 	FrameIndex XZW6 Z 1 121
-	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
+	SurfaceSkin 1 4 "ExplodiumGun.png"	// show mag
 	// Check Bullet
-	SurfaceSkin 1 4 "ExplodiumCasing.png"	// show casing
 	FrameIndex XZW7 A 1 157
 	FrameIndex XZW7 B 1 158
 	FrameIndex XZW7 C 1 159
@@ -322,7 +342,6 @@ Model "ExplodiumGun"
 	FrameIndex XZW7 Q 1 173
 	FrameIndex XZW7 R 1 174
 	FrameIndex XZW7 S 1 175
-	SurfaceSkin 1 4 ""	// hide casing
 	// Melee
 	FrameIndex XZW7 T 1 177
 	FrameIndex XZW7 U 1 178
@@ -396,7 +415,7 @@ Model "ExplodiumGun"
 	// Still
 	FrameIndex XZW9 X 1 248
 	// Reload (Part 1)
-	SurfaceSkin 1 5 "ExplodiumGun_EmptyMag.png"	// empty mag
+	SurfaceSkin 1 4 "ExplodiumGun_EmptyMag.png"	// empty mag
 	FrameIndex XZW9 Z 1 249
 	FrameIndex XZWA X 1 250
 	FrameIndex XZWA Y 1 251
@@ -414,8 +433,8 @@ Model "ExplodiumGun"
 	FrameIndex XZWB K 1 263
 	FrameIndex XZWB L 1 264
 	// Reload (Part 2)
-	SurfaceSkin 1 5 ""	// hide mag
-	SurfaceSkin 1 6 "ExplodiumGun.png"	// show new mag
+	SurfaceSkin 1 4 ""	// hide mag
+	SurfaceSkin 1 5 "ExplodiumGun.png"	// show new mag
 	FrameIndex XZWB M 1 265
 	FrameIndex XZWB N 1 266
 	FrameIndex XZWB O 1 267
@@ -424,11 +443,11 @@ Model "ExplodiumGun"
 	FrameIndex XZWB R 1 270
 	FrameIndex XZWB S 1 271
 	FrameIndex XZWB T 1 272
-	SurfaceSkin 1 6 ""	// hide new mag
+	SurfaceSkin 1 5 ""	// hide new mag
 	FrameIndex XZWB U 1 273
 	FrameIndex XZWB V 1 274
 	FrameIndex XZWB W 1 275
-	SurfaceSkin 1 5 "ExplodiumGun.png"	// show mag
+	SurfaceSkin 1 4 "ExplodiumGun.png"	// show mag
 	FrameIndex XZWB X 1 276
 	FrameIndex XZWB Y 1 277
 	FrameIndex XZWB Z 1 278
@@ -509,52 +528,64 @@ Model "DualExplodiumGun"
 {
 	Path "models"
 
-	Model 4 "ExplodiumGun1st_d.3d"
-	SurfaceSkin 4 4 "ExplodiumCasing_Used.png"
+	Model 2 "ExplodiumGun1stL_Casing.iqm"
+	SurfaceSkin 2 0 "ExplodiumCasing_Used.png"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
-	Offset 3 0 -2
+	Offset -3 0 -2
 
 	// Casings
-	// RIGHT
-	FrameIndex XZWA A 4 14
-	FrameIndex XZWA B 4 15
-	FrameIndex XZWA C 4 16
-	FrameIndex XZWA D 4 17
-	FrameIndex XZWA E 4 18
-	FrameIndex XZWA F 4 19
-	FrameIndex XZWA G 4 20
-	FrameIndex XZWA H 4 21
-	FrameIndex XZWA I 4 22
-	FrameIndex XZWA J 4 23
 	// LEFT
-	Model 4 "ExplodiumGun1stL_d.3d"
-	Offset -3 0 -2
-	FrameIndex XZWI A 4 14
-	FrameIndex XZWI B 4 15
-	FrameIndex XZWI C 4 16
-	FrameIndex XZWI D 4 17
-	FrameIndex XZWI E 4 18
-	FrameIndex XZWI F 4 19
-	FrameIndex XZWI G 4 20
-	FrameIndex XZWI H 4 21
-	FrameIndex XZWI I 4 22
-	FrameIndex XZWI J 4 23
+	FrameIndex XZWI A 2 14
+	FrameIndex XZWI B 2 15
+	FrameIndex XZWI C 2 16
+	FrameIndex XZWI D 2 17
+	FrameIndex XZWI E 2 18
+	FrameIndex XZWI F 2 19
+	FrameIndex XZWI G 2 20
+	FrameIndex XZWI H 2 21
+	FrameIndex XZWI I 2 22
+	FrameIndex XZWI J 2 23
 }
 
 Model "DualExplodiumGun"
 {
 	Path "models"
 
-	Model 3 "ExplodiumGun1stL_d.3d"
+	Model 2 "ExplodiumGun1st_Casing.iqm"
+	SurfaceSkin 2 0 "ExplodiumCasing_Used.png"
+
+	Scale -128 64 128
+	AngleOffset -90
+	Offset 3 0 -2
+
+	// Casings
+	// RIGHT
+	FrameIndex XZWA A 2 14
+	FrameIndex XZWA B 2 15
+	FrameIndex XZWA C 2 16
+	FrameIndex XZWA D 2 17
+	FrameIndex XZWA E 2 18
+	FrameIndex XZWA F 2 19
+	FrameIndex XZWA G 2 20
+	FrameIndex XZWA H 2 21
+	FrameIndex XZWA I 2 22
+	FrameIndex XZWA J 2 23
+}
+
+Model "DualExplodiumGun"
+{
+	Path "models"
+
+	Model 3 "ExplodiumGun1stL.iqm"
 	SurfaceSkin 3 0 "DemoTags.png"
 	SurfaceSkin 3 1 "DemoArms.png"
 	SurfaceSkin 3 2 "DemoSoft.png"
 	SurfaceSkin 3 3 "ExplodiumGun.png"
-	SurfaceSkin 3 5 "ExplodiumGun.png"
+	SurfaceSkin 3 4 "ExplodiumGun.png"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset -3 0 -2
 
@@ -604,7 +635,7 @@ Model "DualExplodiumGun"
 	FrameIndex XZWC G 3 323
 	FrameIndex XZWC H 3 324
 	// Reload (Part 1 w/ Empty Mag)
-	SurfaceSkin 3 3 "ExplodiumGun_EmptyMag.png"
+	SurfaceSkin 3 4 "ExplodiumGun_EmptyMag.png"
 	FrameIndex XZWC I 3 310
 	FrameIndex XZWC J 3 311
 	FrameIndex XZWC K 3 312
@@ -621,7 +652,7 @@ Model "DualExplodiumGun"
 	FrameIndex XZWC V 3 323
 	FrameIndex XZWC W 3 324
 	// Reload (Part 2)
-	SurfaceSkin 3 3 "ExplodiumGun.png"
+	SurfaceSkin 3 4 "ExplodiumGun.png"
 	FrameIndex XZWC X 3 325
 	FrameIndex XZWC Y 3 326
 	FrameIndex XZWC Z 3 327
@@ -711,7 +742,7 @@ Model "DualExplodiumGun"
 	// Still
 	FrameIndex XZWK Z 3 248
 	// Reload (Part 1)
-	SurfaceSkin 3 3 "ExplodiumGun_EmptyMag.png"
+	SurfaceSkin 3 4 "ExplodiumGun_EmptyMag.png"
 	FrameIndex XZWL A 3 346
 	FrameIndex XZWL B 3 347
 	FrameIndex XZWL C 3 348
@@ -728,7 +759,7 @@ Model "DualExplodiumGun"
 	FrameIndex XZWL N 3 359
 	FrameIndex XZWL O 3 360
 	// Reload (Part 2)
-	SurfaceSkin 3 3 "ExplodiumGun.png"
+	SurfaceSkin 3 4 "ExplodiumGun.png"
 	FrameIndex XZWL P 3 361
 	FrameIndex XZWL Q 3 362
 	FrameIndex XZWL R 3 363
@@ -754,14 +785,14 @@ Model "DualExplodiumGun"
 {
 	Path "models"
 
-	Model 1 "ExplodiumGun1st_d.3d"
+	Model 1 "ExplodiumGun1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "ExplodiumGun.png"
-	SurfaceSkin 1 5 "ExplodiumGun.png"
+	SurfaceSkin 1 4 "ExplodiumGun.png"
 
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	AngleOffset -90
 	Offset 3 0 -2
 
@@ -811,7 +842,7 @@ Model "DualExplodiumGun"
 	FrameIndex XZW3 G 1 323
 	FrameIndex XZW3 H 1 324
 	// Reload (Part 1 w/ Empty Mag)
-	SurfaceSkin 1 3 "ExplodiumGun_EmptyMag.png"
+	SurfaceSkin 1 4 "ExplodiumGun_EmptyMag.png"
 	FrameIndex XZW3 I 1 310
 	FrameIndex XZW3 J 1 311
 	FrameIndex XZW3 K 1 312
@@ -828,7 +859,7 @@ Model "DualExplodiumGun"
 	FrameIndex XZW3 V 1 323
 	FrameIndex XZW3 W 1 324
 	// Reload (Part 2)
-	SurfaceSkin 1 3 "ExplodiumGun.png"
+	SurfaceSkin 1 4 "ExplodiumGun.png"
 	FrameIndex XZW3 X 1 325
 	FrameIndex XZW3 Y 1 326
 	FrameIndex XZW3 Z 1 327
@@ -920,7 +951,7 @@ Model "DualExplodiumGun"
 	// Still
 	FrameIndex XZWI V 1 248
 	// Reload (Part 1)
-	SurfaceSkin 1 3 "ExplodiumGun_EmptyMag.png"
+	SurfaceSkin 1 4 "ExplodiumGun_EmptyMag.png"
 	FrameIndex XZWI W 1 346
 	FrameIndex XZWI X 1 347
 	FrameIndex XZWI Y 1 348
diff --git a/modeldef/weapons/hellblazer.txt b/modeldef/weapons/hellblazer.txt
index 6b868ca05..2aef5462b 100644
--- a/modeldef/weapons/hellblazer.txt
+++ b/modeldef/weapons/hellblazer.txt
@@ -28,31 +28,13 @@ Model "Hellblazer"
 {
 	Path "models"
 
-	Model 0 "HellblazerPickup6.iqm"
+	Model 0 "HellblazerPickup.iqm"
 	SurfaceSkin 0 0 "Hellblazer.png"
 	SurfaceSkin 0 1 "HellblazerAmmo.png"
-	SurfaceSkin 0 2 "HellblazerMissile.png"
-	SurfaceSkin 0 3 "HellblazerMissile.png"
-	SurfaceSkin 0 4 "HellblazerMissile.png"
-	SurfaceSkin 0 5 "HellblazerMissile.png"
-	SurfaceSkin 0 6 "HellblazerMissile.png"
-	SurfaceSkin 0 7 "HellblazerMissile.png"
 	Scale 28 28 28
 	ZOffset 20
 
 	FrameIndex XZW1 A 0 0
-	Model 0 "HellblazerPickup5.iqm"
-	FrameIndex XZW1 B 0 0
-	Model 0 "HellblazerPickup4.iqm"
-	FrameIndex XZW1 C 0 0
-	Model 0 "HellblazerPickup3.iqm"
-	FrameIndex XZW1 D 0 0
-	Model 0 "HellblazerPickup2.iqm"
-	FrameIndex XZW1 E 0 0
-	Model 0 "HellblazerPickup1.iqm"
-	FrameIndex XZW1 F 0 0
-	Model 0 "HellblazerPickup0.iqm"
-	FrameIndex XZW1 G 0 0
 }
 
 Model "HellblazerX"
@@ -73,11 +55,11 @@ Model "Hellblazer"
 {
 	Path "models"
 
-	Model 2 "Hellblazer1st_d.3d"
-	SurfaceSkin 2 4 "Hellblazer.png"
+	Model 2 "Hellblazer1stX.iqm"
+	SurfaceSkin 2 0 "Hellblazer.png"
 
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	Offset -2 2 1
 
 	// Still / Deselect
@@ -226,20 +208,17 @@ Model "Hellblazer"
 {
 	Path "models"
 
-	Model 1 "Hellblazer1st_d.3d"
+	Model 1 "Hellblazer1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Hellblazer.png"
+	SurfaceSkin 1 4 "HellblazerAmmo.png"
 
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	Offset -2 2 1
 
-	SurfaceSkin 1 5 "HellblazerAmmo.png"
-	SurfaceSkin 1 6 "HellblazerAmmo.png"
-	SurfaceSkin 1 7 "HellblazerAmmo.png"
-	SurfaceSkin 1 8 "HellblazerAmmo.png"
 	// Still / Deselect
 	FrameIndex XZW2 A 1 0
 	FrameIndex XZW2 B 1 1
@@ -375,10 +354,7 @@ Model "Hellblazer"
 	FrameIndex XZW6 T 1 149
 	FrameIndex XZW6 U 1 150
 	// ReloadInter
-	SurfaceSkin 1 5 ""
-	SurfaceSkin 1 6 ""
-	SurfaceSkin 1 7 ""
-	SurfaceSkin 1 8 ""
+	SurfaceSkin 1 4 ""
 	FrameIndex XZW6 V 1 153
 	FrameIndex XZW6 W 1 154
 	FrameIndex XZW6 X 1 155
diff --git a/modeldef/weapons/silverbullet.txt b/modeldef/weapons/silverbullet.txt
index 172b0929e..0374326f7 100644
--- a/modeldef/weapons/silverbullet.txt
+++ b/modeldef/weapons/silverbullet.txt
@@ -63,13 +63,13 @@ Model "SilverBullet"
 {
 	Path "models"
 
-	Model 2 "Silverbullet1st_d.3d"
+	Model 2 "Silverbullet1st_Casing.iqm"
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	DONTCULLBACKFACES
 
 	// Casing
-	SurfaceSkin 2 5 "SilverbulletBullet_Used.png"
+	SurfaceSkin 2 0 "SilverbulletBullet_Used.png"
 	FrameIndex XZW7 S 2 30
 	FrameIndex XZW7 T 2 31
 	FrameIndex XZW7 U 2 32
@@ -83,8 +83,8 @@ Model "SilverBullet"
 	FrameIndex XZW8 C 2 40
 	FrameIndex XZW8 D 2 41
 	// Bullet
-	SurfaceSkin 2 5 "SilverbulletBullet.png"
-	SurfaceSkin 2 7 "SilverbulletBullet.png"
+	SurfaceSkin 2 0 "SilverbulletBullet.png"
+	SurfaceSkin 2 1 "SilverbulletBullet.png"
 	FrameIndex XZW8 E 2 30
 	FrameIndex XZW8 F 2 31
 	FrameIndex XZW8 G 2 32
@@ -97,10 +97,19 @@ Model "SilverBullet"
 	FrameIndex XZW8 N 2 39
 	FrameIndex XZW8 O 2 40
 	FrameIndex XZW8 P 2 41
-	SurfaceSkin 2 5 ""
-	SurfaceSkin 2 7 ""
+}
+
+Model "SilverBullet"
+{
+	Path "models"
+
+	Model 2 "Silverbullet1st_Smoke.iqm"
+	AngleOffset -90
+	Scale -128 64 128
+	DONTCULLBACKFACES
+
 	// Jets
-	SurfaceSkin 2 6 "SilverbulletJetSmoke.png"
+	SurfaceSkin 2 0 "SilverbulletJetSmoke.png"
 	FrameIndex XZW8 Q 2 16
 	FrameIndex XZW8 R 2 17
 	FrameIndex XZW8 S 2 18
@@ -116,14 +125,14 @@ Model "SilverBullet"
 {
 	Path "models"
 
-	Model 1 "Silverbullet1st_d.3d"
+	Model 1 "Silverbullet1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Silverbullet.png"
 	SurfaceSkin 1 4 "SilverbulletAmmo.png"
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 
 	// Still / Deselect
 	FrameIndex XZW2 A 1 0
diff --git a/modeldef/weapons/sparkster.txt b/modeldef/weapons/sparkster.txt
index 8b2959850..9ee0d7464 100644
--- a/modeldef/weapons/sparkster.txt
+++ b/modeldef/weapons/sparkster.txt
@@ -174,12 +174,11 @@ Model "Sparkster"
 	Model 0 "SparksterPickup.iqm"
 	SurfaceSkin 0 0 "Sparkster.png"
 	SurfaceSkin 0 1 "SparksterAmmo.png"
-	SurfaceSkin 0 2 "SparksterAmmo.png"
 	Scale 30 30 30
 	ZOffset 16
 
 	FrameIndex XZW1 A 0 0
-	Model 0 "SparksterPickupDouble.iqm"
+	SurfaceSkin 0 2 "SparksterAmmo.png"
 	FrameIndex XZW1 B 0 0
 }
 
@@ -198,11 +197,11 @@ Model "Sparkster"
 
 Model "Sparkster"
 {
-	Path "models/extra"
+	Path "models"
 
-	Model 3 "SparksterVent_d.3d"
+	Model 3 "SparksterVent.obj"
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	DONTCULLBACKFACES
 
 	// Still Vent
@@ -260,7 +259,7 @@ Model "Sparkster"
 {
 	Path "models"
 
-	Model 1 "Sparkster1st_d.3d"
+	Model 1 "Sparkster1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
@@ -268,7 +267,7 @@ Model "Sparkster"
 	SurfaceSkin 1 4 "SparksterAmmo.png"
 
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 
 	// Still / Deselect
 	FrameIndex XZW2 A 1 0
@@ -312,8 +311,10 @@ Model "Sparkster"
 	FrameIndex XZW3 I 1 38
 	FrameIndex XZW3 J 1 39
 	FrameIndex XZW3 K 1 40
+	SurfaceSkin 1 4 ""
 	FrameIndex XZW3 L 1 41
 	FrameIndex XZW3 M 1 42
+	SurfaceSkin 1 4 "SparksterAmmo.png"
 	FrameIndex XZW3 N 1 43	// Reload2
 	FrameIndex XZW3 O 1 44
 	FrameIndex XZW3 P 1 45
@@ -385,7 +386,9 @@ Model "Sparkster"
 	FrameIndex XZW5 Y 1 109
 	//// DOUBLE MODE
 	// Still
+	SurfaceSkin 1 5 "SparksterAmmo.png"
 	FrameIndex XZW5 Z 1 129	// defined first just to get that Z out of the way
+	SurfaceSkin 1 5 ""
 	// AttachExtra
 	FrameIndex XZW6 A 1 111
 	FrameIndex XZW6 B 1 112
@@ -499,8 +502,10 @@ Model "Sparkster"
 	FrameIndex XZW9 U 1 217
 	FrameIndex XZW9 V 1 218
 	FrameIndex XZW9 W 1 219
+	SurfaceSkin 1 4 ""
 	FrameIndex XZW9 X 1 220
 	FrameIndex XZW9 Y 1 221
+	SurfaceSkin 1 4 "SparksterAmmo.png"
 	FrameIndex XZW9 Z 1 222	// ToReload2
 	// DoubleStacc
 	SurfaceSkin 1 5 ""
diff --git a/modeldef/weapons/spreadgun.txt b/modeldef/weapons/spreadgun.txt
index a5a443644..b08554358 100644
--- a/modeldef/weapons/spreadgun.txt
+++ b/modeldef/weapons/spreadgun.txt
@@ -39,8 +39,7 @@ Model "Spreadgun"
 	ZOffset 16
 
 	FrameIndex XZW1 A 0 0
-	Model 0 "SpreadgunPickupFired.iqm"
-	FrameIndex XZW1 B 0 0
+	FrameIndex XZW1 B 0 1
 }
 
 Model "Spreadgun"
@@ -65,14 +64,14 @@ Model "Spreadgun"
 {
 	Path "models"
 
-	Model 1 "Spreadgun1st_d.3d"
+	Model 1 "Spreadgun1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Spreadgun.png"
 	AngleOffset -90
 	Offset -4 0 -2
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 
 	///// PRIMED
 	// Idle / Deselect
diff --git a/modeldef/weapons/wallbuster.txt b/modeldef/weapons/wallbuster.txt
index 0c8ec9545..9f20c4dae 100644
--- a/modeldef/weapons/wallbuster.txt
+++ b/modeldef/weapons/wallbuster.txt
@@ -77,241 +77,12 @@ Model "Wallbuster"
 	FrameIndex XZWW Y 3 0
 }
 
-/*Model "Wallbuster"
-{
-	// shells
-	Path "models"
-
-	Model 2 "Wallbuster1st_d.3d"
-	AngleOffset -93
-	PitchOffset 0.4
-	Offset 0 2 0
-	Scale -0.005 0.0025 0.005
-
-	////// Unfired
-	//// Shell0
-	SurfaceSkin 2 4 "Shell_Normal.png"
-	// Detach
-	FrameIndex XZWA E 2 91
-	FrameIndex XZWA F 2 92
-	FrameIndex XZWA G 2 93
-	FrameIndex XZWA H 2 94
-	FrameIndex XZWA I 2 95
-	FrameIndex XZWA J 2 96
-	FrameIndex XZWA K 2 97
-	FrameIndex XZWA L 2 98
-	FrameIndex XZWA M 2 99
-	FrameIndex XZWA N 2 100
-	// Attach
-	FrameIndex XZWA O 2 116
-	FrameIndex XZWA P 2 117
-	FrameIndex XZWA Q 2 118
-	FrameIndex XZWA R 2 119
-	FrameIndex XZWA S 2 120
-	FrameIndex XZWA T 2 121
-	FrameIndex XZWA U 2 122
-	FrameIndex XZWA V 2 123
-	FrameIndex XZWA W 2 124
-	FrameIndex XZWA X 2 125
-	FrameIndex XZWA Y 2 126
-	FrameIndex XZWA Z 2 127
-	FrameIndex XZWB A 2 128
-	FrameIndex XZWB B 2 129
-	//// Shell1
-	SurfaceSkin 2 4 ""
-	SurfaceSkin 2 5 "Shell_Normal.png"
-	// Detach
-	FrameIndex XZWB C 2 91
-	FrameIndex XZWB D 2 92
-	FrameIndex XZWB E 2 93
-	FrameIndex XZWB F 2 94
-	FrameIndex XZWB G 2 95
-	FrameIndex XZWB H 2 96
-	FrameIndex XZWB I 2 97
-	FrameIndex XZWB J 2 98
-	FrameIndex XZWB K 2 99
-	FrameIndex XZWB L 2 100
-	// Attach
-	FrameIndex XZWB M 2 116
-	FrameIndex XZWB N 2 117
-	FrameIndex XZWB O 2 118
-	FrameIndex XZWB P 2 119
-	FrameIndex XZWB Q 2 120
-	FrameIndex XZWB R 2 121
-	FrameIndex XZWB S 2 122
-	FrameIndex XZWB T 2 123
-	FrameIndex XZWB U 2 124
-	FrameIndex XZWB V 2 125
-	FrameIndex XZWB W 2 126
-	FrameIndex XZWB X 2 127
-	FrameIndex XZWB Y 2 128
-	FrameIndex XZWB Z 2 129
-	//// Shell2
-	SurfaceSkin 2 5 ""
-	SurfaceSkin 2 6 "Shell_Normal.png"
-	// Detach
-	FrameIndex XZWC A 2 91
-	FrameIndex XZWC B 2 92
-	FrameIndex XZWC C 2 93
-	FrameIndex XZWC D 2 94
-	FrameIndex XZWC E 2 95
-	FrameIndex XZWC F 2 96
-	FrameIndex XZWC G 2 97
-	FrameIndex XZWC H 2 98
-	FrameIndex XZWC I 2 99
-	FrameIndex XZWC J 2 100
-	// Attach
-	FrameIndex XZWC K 2 116
-	FrameIndex XZWC L 2 117
-	FrameIndex XZWC M 2 118
-	FrameIndex XZWC N 2 119
-	FrameIndex XZWC O 2 120
-	FrameIndex XZWC P 2 121
-	FrameIndex XZWC Q 2 122
-	FrameIndex XZWC R 2 123
-	FrameIndex XZWC S 2 124
-	FrameIndex XZWC T 2 125
-	FrameIndex XZWC U 2 126
-	FrameIndex XZWC V 2 127
-	FrameIndex XZWC W 2 128
-	FrameIndex XZWC X 2 129
-	//// Shell3
-	SurfaceSkin 2 6 ""
-	SurfaceSkin 2 7 "Shell_Normal.png"
-	// Detach
-	FrameIndex XZWC Y 2 91
-	FrameIndex XZWC Z 2 92
-	FrameIndex XZWD A 2 93
-	FrameIndex XZWD B 2 94
-	FrameIndex XZWD C 2 95
-	FrameIndex XZWD D 2 96
-	FrameIndex XZWD E 2 97
-	FrameIndex XZWD F 2 98
-	FrameIndex XZWD G 2 99
-	FrameIndex XZWD H 2 100
-	// Attach
-	FrameIndex XZWD I 2 116
-	FrameIndex XZWD J 2 117
-	FrameIndex XZWD K 2 118
-	FrameIndex XZWD L 2 119
-	FrameIndex XZWD M 2 120
-	FrameIndex XZWD N 2 121
-	FrameIndex XZWD O 2 122
-	FrameIndex XZWD P 2 123
-	FrameIndex XZWD Q 2 124
-	FrameIndex XZWD R 2 125
-	FrameIndex XZWD S 2 126
-	FrameIndex XZWD T 2 127
-	FrameIndex XZWD U 2 128
-	FrameIndex XZWD V 2 129
-	//// Shell4
-	SurfaceSkin 2 7 ""
-	SurfaceSkin 2 8 "Shell_Normal.png"
-	// Detach
-	FrameIndex XZWD W 2 91
-	FrameIndex XZWD X 2 92
-	FrameIndex XZWD Y 2 93
-	FrameIndex XZWD Z 2 94
-	FrameIndex XZWE A 2 95
-	FrameIndex XZWE B 2 96
-	FrameIndex XZWE C 2 97
-	FrameIndex XZWE D 2 98
-	FrameIndex XZWE E 2 99
-	FrameIndex XZWE F 2 100
-	// Attach
-	FrameIndex XZWE G 2 116
-	FrameIndex XZWE H 2 117
-	FrameIndex XZWE I 2 118
-	FrameIndex XZWE J 2 119
-	FrameIndex XZWE K 2 120
-	FrameIndex XZWE L 2 121
-	FrameIndex XZWE M 2 122
-	FrameIndex XZWE N 2 123
-	FrameIndex XZWE O 2 124
-	FrameIndex XZWE P 2 125
-	FrameIndex XZWE Q 2 126
-	FrameIndex XZWE R 2 127
-	FrameIndex XZWE S 2 128
-	FrameIndex XZWE T 2 129
-	////// Fired
-	//// Shell0
-	SurfaceSkin 2 8 ""
-	SurfaceSkin 2 4 "Shell_Normal_Used.png"
-	// Detach
-	FrameIndex XZWF L 2 91
-	FrameIndex XZWF M 2 92
-	FrameIndex XZWF N 2 93
-	FrameIndex XZWF O 2 94
-	FrameIndex XZWF P 2 95
-	FrameIndex XZWF Q 2 96
-	FrameIndex XZWF R 2 97
-	FrameIndex XZWF S 2 98
-	FrameIndex XZWF T 2 99
-	FrameIndex XZWF U 2 100
-	//// Shell1
-	SurfaceSkin 2 4 ""
-	SurfaceSkin 2 5 "Shell_Normal_Used.png"
-	// Detach
-	FrameIndex XZWF V 2 91
-	FrameIndex XZWF W 2 92
-	FrameIndex XZWF X 2 93
-	FrameIndex XZWF Y 2 94
-	FrameIndex XZWF Z 2 95
-	FrameIndex XZWG A 2 96
-	FrameIndex XZWG B 2 97
-	FrameIndex XZWG C 2 98
-	FrameIndex XZWG D 2 99
-	FrameIndex XZWG E 2 100
-	//// Shell2
-	SurfaceSkin 2 5 ""
-	SurfaceSkin 2 6 "Shell_Normal_Used.png"
-	// Detach
-	FrameIndex XZWG F 2 91
-	FrameIndex XZWG G 2 92
-	FrameIndex XZWG H 2 93
-	FrameIndex XZWG I 2 94
-	FrameIndex XZWG J 2 95
-	FrameIndex XZWG K 2 96
-	FrameIndex XZWG L 2 97
-	FrameIndex XZWG M 2 98
-	FrameIndex XZWG N 2 99
-	FrameIndex XZWG O 2 100
-	//// Shell3
-	SurfaceSkin 2 6 ""
-	SurfaceSkin 2 7 "Shell_Normal_Used.png"
-	// Detach
-	FrameIndex XZWG P 2 91
-	FrameIndex XZWG Q 2 92
-	FrameIndex XZWG R 2 93
-	FrameIndex XZWG S 2 94
-	FrameIndex XZWG T 2 95
-	FrameIndex XZWG U 2 96
-	FrameIndex XZWG V 2 97
-	FrameIndex XZWG W 2 98
-	FrameIndex XZWG X 2 99
-	FrameIndex XZWG Y 2 100
-	//// Shell4
-	SurfaceSkin 2 7 ""
-	SurfaceSkin 2 8 "Shell_Normal_Used.png"
-	// Detach
-	FrameIndex XZWG Z 2 91
-	FrameIndex XZWH A 2 92
-	FrameIndex XZWH B 2 93
-	FrameIndex XZWH C 2 94
-	FrameIndex XZWH D 2 95
-	FrameIndex XZWH E 2 96
-	FrameIndex XZWH F 2 97
-	FrameIndex XZWH G 2 98
-	FrameIndex XZWH H 2 99
-	FrameIndex XZWH I 2 100
-}*/
-
 Model "Wallbuster"
 {
 	// main
 	Path "models"
 
-	Model 1 "Wallbuster1st_d.3d"
+	Model 1 "Wallbuster1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
@@ -319,7 +90,7 @@ Model "Wallbuster"
 	AngleOffset -93
 	PitchOffset 0.4
 	Offset 0 2 0
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 
 	// Still/Deselect
 	FrameIndex XZW2 A 1 0
diff --git a/modeldef/weapons/ynykron.txt b/modeldef/weapons/ynykron.txt
index e40244d92..87b1364d3 100644
--- a/modeldef/weapons/ynykron.txt
+++ b/modeldef/weapons/ynykron.txt
@@ -322,10 +322,10 @@ Model "Ynykron"
 {
 	Path "models"
 
-	Model 2 "Ynykron1st_d.3d"
-	SurfaceSkin 2 5 "YnykronSmoke.png"
+	Model 2 "Ynykron1st_Smoke.iqm"
+	SurfaceSkin 2 0 "YnykronSmoke.png"
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 	DONTCULLBACKFACES
 
 	// FireVent
@@ -367,14 +367,14 @@ Model "Ynykron"
 {
 	Path "models"
 
-	Model 1 "Ynykron1st_d.3d"
+	Model 1 "Ynykron1st.iqm"
 	SurfaceSkin 1 0 "DemoTags.png"
 	SurfaceSkin 1 1 "DemoArms.png"
 	SurfaceSkin 1 2 "DemoSoft.png"
 	SurfaceSkin 1 3 "Ynykron.png"
 	SurfaceSkin 1 4 "YnykronAmmo.png"
 	AngleOffset -90
-	Scale -0.005 0.0025 0.005
+	Scale -128 64 128
 
 	// Still / Deselect
 	FrameIndex XZW2 A 1 0
diff --git a/models/DeepImpact.blend b/models/DeepImpact.blend
index 8cc3b645e..bc6279ac2 100644
Binary files a/models/DeepImpact.blend and b/models/DeepImpact.blend differ
diff --git a/models/DeepImpact1st.blend b/models/DeepImpact1st.blend
index d80ae11a7..ab396b5a7 100644
Binary files a/models/DeepImpact1st.blend and b/models/DeepImpact1st.blend differ
diff --git a/models/DeepImpact1st.iqm b/models/DeepImpact1st.iqm
new file mode 100644
index 000000000..1be152cf1
Binary files /dev/null and b/models/DeepImpact1st.iqm differ
diff --git a/models/DeepImpact1st_a.3d b/models/DeepImpact1st_a.3d
deleted file mode 100644
index acf00214d..000000000
Binary files a/models/DeepImpact1st_a.3d and /dev/null differ
diff --git a/models/DeepImpact1st_d.3d b/models/DeepImpact1st_d.3d
deleted file mode 100644
index 92b7c84ef..000000000
Binary files a/models/DeepImpact1st_d.3d and /dev/null differ
diff --git a/models/DeepImpactPickup.iqm b/models/DeepImpactPickup.iqm
index ec965f9fd..33e84e97a 100644
Binary files a/models/DeepImpactPickup.iqm and b/models/DeepImpactPickup.iqm differ
diff --git a/models/DemolitionistPlayer.blend b/models/DemolitionistPlayer.blend
index f2a53dd9d..78aa83421 100644
Binary files a/models/DemolitionistPlayer.blend and b/models/DemolitionistPlayer.blend differ
diff --git a/models/DemolitionistPlayer.iqm b/models/DemolitionistPlayer.iqm
new file mode 100644
index 000000000..9cb9a2dd5
Binary files /dev/null and b/models/DemolitionistPlayer.iqm differ
diff --git a/models/DemolitionistPlayer_a.3d b/models/DemolitionistPlayer_a.3d
deleted file mode 100644
index 7e6cd166b..000000000
Binary files a/models/DemolitionistPlayer_a.3d and /dev/null differ
diff --git a/models/DemolitionistPlayer_d.3d b/models/DemolitionistPlayer_d.3d
deleted file mode 100644
index b6b0a5a0b..000000000
Binary files a/models/DemolitionistPlayer_d.3d and /dev/null differ
diff --git a/models/Eviscerator1st.blend b/models/Eviscerator1st.blend
index eb81ab34f..bc2f251a3 100644
Binary files a/models/Eviscerator1st.blend and b/models/Eviscerator1st.blend differ
diff --git a/models/Eviscerator1st.iqm b/models/Eviscerator1st.iqm
new file mode 100644
index 000000000..b0e362dec
Binary files /dev/null and b/models/Eviscerator1st.iqm differ
diff --git a/models/Eviscerator1st_Casing.iqm b/models/Eviscerator1st_Casing.iqm
new file mode 100644
index 000000000..a19c826ab
Binary files /dev/null and b/models/Eviscerator1st_Casing.iqm differ
diff --git a/models/Eviscerator1st_a.3d b/models/Eviscerator1st_a.3d
deleted file mode 100644
index 00a34ce97..000000000
Binary files a/models/Eviscerator1st_a.3d and /dev/null differ
diff --git a/models/Eviscerator1st_d.3d b/models/Eviscerator1st_d.3d
deleted file mode 100644
index e22a1c340..000000000
Binary files a/models/Eviscerator1st_d.3d and /dev/null differ
diff --git a/models/EvisceratorPickup.iqm b/models/EvisceratorPickup.iqm
index 2d58e5036..b835f1ac6 100644
Binary files a/models/EvisceratorPickup.iqm and b/models/EvisceratorPickup.iqm differ
diff --git a/models/EvisceratorPickupExt.iqm b/models/EvisceratorPickupExt.iqm
deleted file mode 100644
index 83f1648fe..000000000
Binary files a/models/EvisceratorPickupExt.iqm and /dev/null differ
diff --git a/models/ExplodiumGun1st.blend b/models/ExplodiumGun1st.blend
index 9a912d7f6..7411cadce 100644
Binary files a/models/ExplodiumGun1st.blend and b/models/ExplodiumGun1st.blend differ
diff --git a/models/ExplodiumGun1st.iqm b/models/ExplodiumGun1st.iqm
new file mode 100644
index 000000000..d56066322
Binary files /dev/null and b/models/ExplodiumGun1st.iqm differ
diff --git a/models/ExplodiumGun1stL.iqm b/models/ExplodiumGun1stL.iqm
new file mode 100644
index 000000000..0110a6de8
Binary files /dev/null and b/models/ExplodiumGun1stL.iqm differ
diff --git a/models/ExplodiumGun1stL_Casing.iqm b/models/ExplodiumGun1stL_Casing.iqm
new file mode 100644
index 000000000..1ae132acd
Binary files /dev/null and b/models/ExplodiumGun1stL_Casing.iqm differ
diff --git a/models/ExplodiumGun1stL_a.3d b/models/ExplodiumGun1stL_a.3d
deleted file mode 100644
index 314993e0b..000000000
Binary files a/models/ExplodiumGun1stL_a.3d and /dev/null differ
diff --git a/models/ExplodiumGun1stL_d.3d b/models/ExplodiumGun1stL_d.3d
deleted file mode 100644
index ffc69d204..000000000
Binary files a/models/ExplodiumGun1stL_d.3d and /dev/null differ
diff --git a/models/ExplodiumGun1st_Casing.iqm b/models/ExplodiumGun1st_Casing.iqm
new file mode 100644
index 000000000..920dd2460
Binary files /dev/null and b/models/ExplodiumGun1st_Casing.iqm differ
diff --git a/models/ExplodiumGun1st_a.3d b/models/ExplodiumGun1st_a.3d
deleted file mode 100644
index 33ba085b7..000000000
Binary files a/models/ExplodiumGun1st_a.3d and /dev/null differ
diff --git a/models/ExplodiumGun1st_d.3d b/models/ExplodiumGun1st_d.3d
deleted file mode 100644
index 136b7aecb..000000000
Binary files a/models/ExplodiumGun1st_d.3d and /dev/null differ
diff --git a/models/ExplodiumGunPickup.iqm b/models/ExplodiumGunPickup.iqm
index eca6c7e13..27cafb91d 100644
Binary files a/models/ExplodiumGunPickup.iqm and b/models/ExplodiumGunPickup.iqm differ
diff --git a/models/ExplodiumGunPickupEmpty.iqm b/models/ExplodiumGunPickupEmpty.iqm
deleted file mode 100644
index fbb5c973d..000000000
Binary files a/models/ExplodiumGunPickupEmpty.iqm and /dev/null differ
diff --git a/models/ExplodiumGunPickupNoMag.iqm b/models/ExplodiumGunPickupNoMag.iqm
deleted file mode 100644
index 9c5bba6fa..000000000
Binary files a/models/ExplodiumGunPickupNoMag.iqm and /dev/null differ
diff --git a/models/Hellblazer.blend b/models/Hellblazer.blend
index bfdc318e6..c2b96dcea 100644
Binary files a/models/Hellblazer.blend and b/models/Hellblazer.blend differ
diff --git a/models/Hellblazer1st.blend b/models/Hellblazer1st.blend
index eb92c57d6..b7218cb2c 100644
Binary files a/models/Hellblazer1st.blend and b/models/Hellblazer1st.blend differ
diff --git a/models/Hellblazer1st.iqm b/models/Hellblazer1st.iqm
new file mode 100644
index 000000000..13f9b62af
Binary files /dev/null and b/models/Hellblazer1st.iqm differ
diff --git a/models/Hellblazer1stX.iqm b/models/Hellblazer1stX.iqm
new file mode 100644
index 000000000..e44722cf2
Binary files /dev/null and b/models/Hellblazer1stX.iqm differ
diff --git a/models/Hellblazer1st_a.3d b/models/Hellblazer1st_a.3d
deleted file mode 100644
index 2d02c8cb6..000000000
Binary files a/models/Hellblazer1st_a.3d and /dev/null differ
diff --git a/models/Hellblazer1st_d.3d b/models/Hellblazer1st_d.3d
deleted file mode 100644
index a1d8f9967..000000000
Binary files a/models/Hellblazer1st_d.3d and /dev/null differ
diff --git a/models/HellblazerPickup6.iqm b/models/HellblazerPickup.iqm
similarity index 72%
rename from models/HellblazerPickup6.iqm
rename to models/HellblazerPickup.iqm
index 803d13bd0..913218d79 100644
Binary files a/models/HellblazerPickup6.iqm and b/models/HellblazerPickup.iqm differ
diff --git a/models/HellblazerPickup0.iqm b/models/HellblazerPickup0.iqm
deleted file mode 100644
index ec3a177b3..000000000
Binary files a/models/HellblazerPickup0.iqm and /dev/null differ
diff --git a/models/HellblazerPickup1.iqm b/models/HellblazerPickup1.iqm
deleted file mode 100644
index 4becd795a..000000000
Binary files a/models/HellblazerPickup1.iqm and /dev/null differ
diff --git a/models/HellblazerPickup2.iqm b/models/HellblazerPickup2.iqm
deleted file mode 100644
index ac4053a9b..000000000
Binary files a/models/HellblazerPickup2.iqm and /dev/null differ
diff --git a/models/HellblazerPickup3.iqm b/models/HellblazerPickup3.iqm
deleted file mode 100644
index 547eed53c..000000000
Binary files a/models/HellblazerPickup3.iqm and /dev/null differ
diff --git a/models/HellblazerPickup4.iqm b/models/HellblazerPickup4.iqm
deleted file mode 100644
index 2b7aa65d5..000000000
Binary files a/models/HellblazerPickup4.iqm and /dev/null differ
diff --git a/models/HellblazerPickup5.iqm b/models/HellblazerPickup5.iqm
deleted file mode 100644
index 87e3d22b8..000000000
Binary files a/models/HellblazerPickup5.iqm and /dev/null differ
diff --git a/models/HellblazerPickupX.iqm b/models/HellblazerPickupX.iqm
index f8c362568..bd1c442ed 100644
Binary files a/models/HellblazerPickupX.iqm and b/models/HellblazerPickupX.iqm differ
diff --git a/models/ModernSparksterAmmo2_a.3d b/models/ModernSparksterAmmo2_a.3d
deleted file mode 100644
index 36d039034..000000000
Binary files a/models/ModernSparksterAmmo2_a.3d and /dev/null differ
diff --git a/models/ModernSparksterAmmo2_d.3d b/models/ModernSparksterAmmo2_d.3d
deleted file mode 100644
index a9a5de0b9..000000000
Binary files a/models/ModernSparksterAmmo2_d.3d and /dev/null differ
diff --git a/models/ModernSparksterAmmo3_a.3d b/models/ModernSparksterAmmo3_a.3d
deleted file mode 100644
index 0b22bb5c1..000000000
Binary files a/models/ModernSparksterAmmo3_a.3d and /dev/null differ
diff --git a/models/ModernSparksterAmmo3_d.3d b/models/ModernSparksterAmmo3_d.3d
deleted file mode 100644
index a1f3521d5..000000000
Binary files a/models/ModernSparksterAmmo3_d.3d and /dev/null differ
diff --git a/models/ModernSparksterAmmo_a.3d b/models/ModernSparksterAmmo_a.3d
deleted file mode 100644
index e049b0cb3..000000000
Binary files a/models/ModernSparksterAmmo_a.3d and /dev/null differ
diff --git a/models/ModernSparksterAmmo_d.3d b/models/ModernSparksterAmmo_d.3d
deleted file mode 100644
index 4e97a585f..000000000
Binary files a/models/ModernSparksterAmmo_d.3d and /dev/null differ
diff --git a/models/Silverbullet1st.blend b/models/Silverbullet1st.blend
index b6bafe312..282a04210 100644
Binary files a/models/Silverbullet1st.blend and b/models/Silverbullet1st.blend differ
diff --git a/models/Silverbullet1st.iqm b/models/Silverbullet1st.iqm
new file mode 100644
index 000000000..e787108ae
Binary files /dev/null and b/models/Silverbullet1st.iqm differ
diff --git a/models/Silverbullet1st_Casing.iqm b/models/Silverbullet1st_Casing.iqm
new file mode 100644
index 000000000..692848e9b
Binary files /dev/null and b/models/Silverbullet1st_Casing.iqm differ
diff --git a/models/Silverbullet1st_Smoke.iqm b/models/Silverbullet1st_Smoke.iqm
new file mode 100644
index 000000000..ec33b0436
Binary files /dev/null and b/models/Silverbullet1st_Smoke.iqm differ
diff --git a/models/Silverbullet1st_a.3d b/models/Silverbullet1st_a.3d
deleted file mode 100644
index b9a295e73..000000000
Binary files a/models/Silverbullet1st_a.3d and /dev/null differ
diff --git a/models/Silverbullet1st_d.3d b/models/Silverbullet1st_d.3d
deleted file mode 100644
index e7e20d366..000000000
Binary files a/models/Silverbullet1st_d.3d and /dev/null differ
diff --git a/models/Sparkster.blend b/models/Sparkster.blend
index 79fc5d4a8..2143b6e45 100644
Binary files a/models/Sparkster.blend and b/models/Sparkster.blend differ
diff --git a/models/Sparkster1st.blend b/models/Sparkster1st.blend
index 282a8cbd4..5fb9589f9 100644
Binary files a/models/Sparkster1st.blend and b/models/Sparkster1st.blend differ
diff --git a/models/Sparkster1st.iqm b/models/Sparkster1st.iqm
new file mode 100644
index 000000000..4963eccc9
Binary files /dev/null and b/models/Sparkster1st.iqm differ
diff --git a/models/Sparkster1st_a.3d b/models/Sparkster1st_a.3d
deleted file mode 100644
index 3d8cc6716..000000000
Binary files a/models/Sparkster1st_a.3d and /dev/null differ
diff --git a/models/Sparkster1st_d.3d b/models/Sparkster1st_d.3d
deleted file mode 100644
index 0050623bb..000000000
Binary files a/models/Sparkster1st_d.3d and /dev/null differ
diff --git a/models/SparksterPickup.iqm b/models/SparksterPickup.iqm
index a4c665535..75b5404e6 100644
Binary files a/models/SparksterPickup.iqm and b/models/SparksterPickup.iqm differ
diff --git a/models/SparksterPickupDouble.iqm b/models/SparksterPickupDouble.iqm
deleted file mode 100644
index ea2bc6e37..000000000
Binary files a/models/SparksterPickupDouble.iqm and /dev/null differ
diff --git a/models/SparksterVent.obj b/models/SparksterVent.obj
new file mode 100644
index 000000000..8880a1c2e
--- /dev/null
+++ b/models/SparksterVent.obj
@@ -0,0 +1,22 @@
+v 0.110535 -0.053528 -0.593323
+v 0.190918 -0.133850 -0.593323
+v 0.262634 0.098572 -0.593323
+v 0.343018 0.018250 -0.593323
+v -0.033630 -0.133911 -0.593323
+v 0.053467 -0.060852 -0.593323
+v -0.171875 0.030884 -0.593323
+v -0.084839 0.103943 -0.593323
+vn -0.0000 -0.0000 1.0000
+vt 0.000000 0.000000
+vt 1.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+vt 0.003906 0.000000
+vt 1.000000 0.000000
+vt 0.000000 1.000000
+vt 1.000000 1.000000
+s off
+f 2/2/1 3/3/1 1/1/1
+f 2/2/1 4/4/1 3/3/1
+f 6/6/1 7/7/1 5/5/1
+f 6/6/1 8/8/1 7/7/1
diff --git a/models/Spreadgun1st.blend b/models/Spreadgun1st.blend
index cc3aee971..d82e198c7 100644
Binary files a/models/Spreadgun1st.blend and b/models/Spreadgun1st.blend differ
diff --git a/models/Spreadgun1st.iqm b/models/Spreadgun1st.iqm
new file mode 100644
index 000000000..bfa0f91b3
Binary files /dev/null and b/models/Spreadgun1st.iqm differ
diff --git a/models/Spreadgun1st_a.3d b/models/Spreadgun1st_a.3d
deleted file mode 100644
index f185c3546..000000000
Binary files a/models/Spreadgun1st_a.3d and /dev/null differ
diff --git a/models/Spreadgun1st_d.3d b/models/Spreadgun1st_d.3d
deleted file mode 100644
index fab8932eb..000000000
Binary files a/models/Spreadgun1st_d.3d and /dev/null differ
diff --git a/models/SpreadgunPickup.iqm b/models/SpreadgunPickup.iqm
index c54fc0c01..c941fb4ac 100644
Binary files a/models/SpreadgunPickup.iqm and b/models/SpreadgunPickup.iqm differ
diff --git a/models/SpreadgunPickupFired.iqm b/models/SpreadgunPickupFired.iqm
deleted file mode 100644
index 5d2bea249..000000000
Binary files a/models/SpreadgunPickupFired.iqm and /dev/null differ
diff --git a/models/extra/VentSmoke0.png b/models/VentSmoke0.png
similarity index 100%
rename from models/extra/VentSmoke0.png
rename to models/VentSmoke0.png
diff --git a/models/extra/VentSmoke1.png b/models/VentSmoke1.png
similarity index 100%
rename from models/extra/VentSmoke1.png
rename to models/VentSmoke1.png
diff --git a/models/extra/VentSmoke10.png b/models/VentSmoke10.png
similarity index 100%
rename from models/extra/VentSmoke10.png
rename to models/VentSmoke10.png
diff --git a/models/extra/VentSmoke11.png b/models/VentSmoke11.png
similarity index 100%
rename from models/extra/VentSmoke11.png
rename to models/VentSmoke11.png
diff --git a/models/extra/VentSmoke12.png b/models/VentSmoke12.png
similarity index 100%
rename from models/extra/VentSmoke12.png
rename to models/VentSmoke12.png
diff --git a/models/extra/VentSmoke13.png b/models/VentSmoke13.png
similarity index 100%
rename from models/extra/VentSmoke13.png
rename to models/VentSmoke13.png
diff --git a/models/extra/VentSmoke14.png b/models/VentSmoke14.png
similarity index 100%
rename from models/extra/VentSmoke14.png
rename to models/VentSmoke14.png
diff --git a/models/extra/VentSmoke15.png b/models/VentSmoke15.png
similarity index 100%
rename from models/extra/VentSmoke15.png
rename to models/VentSmoke15.png
diff --git a/models/extra/VentSmoke16.png b/models/VentSmoke16.png
similarity index 100%
rename from models/extra/VentSmoke16.png
rename to models/VentSmoke16.png
diff --git a/models/extra/VentSmoke17.png b/models/VentSmoke17.png
similarity index 100%
rename from models/extra/VentSmoke17.png
rename to models/VentSmoke17.png
diff --git a/models/extra/VentSmoke18.png b/models/VentSmoke18.png
similarity index 100%
rename from models/extra/VentSmoke18.png
rename to models/VentSmoke18.png
diff --git a/models/extra/VentSmoke19.png b/models/VentSmoke19.png
similarity index 100%
rename from models/extra/VentSmoke19.png
rename to models/VentSmoke19.png
diff --git a/models/extra/VentSmoke2.png b/models/VentSmoke2.png
similarity index 100%
rename from models/extra/VentSmoke2.png
rename to models/VentSmoke2.png
diff --git a/models/extra/VentSmoke20.png b/models/VentSmoke20.png
similarity index 100%
rename from models/extra/VentSmoke20.png
rename to models/VentSmoke20.png
diff --git a/models/extra/VentSmoke21.png b/models/VentSmoke21.png
similarity index 100%
rename from models/extra/VentSmoke21.png
rename to models/VentSmoke21.png
diff --git a/models/extra/VentSmoke22.png b/models/VentSmoke22.png
similarity index 100%
rename from models/extra/VentSmoke22.png
rename to models/VentSmoke22.png
diff --git a/models/extra/VentSmoke23.png b/models/VentSmoke23.png
similarity index 100%
rename from models/extra/VentSmoke23.png
rename to models/VentSmoke23.png
diff --git a/models/extra/VentSmoke3.png b/models/VentSmoke3.png
similarity index 100%
rename from models/extra/VentSmoke3.png
rename to models/VentSmoke3.png
diff --git a/models/extra/VentSmoke4.png b/models/VentSmoke4.png
similarity index 100%
rename from models/extra/VentSmoke4.png
rename to models/VentSmoke4.png
diff --git a/models/extra/VentSmoke5.png b/models/VentSmoke5.png
similarity index 100%
rename from models/extra/VentSmoke5.png
rename to models/VentSmoke5.png
diff --git a/models/extra/VentSmoke6.png b/models/VentSmoke6.png
similarity index 100%
rename from models/extra/VentSmoke6.png
rename to models/VentSmoke6.png
diff --git a/models/extra/VentSmoke7.png b/models/VentSmoke7.png
similarity index 100%
rename from models/extra/VentSmoke7.png
rename to models/VentSmoke7.png
diff --git a/models/extra/VentSmoke8.png b/models/VentSmoke8.png
similarity index 100%
rename from models/extra/VentSmoke8.png
rename to models/VentSmoke8.png
diff --git a/models/extra/VentSmoke9.png b/models/VentSmoke9.png
similarity index 100%
rename from models/extra/VentSmoke9.png
rename to models/VentSmoke9.png
diff --git a/models/Wallbuster1st.blend b/models/Wallbuster1st.blend
index ef98f6e7a..d715eb705 100644
Binary files a/models/Wallbuster1st.blend and b/models/Wallbuster1st.blend differ
diff --git a/models/Wallbuster1st.iqm b/models/Wallbuster1st.iqm
new file mode 100644
index 000000000..1b762c83a
Binary files /dev/null and b/models/Wallbuster1st.iqm differ
diff --git a/models/Wallbuster1st_a.3d b/models/Wallbuster1st_a.3d
deleted file mode 100644
index 54cf54901..000000000
Binary files a/models/Wallbuster1st_a.3d and /dev/null differ
diff --git a/models/Wallbuster1st_d.3d b/models/Wallbuster1st_d.3d
deleted file mode 100644
index 9c08df5e8..000000000
Binary files a/models/Wallbuster1st_d.3d and /dev/null differ
diff --git a/models/Ynykron.blend b/models/Ynykron.blend
index 226c90f6c..e4dc0661e 100644
Binary files a/models/Ynykron.blend and b/models/Ynykron.blend differ
diff --git a/models/Ynykron1st.blend b/models/Ynykron1st.blend
index 0051963f2..a2c25e050 100644
Binary files a/models/Ynykron1st.blend and b/models/Ynykron1st.blend differ
diff --git a/models/Ynykron1st.iqm b/models/Ynykron1st.iqm
new file mode 100644
index 000000000..9ae6fc184
Binary files /dev/null and b/models/Ynykron1st.iqm differ
diff --git a/models/Ynykron1st_Smoke.iqm b/models/Ynykron1st_Smoke.iqm
new file mode 100644
index 000000000..4ea2edc4d
Binary files /dev/null and b/models/Ynykron1st_Smoke.iqm differ
diff --git a/models/Ynykron1st_a.3d b/models/Ynykron1st_a.3d
deleted file mode 100644
index 2292015cf..000000000
Binary files a/models/Ynykron1st_a.3d and /dev/null differ
diff --git a/models/Ynykron1st_d.3d b/models/Ynykron1st_d.3d
deleted file mode 100644
index da4aa8636..000000000
Binary files a/models/Ynykron1st_d.3d and /dev/null differ
diff --git a/models/YnykronPickup.iqm b/models/YnykronPickup.iqm
index 97a07ed6b..7da79fc08 100644
Binary files a/models/YnykronPickup.iqm and b/models/YnykronPickup.iqm differ
diff --git a/models/extra/SparksterVent_a.3d b/models/extra/SparksterVent_a.3d
deleted file mode 100644
index 91beec2c1..000000000
Binary files a/models/extra/SparksterVent_a.3d and /dev/null differ
diff --git a/models/extra/SparksterVent_d.3d b/models/extra/SparksterVent_d.3d
deleted file mode 100644
index e73d85c03..000000000
Binary files a/models/extra/SparksterVent_d.3d and /dev/null differ
diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc
index 9c447c5b9..d5e8aa2e2 100644
--- a/zscript/dlc1/swwm_hammertime.zsc
+++ b/zscript/dlc1/swwm_hammertime.zsc
@@ -212,7 +212,6 @@ Class ItamexHammer : SWWMWeapon
 		Obituary "$O_HAMMER";
 		SWWMWeapon.Tooltip "$TT_HAMMER";
 		SWWMWeapon.GetLine "getitamexhammer";
-		SWWMWeapon.BobFactor 1., .0001;
 		Weapon.SlotNumber 1;
 		Weapon.SlotPriority 2.;
 		Weapon.SelectionOrder 1200;
diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc1/swwm_heavymahsheengun.zsc
index 805e3aecb..c7a01e451 100644
--- a/zscript/dlc1/swwm_heavymahsheengun.zsc
+++ b/zscript/dlc1/swwm_heavymahsheengun.zsc
@@ -343,7 +343,6 @@ Class HeavyMahSheenGun : SWWMWeapon
 		Obituary "$O_SHEENHMG";
 		SWWMWeapon.Tooltip "$TT_SHEENHMG";
 		SWWMWeapon.GetLine "getheavymahsheengun";
-		SWWMWeapon.BobFactor 1., .0001;
 		Weapon.UpSound "sheen/select";
 		Weapon.SlotNumber 5;
 		Weapon.SlotPriority 2.;
diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc
index a9d36e71e..892580bc7 100644
--- a/zscript/dlc1/swwm_mister.zsc
+++ b/zscript/dlc1/swwm_mister.zsc
@@ -1205,7 +1205,6 @@ Class MisterRifle : SWWMWeapon
 		Obituary "$O_MORTALRIFLE";
 		SWWMWeapon.Tooltip "$TT_MORTALRIFLE";
 		SWWMWeapon.GetLine "getmortalrifle";
-		SWWMWeapon.BobFactor 1., .0001;
 		Weapon.SlotNumber 9;
 		Weapon.SlotPriority 2.;
 		Weapon.SelectionOrder 850;
diff --git a/zscript/dlc1/swwm_notashotgun.zsc b/zscript/dlc1/swwm_notashotgun.zsc
index d7c8925f9..9715bdc51 100644
--- a/zscript/dlc1/swwm_notashotgun.zsc
+++ b/zscript/dlc1/swwm_notashotgun.zsc
@@ -415,7 +415,6 @@ Class Quadravol : SWWMWeapon
 		Obituary "$O_QUADRAVOL";
 		SWWMWeapon.Tooltip "$TT_QUADRAVOL";
 		SWWMWeapon.GetLine "getquadravol";
-		SWWMWeapon.BobFactor 1., .0001;
 		Weapon.SlotNumber 6;
 		Weapon.SlotPriority 2.;
 		Weapon.SelectionOrder 650;
diff --git a/zscript/weapons/swwm_baseweapon.zsc b/zscript/weapons/swwm_baseweapon.zsc
index 0bc9163a1..9a02fb350 100644
--- a/zscript/weapons/swwm_baseweapon.zsc
+++ b/zscript/weapons/swwm_baseweapon.zsc
@@ -706,7 +706,7 @@ Class SWWMWeapon : Weapon abstract
 		Weapon.SlotPriority 1.;
 		Inventory.RestrictedTo "Demolitionist";
 		Inventory.PickupFlash "SWWMRedPickupFlash";
-		SWWMWeapon.BobFactor 1., 1.;
+		SWWMWeapon.BobFactor 1., .0001;
 		+INVENTORY.IGNORESKILL;
 		+WEAPON.NOALERT;
 		+WEAPON.NODEATHINPUT;
diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc
index a094b1b05..0b7c71ea3 100644
--- a/zscript/weapons/swwm_blazeit.zsc
+++ b/zscript/weapons/swwm_blazeit.zsc
@@ -209,8 +209,9 @@ Class Hellblazer : SWWMWeapon
 	action void A_UpdatePickup()
 	{
 		// if not initialized, default to 3 loaded rockets
-		if ( !invoker.bInitialized ) frame = 3;
-		else frame = 6-invoker.clipcount;
+		int loaded = invoker.bInitialized?invoker.clipcount:3;
+		for ( int i=0; i<6; i++ )
+			A_ChangeModel("",0,"","",2+i,"models",(i>=loaded)?"":"HellblazerMissile.png",CMDL_USESURFACESKIN,-1);
 	}
 
 	action void A_CheckLockOn()
diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc
index a7da599a8..310c44c0b 100644
--- a/zscript/weapons/swwm_cbt.zsc
+++ b/zscript/weapons/swwm_cbt.zsc
@@ -327,8 +327,8 @@ Class Wallbuster : SWWMWeapon
 			while ( gidx > 4 ) gidx -= 5;
 			idx = gidx+group*5;
 			if ( !invoker.loaded[idx] ) A_ChangeModel("",1,"","",4+i,"models","",CMDL_USESURFACESKIN,-1);
-			else if ( invoker.fired[idx] ) A_ChangeModel("",1,"","",4+i,"models","ShellNormal_Used.png",CMDL_USESURFACESKIN,-1);
-			else A_ChangeModel("",1,"","",4+i,"models","ShellNormal.png",CMDL_USESURFACESKIN,-1);
+			else if ( invoker.fired[idx] ) A_ChangeModel("",1,"","",4+i,"models","Shell_Normal_Used.png",CMDL_USESURFACESKIN,-1);
+			else A_ChangeModel("",1,"","",4+i,"models","Shell_Normal.png",CMDL_USESURFACESKIN,-1);
 		}
 		A_StartSound("wallbuster/meleestart",CHAN_WEAPON,CHANF_OVERLAP);
 	}
@@ -348,7 +348,7 @@ Class Wallbuster : SWWMWeapon
 			while ( gidx > 4 ) gidx -= 5;
 			idx = gidx+group*5;
 			if ( !invoker.loaded[idx] ) A_ChangeModel("",1,"","",4+i,"models","",CMDL_USESURFACESKIN,-1);
-			else A_ChangeModel("",1,"","",4+i,"models","ShellNormal.png",CMDL_USESURFACESKIN,-1);
+			else A_ChangeModel("",1,"","",4+i,"models","Shell_Normal.png",CMDL_USESURFACESKIN,-1);
 		}
 		A_StartSound("wallbuster/meleeend",CHAN_WEAPON,CHANF_OVERLAP);
 	}
diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc
index 24e03e550..a71722d1c 100644
--- a/zscript/weapons/swwm_splode.zsc
+++ b/zscript/weapons/swwm_splode.zsc
@@ -380,7 +380,7 @@ Class ExplodiumGun : SWWMWeapon
 		XZW2 I 1;
 		XZW2 J 1
 		{
-			int layer = PSP_WEAPON+1;
+			int layer = PSP_WEAPON+2;
 			while ( player.FindPSprite(layer) ) layer++;
 			A_Overlay(layer,"Casing");
 		}
@@ -392,7 +392,7 @@ Class ExplodiumGun : SWWMWeapon
 		XZWA K 1;
 		XZWA L 1
 		{
-			int layer = PSP_WEAPON+1;
+			int layer = PSP_WEAPON+2;
 			while ( player.FindPSprite(layer) ) layer++;
 			A_Overlay(layer,"Casing");
 		}
@@ -520,12 +520,17 @@ Class ExplodiumGun : SWWMWeapon
 		Goto Ready;
 	CheckBullet:
 		XZW2 A 1;
-		XZW7 ABCDE 1;
+		XZW7 A 1 A_Overlay(PSP_WEAPON+1,"CheckBulletCasing");
+		XZW7 BCDE 1;
 		XZW7 F 1 A_StartSound("explodium/slideback",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW7 GHIJKLMNOP 1;
 		XZW7 Q 1 A_StartSound("explodium/slideforward",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW7 RS 1;
 		Goto Ready;
+	CheckBulletCasing:
+		XZWC QRSTUVWXYZ 1;
+		XZWD ABCDEFGHI 1;
+		Stop;
 	User1:
 		XZW2 A 1;
 		XZW7 TU 1;
diff --git a/zscript/weapons/swwm_tastytreat.zsc b/zscript/weapons/swwm_tastytreat.zsc
index 8b630ed11..d4825bea4 100644
--- a/zscript/weapons/swwm_tastytreat.zsc
+++ b/zscript/weapons/swwm_tastytreat.zsc
@@ -438,7 +438,7 @@ Class CandyGun : SWWMWeapon
 		XZW2 I 1;
 		XZW2 J 1
 		{
-			int layer = PSP_WEAPON+1;
+			int layer = PSP_WEAPON+2;
 			while ( player.FindPSprite(layer) ) layer++;
 			A_Overlay(layer,"Casing");
 		}
@@ -450,7 +450,7 @@ Class CandyGun : SWWMWeapon
 		XZWC K 1;
 		XZWC L 1
 		{
-			int layer = PSP_WEAPON+1;
+			int layer = PSP_WEAPON+2;
 			while ( player.FindPSprite(layer) ) layer++;
 			A_Overlay(layer,"Casing");
 		}
@@ -630,12 +630,16 @@ Class CandyGun : SWWMWeapon
 		Goto Ready;
 	CheckBullet:
 		XZW2 A 1;
-		XZW7 ABCDE 1;
+		XZW7 A 1 A_Overlay(PSP_WEAPON+1,"CheckBulletCasing");
+		XZW7 BCDE 1;
 		XZW7 F 1 A_StartSound("explodium/slideback",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW7 GHIJKLMNOP 1;
 		XZW7 Q 1 A_StartSound("explodium/slideforward",CHAN_WEAPON,CHANF_OVERLAP);
 		XZW7 RS 1;
 		Goto Ready;
+	CheckBulletCasing:
+		XZWF BCDEFGHIJKLMNOPQRST 1;
+		Stop;
 	User1:
 		XZW2 A 1;
 		XZW7 TU 1;