diff --git a/src/shared/player.qc b/src/shared/player.qc
index cdbb290..6f54f7f 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -527,7 +527,7 @@ TFPlayer::MakeClass(classtype_e class)
 		break;
 	case CLASS_DEMO:
 		GiveItem("tf_weapon_axe");
-		GiveItem("tf_weapon_supershotgun");
+		GiveItem("tf_weapon_shotgun");
 		GiveItem("tf_weapon_gl");
 		GiveItem("tf_weapon_pl");
 		GiveAmmo(atShells, 22i);
@@ -583,7 +583,7 @@ TFPlayer::MakeClass(classtype_e class)
 		break;
 	case CLASS_PYRO:
 		GiveItem("tf_weapon_axe");
-		GiveItem("tf_weapon_supershotgun");
+		GiveItem("tf_weapon_shotgun");
 		GiveItem("tf_weapon_flamethrower");
 		GiveItem("tf_weapon_ic");
 		GiveAmmo(atShells, 12i);
@@ -604,7 +604,7 @@ TFPlayer::MakeClass(classtype_e class)
 	case CLASS_SPY:
 		GiveItem("tf_weapon_knife");
 		GiveItem("tf_weapon_tranq");
-		GiveItem("tf_weapon_shotgun");
+		GiveItem("tf_weapon_supershotgun");
 		GiveItem("tf_weapon_ng");
 		GiveAmmo(atShells, 24i); /* tranquil and dbs use shells */
 		GiveAmmo(atNails, 50i);
@@ -623,7 +623,7 @@ TFPlayer::MakeClass(classtype_e class)
 	case CLASS_ENGINEER:
 		GiveItem("tf_weapon_spanner");
 		GiveItem("tf_weapon_railgun");
-		GiveItem("tf_weapon_shotgun");
+		GiveItem("tf_weapon_supershotgun");
 		GiveAmmo(atCells, 100i);
 		GiveAmmo(atNails, 25i);
 		GiveAmmo(atShells, 4i);
diff --git a/zpak001.pk3dir/decls/def/weapons/ac.def b/zpak001.pk3dir/decls/def/weapons/ac.def
index 7cafbd4..e5f814e 100644
--- a/zpak001.pk3dir/decls/def/weapons/ac.def
+++ b/zpak001.pk3dir/decls/def/weapons/ac.def
@@ -33,9 +33,9 @@ entityDef tf_weapon_ac
 	"snd_empty"		"Weapon_Minigun.ClipEmpty"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
+	"hudSlot"		"4"
 	"hudSlotPos"	"0"
-	"weight"		"10"
+	"weight"		"30"
 }
 
 entityDef projectile_tfAssaultCannon
diff --git a/zpak001.pk3dir/decls/def/weapons/autorifle.def b/zpak001.pk3dir/decls/def/weapons/autorifle.def
index d45ac42..84df891 100644
--- a/zpak001.pk3dir/decls/def/weapons/autorifle.def
+++ b/zpak001.pk3dir/decls/def/weapons/autorifle.def
@@ -30,7 +30,7 @@ entityDef tf_weapon_autorifle
 	"snd_empty"		"Weapon_SMG.ClipEmpty"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
+	"hudSlot"		"2"
 	"hudSlotPos"	"0"
 	"weight"		"10"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/flamethrower.def b/zpak001.pk3dir/decls/def/weapons/flamethrower.def
index 399a5c5..3b94cfa 100644
--- a/zpak001.pk3dir/decls/def/weapons/flamethrower.def
+++ b/zpak001.pk3dir/decls/def/weapons/flamethrower.def
@@ -29,7 +29,7 @@ entityDef tf_weapon_flamethrower
 	// HLWeapon specific
 	"hudSlot"		"3"
 	"hudSlotPos"	"1"
-	"weight"		"20"
+	"weight"		"30"
 }
 
 entityDef fireInfo_tfFlameThrower
diff --git a/zpak001.pk3dir/decls/def/weapons/gl.def b/zpak001.pk3dir/decls/def/weapons/gl.def
index 7de9d4d..fc02385 100644
--- a/zpak001.pk3dir/decls/def/weapons/gl.def
+++ b/zpak001.pk3dir/decls/def/weapons/gl.def
@@ -33,7 +33,7 @@ entityDef tf_weapon_gl
 	"snd_empty"		"Weapon_Pistol.ClipEmpty"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
+	"hudSlot"		"3"
 	"hudSlotPos"	"0"
 	"weight"		"10"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/ic.def b/zpak001.pk3dir/decls/def/weapons/ic.def
index d5097dc..db416b1 100644
--- a/zpak001.pk3dir/decls/def/weapons/ic.def
+++ b/zpak001.pk3dir/decls/def/weapons/ic.def
@@ -35,9 +35,9 @@ entityDef tf_weapon_ic
 	"snd_empty"		"Weapon_Pistol.ClipEmpty"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
