diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index 920c041..ac23132 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -74,6 +74,7 @@ HHDMultiplayerRules::PlayerDeath(base_player pl)
 	corpse.frame = ANIM_DIESIMPLE;
 	corpse.angles = pl.angles;
 	corpse.velocity = pl.velocity;
+	corpse.colormap = pl.colormap;
 }
 
 void
diff --git a/src/shared/player.qc b/src/shared/player.qc
index 3490f20..e09b0c4 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -23,7 +23,7 @@ enumflags
 	PLAYER_ORIGIN_Z,
 	PLAYER_ANGLES_X,
 	PLAYER_ANGLES_Y,
-	PLAYER_ANGLES_Z,
+	PLAYER_COLORMAP,
 	PLAYER_VELOCITY,
 	PLAYER_VELOCITY_Z,
 	PLAYER_FLAGS,
diff --git a/src/shared/w_broom.qc b/src/shared/w_broom.qc
index 6b57ed4..6fadc55 100644
--- a/src/shared/w_broom.qc
+++ b/src/shared/w_broom.qc
@@ -201,7 +201,7 @@ w_broom_hudpic(int selected, vector pos, float a)
 weapon_t w_broom =
 {
 	.name		= "broom",
-	.id			= ITEM_BROOM,
+	.id		= ITEM_BROOM,
 	.slot		= 0,
 	.slot_pos	= 0,
 	.draw		= w_broom_draw,
diff --git a/src/shared/w_forks.qc b/src/shared/w_forks.qc
index 93bb17b..51db9f5 100644
--- a/src/shared/w_forks.qc
+++ b/src/shared/w_forks.qc
@@ -316,7 +316,7 @@ w_forks_hudpic(int selected, vector pos, float a)
 weapon_t w_forks =
 {
 	.name		= "fork",
-	.id			= ITEM_FORKS,
+	.id		= ITEM_FORKS,
 	.slot		= 0,
 	.slot_pos	= 2,
 	.draw		= w_forks_draw,
diff --git a/src/shared/w_fryingpan.qc b/src/shared/w_fryingpan.qc
index 866f3ca..c0c4d59 100644
--- a/src/shared/w_fryingpan.qc
+++ b/src/shared/w_fryingpan.qc
@@ -225,7 +225,7 @@ w_fryingpan_hudpic(int selected, vector pos, float a)
 weapon_t w_fryingpan =
 {
 	.name		= "fryingpan",
-	.id			= ITEM_FRYINGPAN,
+	.id		= ITEM_FRYINGPAN,
 	.slot		= 0,
 	.slot_pos	= 1,
 	.draw		= w_fryingpan_draw,
diff --git a/src/shared/w_hairspray.qc b/src/shared/w_hairspray.qc
index 08c8a06..65f7208 100644
--- a/src/shared/w_hairspray.qc
+++ b/src/shared/w_hairspray.qc
@@ -252,7 +252,7 @@ w_hairspray_hudpic(int selected, vector pos, float a)
 weapon_t w_hairspray =
 {
 	.name		= "flame",
-	.id			= ITEM_HAIRSPRAY,
+	.id		= ITEM_HAIRSPRAY,
 	.slot		= 0,
 	.slot_pos	= 6,
 	.draw		= w_hairspray_draw,
diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc
index bcfdee8..ed45d6d 100644
--- a/src/shared/w_knife.qc
+++ b/src/shared/w_knife.qc
@@ -280,7 +280,7 @@ w_knife_hudpic(int selected, vector pos, float a)
 weapon_t w_knife =
 {
 	.name		= "knife",
-	.id			= ITEM_KNIFE,
+	.id		= ITEM_KNIFE,
 	.slot		= 0,
 	.slot_pos	= 3,
 	.draw		= w_knife_draw,
diff --git a/src/shared/w_lego.qc b/src/shared/w_lego.qc
index c6c21f1..3b5f221 100644
--- a/src/shared/w_lego.qc
+++ b/src/shared/w_lego.qc
@@ -264,7 +264,7 @@ w_lego_hudpic(int selected, vector pos, float a)
 weapon_t w_lego =
 {
 	.name		= "lego",
-	.id			= ITEM_LEGO,
+	.id		= ITEM_LEGO,
 	.slot		= 0,
 	.slot_pos	= 5,
 	.draw		= w_lego_draw,
diff --git a/src/shared/w_legolauncher.qc b/src/shared/w_legolauncher.qc
index 22131ea..6ce0a4b 100644
--- a/src/shared/w_legolauncher.qc
+++ b/src/shared/w_legolauncher.qc
@@ -265,7 +265,7 @@ w_legolauncher_hudpic(int selected, vector pos, float a)
 weapon_t w_legolauncher =
 {
 	.name		= "legoblock",
-	.id			= ITEM_LEGOLAUNCHER,
+	.id		= ITEM_LEGOLAUNCHER,
 	.slot		= 0,
 	.slot_pos	= 7,
 	.draw		= w_legolauncher_draw,
diff --git a/src/shared/w_machette.qc b/src/shared/w_machette.qc
index b3fce2d..d72d6ac 100644
--- a/src/shared/w_machette.qc
+++ b/src/shared/w_machette.qc
@@ -270,7 +270,7 @@ w_machette_hudpic(int selected, vector pos, float a)
 weapon_t w_machette =
 {
 	.name		= "machette",
-	.id			= ITEM_MACHETTE,
+	.id		= ITEM_MACHETTE,
 	.slot		= 1,
 	.slot_pos	= 1,
 	.draw		= w_machette_draw,
diff --git a/src/shared/w_sodalauncher.qc b/src/shared/w_sodalauncher.qc
index f1f5633..979ee98 100644
--- a/src/shared/w_sodalauncher.qc
+++ b/src/shared/w_sodalauncher.qc
@@ -324,7 +324,7 @@ w_sodalauncher_hudpic(int selected, vector pos, float a)
 
 weapon_t w_sodalauncher = {
 	.name		= "sodacan",
-	.id			= ITEM_SODALAUNCHER,
+	.id		= ITEM_SODALAUNCHER,
 	.slot		= 0,
 	.slot_pos	= 4,
 	.draw		= w_sodalauncher_draw,