+	"hudSlot"		"4"
 	"hudSlotPos"	"0"
-	"weight"		"10"
+	"weight"		"20"
 }
 
 entityDef projectile_tfIncendiaryRocket
diff --git a/zpak001.pk3dir/decls/def/weapons/medikit.def b/zpak001.pk3dir/decls/def/weapons/medikit.def
index 1187b3d..2482133 100644
--- a/zpak001.pk3dir/decls/def/weapons/medikit.def
+++ b/zpak001.pk3dir/decls/def/weapons/medikit.def
@@ -33,7 +33,7 @@ entityDef tf_weapon_medikit
 	// HLWeapon specific
 	"hudSlot"		"0"
 	"hudSlotPos"	"0"
-	"weight"		"0"
+	"weight"		"30"
 	"crosshair"		"none"
 	"ammoIcon"		"none"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/pl.def b/zpak001.pk3dir/decls/def/weapons/pl.def
index 1a0f8e6..1b7a25e 100644
--- a/zpak001.pk3dir/decls/def/weapons/pl.def
+++ b/zpak001.pk3dir/decls/def/weapons/pl.def
@@ -34,7 +34,7 @@ entityDef tf_weapon_pl
 	"snd_empty"		"Weapon_Pistol.ClipEmpty"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
+	"hudSlot"		"4"
 	"hudSlotPos"	"0"
 	"weight"		"10"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/sniperrifle.def b/zpak001.pk3dir/decls/def/weapons/sniperrifle.def
index 381c02d..012f25f 100644
--- a/zpak001.pk3dir/decls/def/weapons/sniperrifle.def
+++ b/zpak001.pk3dir/decls/def/weapons/sniperrifle.def
@@ -32,7 +32,7 @@ entityDef tf_weapon_sniperrifle
 	// HLWeapon specific
 	"hudSlot"		"1"
 	"hudSlotPos"	"0"
-	"weight"		"10"
+	"weight"		"20"
 
 	"zoomDuration"			"0"
 	"zoomFov"				"20"
diff --git a/zpak001.pk3dir/decls/def/weapons/superng.def b/zpak001.pk3dir/decls/def/weapons/superng.def
index 0fcee13..f9746f6 100644
--- a/zpak001.pk3dir/decls/def/weapons/superng.def
+++ b/zpak001.pk3dir/decls/def/weapons/superng.def
@@ -26,9 +26,9 @@ entityDef tf_weapon_superng
 	"snd_empty"			"Weapon_SyringeGun.ClipEmpty"
 
 	// HLWeapon specific
-	"hudSlot"		"1"
+	"hudSlot"		"3"
 	"hudSlotPos"	"0"
-	"weight"		"10"
+	"weight"		"20"
 }
 
 entityDef projectile_tfSuperNail
diff --git a/zpak001.pk3dir/decls/sound/weapons_tfc.sndshd b/zpak001.pk3dir/decls/sound/weapons_tfc.sndshd
index 954bdfc..3cc65ac 100644
--- a/zpak001.pk3dir/decls/sound/weapons_tfc.sndshd
+++ b/zpak001.pk3dir/decls/sound/weapons_tfc.sndshd
@@ -102,26 +102,6 @@ Weapon_Minigun.WindUp
 	sample weapons/asscan1.wav
 }
 
-Weapon_Shotgun.Single
-{
-	sample weapons/sbarrel1.wav
-}
-
-Weapon_SuperShotgun.Single
-{
-	sample weapons/shotgn2.wav
-}
-
-Weapon_Shotgun.Pump
-{
-	sample weapons/scock1.wav
-}
-
-Weapon_Shotgun.Reload
-{
-	sample weapons/reload3.wav
-}
-
 Weapon_Medikit.Overheal
 {
 	pitch 1.5
@@ -164,6 +144,26 @@ Weapon_Railgun.WindUp
 	sample weapons/railgun.wav
 }
 
+Weapon_Shotgun.Single
+{
+	sample weapons/sbarrel1.wav
+}
+
+Weapon_SuperShotgun.Single
+{
+	sample weapons/shotgn2.wav
+}
+
+Weapon_Shotgun.Pump
+{
+	sample weapons/scock1.wav
+}
+
+Weapon_Shotgun.Reload
+{
+	sample weapons/reload3.wav
+}
+
 Weapon_SMG.Single
 {
 	sample weapons/sniper.wav
@@ -191,7 +191,7 @@ Weapon_StickyBombLauncher.Single
 
 Weapon_SyringeGun.Single
 {
-	sample weapons/airgun_1.wav
+	sample weapons/spike2.wav
 }
 
 Weapon_SyringeGun.ClipEmpty