diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 0107e256f..51944c0da 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -367,7 +367,6 @@ consvar_t cv_joyscale[MAXSPLITSCREENPLAYERS] = { //Alam: Dummy for save
 #endif
 
 // SRB2kart
-consvar_t cv_superring = 			CVAR_INIT ("superring", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_sneaker = 				CVAR_INIT ("sneaker", 			"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_rocketsneaker = 		CVAR_INIT ("rocketsneaker", 	"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_invincibility = 		CVAR_INIT ("invincibility", 	"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
@@ -377,7 +376,6 @@ consvar_t cv_orbinaut = 			CVAR_INIT ("orbinaut", 			"On", CV_NETVAR|CV_CHEAT, C
 consvar_t cv_jawz = 				CVAR_INIT ("jawz", 				"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_mine = 				CVAR_INIT ("mine", 				"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_landmine = 			CVAR_INIT ("landmine", 			"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
-consvar_t cv_droptarget = 			CVAR_INIT ("droptarget", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_ballhog = 				CVAR_INIT ("ballhog", 			"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_selfpropelledbomb =	CVAR_INIT ("selfpropelledbomb", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_grow = 				CVAR_INIT ("grow", 				"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
@@ -387,7 +385,9 @@ consvar_t cv_bubbleshield = 		CVAR_INIT ("bubbleshield", 		"On", CV_NETVAR|CV_CH
 consvar_t cv_flameshield = 			CVAR_INIT ("flameshield", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_hyudoro = 				CVAR_INIT ("hyudoro", 			"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_pogospring = 			CVAR_INIT ("pogospring", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
+consvar_t cv_superring = 			CVAR_INIT ("superring", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_kitchensink = 			CVAR_INIT ("kitchensink", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
+consvar_t cv_droptarget = 			CVAR_INIT ("droptarget", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 
 consvar_t cv_dualsneaker = 			CVAR_INIT ("dualsneaker", 		"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_triplesneaker = 		CVAR_INIT ("triplesneaker", 	"On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 0fc16f637..01867d915 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -71,14 +71,37 @@ extern consvar_t cv_spectatorreentry, cv_antigrief;
 #endif
 
 // SRB2kart items
-extern consvar_t cv_superring, cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
-extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine, cv_landmine, cv_droptarget;
-extern consvar_t cv_ballhog, cv_selfpropelledbomb, cv_grow, cv_shrink;
-extern consvar_t cv_thundershield, cv_bubbleshield, cv_flameshield;
-extern consvar_t cv_hyudoro, cv_pogospring, cv_kitchensink;
+extern consvar_t
+	cv_sneaker,
+	cv_rocketsneaker,
+	cv_invincibility,
+	cv_banana,
+	cv_eggmanmonitor,
+	cv_orbinaut,
+	cv_jawz,
+	cv_mine,
+	cv_landmine,
+	cv_ballhog,
+	cv_selfpropelledbomb,
+	cv_grow,
+	cv_shrink,
+	cv_thundershield,
+	cv_bubbleshield,
+	cv_flameshield,
+	cv_hyudoro,
+	cv_pogospring,
+	cv_superring,
+	cv_kitchensink,
+	cv_droptarget;
 
-extern consvar_t cv_dualsneaker, cv_triplesneaker, cv_triplebanana, cv_decabanana;
-extern consvar_t cv_tripleorbinaut, cv_quadorbinaut, cv_dualjawz;
+extern consvar_t
+	cv_dualsneaker,
+	cv_triplesneaker,
+	cv_triplebanana,
+	cv_decabanana,
+	cv_tripleorbinaut,
+	cv_quadorbinaut,
+	cv_dualjawz;
 
 extern consvar_t cv_kartminimap;
 extern consvar_t cv_kartcheck;
diff --git a/src/k_hud.c b/src/k_hud.c
index 649bd4a1c..e377caa02 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -113,7 +113,7 @@ static patch_t *kp_itemtimer[2];
 static patch_t *kp_itemmulsticker[2];
 static patch_t *kp_itemx;
 
-static patch_t *kp_superring[2];
+static patch_t *kp_sadface[2];
 static patch_t *kp_sneaker[4];
 static patch_t *kp_rocketsneaker[2];
 static patch_t *kp_invincibility[13];
@@ -123,7 +123,6 @@ static patch_t *kp_orbinaut[5];
 static patch_t *kp_jawz[3];
 static patch_t *kp_mine[2];
 static patch_t *kp_landmine[2];
-static patch_t *kp_droptarget[2];
 static patch_t *kp_ballhog[2];
 static patch_t *kp_selfpropelledbomb[2];
 static patch_t *kp_grow[2];
@@ -133,8 +132,9 @@ static patch_t *kp_bubbleshield[2];
 static patch_t *kp_flameshield[2];
 static patch_t *kp_hyudoro[2];
 static patch_t *kp_pogospring[2];
+static patch_t *kp_superring[2];
 static patch_t *kp_kitchensink[2];
-static patch_t *kp_sadface[2];
+static patch_t *kp_droptarget[2];
 
 static patch_t *kp_check[6];
 
@@ -305,7 +305,7 @@ void K_LoadKartHUDGraphics(void)
 	HU_UpdatePatch(&kp_itemmulsticker[0], "K_ITMUL");
 	HU_UpdatePatch(&kp_itemx, "K_ITX");
 
-	HU_UpdatePatch(&kp_superring[0], "K_ITRING");
+	HU_UpdatePatch(&kp_sadface[0], "K_ITSAD");
 	HU_UpdatePatch(&kp_sneaker[0], "K_ITSHOE");
 	HU_UpdatePatch(&kp_sneaker[1], "K_ITSHO2");
 	HU_UpdatePatch(&kp_sneaker[2], "K_ITSHO3");
@@ -332,7 +332,6 @@ void K_LoadKartHUDGraphics(void)
 	HU_UpdatePatch(&kp_jawz[1], "K_ITJAW2");
 	HU_UpdatePatch(&kp_mine[0], "K_ITMINE");
 	HU_UpdatePatch(&kp_landmine[0], "K_ITLNDM");
-	HU_UpdatePatch(&kp_droptarget[0], "K_ITDTRG");
 	HU_UpdatePatch(&kp_ballhog[0], "K_ITBHOG");
 	HU_UpdatePatch(&kp_selfpropelledbomb[0], "K_ITSPB");
 	HU_UpdatePatch(&kp_grow[0], "K_ITGROW");
@@ -342,8 +341,9 @@ void K_LoadKartHUDGraphics(void)
 	HU_UpdatePatch(&kp_flameshield[0], "K_ITFLMS");
 	HU_UpdatePatch(&kp_hyudoro[0], "K_ITHYUD");
 	HU_UpdatePatch(&kp_pogospring[0], "K_ITPOGO");
+	HU_UpdatePatch(&kp_superring[0], "K_ITRING");
 	HU_UpdatePatch(&kp_kitchensink[0], "K_ITSINK");
-	HU_UpdatePatch(&kp_sadface[0], "K_ITSAD");
+	HU_UpdatePatch(&kp_droptarget[0], "K_ITDTRG");
 
 	// Splitscreen
 	HU_UpdatePatch(&kp_itembg[2], "K_ISBG");
@@ -351,7 +351,7 @@ void K_LoadKartHUDGraphics(void)
 	HU_UpdatePatch(&kp_itemtimer[1], "K_ISIMER");
 	HU_UpdatePatch(&kp_itemmulsticker[1], "K_ISMUL");
 
-	HU_UpdatePatch(&kp_superring[1], "K_ISRING");
+	HU_UpdatePatch(&kp_sadface[1], "K_ISSAD");
 	HU_UpdatePatch(&kp_sneaker[3], "K_ISSHOE");
 	HU_UpdatePatch(&kp_rocketsneaker[1], "K_ISRSHE");
 	sprintf(buffer, "K_ISINVx");
@@ -366,7 +366,6 @@ void K_LoadKartHUDGraphics(void)
 	HU_UpdatePatch(&kp_jawz[2], "K_ISJAWZ");
 	HU_UpdatePatch(&kp_mine[1], "K_ISMINE");
 	HU_UpdatePatch(&kp_landmine[1], "K_ISLNDM");
-	HU_UpdatePatch(&kp_droptarget[1], "K_ISDTRG");
 	HU_UpdatePatch(&kp_ballhog[1], "K_ISBHOG");
 	HU_UpdatePatch(&kp_selfpropelledbomb[1], "K_ISSPB");
 	HU_UpdatePatch(&kp_grow[1], "K_ISGROW");
@@ -376,8 +375,9 @@ void K_LoadKartHUDGraphics(void)
 	HU_UpdatePatch(&kp_flameshield[1], "K_ISFLMS");
 	HU_UpdatePatch(&kp_hyudoro[1], "K_ISHYUD");
 	HU_UpdatePatch(&kp_pogospring[1], "K_ISPOGO");
+	HU_UpdatePatch(&kp_superring[1], "K_ISRING");
 	HU_UpdatePatch(&kp_kitchensink[1], "K_ISSINK");
-	HU_UpdatePatch(&kp_sadface[1], "K_ISSAD");
+	HU_UpdatePatch(&kp_droptarget[1], "K_ISDTRG");
 
 	// CHECK indicators
 	sprintf(buffer, "K_CHECKx");
@@ -518,10 +518,10 @@ const char *K_GetItemPatch(UINT8 item, boolean tiny)
 			return (tiny ? "K_ISPOGO" : "K_ITPOGO");
 		case KITEM_SUPERRING:
 			return (tiny ? "K_ISRING" : "K_ITRING");
-		case KITEM_DROPTARGET:
-			return (tiny ? "K_ISDTRG" : "K_ITDTRG");
 		case KITEM_KITCHENSINK:
 			return (tiny ? "K_ISSINK" : "K_ITSINK");
+		case KITEM_DROPTARGET:
+			return (tiny ? "K_ISDTRG" : "K_ITDTRG");
 		case KRITEM_DUALSNEAKER:
 			return (tiny ? "K_ISSHOE" : "K_ITSHO2");
 		case KRITEM_TRIPLESNEAKER:
diff --git a/src/k_kart.c b/src/k_kart.c
index 9aa561d04..4f1a69ee4 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -397,68 +397,68 @@ consvar_t *KartItemCVars[NUMKARTRESULTS-1] =
 // Less ugly 2D arrays
 static UINT8 K_KartItemOddsRace[NUMKARTRESULTS-1][8] =
 {
-				//P-Odds	 0  1  2  3  4  5  6  7
-			   /*Sneaker*/ { 0, 0, 4, 6, 7, 0, 0, 0 }, // Sneaker
-		/*Rocket Sneaker*/ { 0, 0, 0, 0, 1, 4, 6, 3 }, // Rocket Sneaker
-		 /*Invincibility*/ { 0, 0, 0, 0, 1, 4, 6,10 }, // Invincibility
-				/*Banana*/ { 9, 4, 2, 1, 0, 0, 0, 0 }, // Banana
-		/*Eggman Monitor*/ { 3, 2, 1, 0, 0, 0, 0, 0 }, // Eggman Monitor
-			  /*Orbinaut*/ { 5, 6, 4, 2, 0, 0, 0, 0 }, // Orbinaut
-				  /*Jawz*/ { 0, 3, 2, 1, 1, 0, 0, 0 }, // Jawz
-				  /*Mine*/ { 0, 2, 2, 1, 0, 0, 0, 0 }, // Mine
-			   /*Ballhog*/ { 0, 0, 2, 1, 0, 0, 0, 0 }, // Ballhog
-   /*Self-Propelled Bomb*/ { 0, 1, 2, 3, 4, 2, 2, 0 }, // Self-Propelled Bomb
-				  /*Grow*/ { 0, 0, 0, 0, 0, 2, 5, 7 }, // Grow
-				/*Shrink*/ { 0, 0, 0, 0, 0, 0, 1, 0 }, // Shrink
-		/*Thunder Shield*/ { 1, 2, 0, 0, 0, 0, 0, 0 }, // Thunder Shield
-			   /*Hyudoro*/ { 0, 0, 0, 1, 2, 1, 0, 0 }, // Hyudoro
-		   /*Pogo Spring*/ { 0, 0, 0, 0, 0, 0, 0, 0 }, // Pogo Spring
-		  /*Kitchen Sink*/ { 0, 0, 0, 0, 0, 0, 0, 0 }, // Kitchen Sink
-		    /*Super Ring*/ { 1, 2, 2, 0, 0, 0, 0, 0 }, // Super Ring
-			 /*Land Mine*/ { 3, 0, 0, 0, 0, 0, 0, 0 }, // Land Mine
-		 /*Bubble Shield*/ { 0, 1, 2, 1, 0, 0, 0, 0 }, // Bubble Shield
-		  /*Flame Shield*/ { 0, 0, 0, 0, 0, 2, 4, 5 }, // Flame Shield
-		   /*Drop Target*/ { 1, 0, 0, 0, 0, 0, 0, 0 }, // Drop Target
-			/*Sneaker x2*/ { 0, 0, 2, 2, 2, 0, 0, 0 }, // Sneaker x2
-			/*Sneaker x3*/ { 0, 0, 0, 1, 6,10, 5, 0 }, // Sneaker x3
-			 /*Banana x3*/ { 0, 1, 1, 0, 0, 0, 0, 0 }, // Banana x3
-			/*Banana x10*/ { 0, 0, 0, 1, 0, 0, 0, 0 }, // Banana x10
-		   /*Orbinaut x3*/ { 0, 0, 1, 0, 0, 0, 0, 0 }, // Orbinaut x3
-		   /*Orbinaut x4*/ { 0, 0, 0, 1, 1, 0, 0, 0 }, // Orbinaut x4
-			   /*Jawz x2*/ { 0, 0, 1, 2, 0, 0, 0, 0 }  // Jawz x2
+	//B  C  D  E  F  G  H  I
+	{ 0, 0, 4, 6, 7, 0, 0, 0 }, // Sneaker
+	{ 0, 0, 0, 0, 1, 4, 6, 3 }, // Rocket Sneaker
+	{ 0, 0, 0, 0, 1, 4, 6,10 }, // Invincibility
+	{ 9, 4, 2, 1, 0, 0, 0, 0 }, // Banana
+	{ 3, 2, 1, 0, 0, 0, 0, 0 }, // Eggman Monitor
+	{ 5, 6, 4, 2, 0, 0, 0, 0 }, // Orbinaut
+	{ 0, 3, 2, 1, 1, 0, 0, 0 }, // Jawz
+	{ 0, 2, 2, 1, 0, 0, 0, 0 }, // Mine
+	{ 0, 0, 2, 1, 0, 0, 0, 0 }, // Ballhog
+	{ 0, 1, 2, 3, 4, 2, 2, 0 }, // Self-Propelled Bomb
+	{ 0, 0, 0, 0, 0, 2, 5, 7 }, // Grow
+	{ 0, 0, 0, 0, 0, 0, 1, 0 }, // Shrink
+	{ 1, 2, 0, 0, 0, 0, 0, 0 }, // Thunder Shield
+	{ 0, 0, 0, 1, 2, 1, 0, 0 }, // Hyudoro
+	{ 0, 0, 0, 0, 0, 0, 0, 0 }, // Pogo Spring
+	{ 0, 0, 0, 0, 0, 0, 0, 0 }, // Kitchen Sink
+	{ 1, 2, 2, 0, 0, 0, 0, 0 }, // Super Ring
+	{ 3, 0, 0, 0, 0, 0, 0, 0 }, // Land Mine
+	{ 0, 1, 2, 1, 0, 0, 0, 0 }, // Bubble Shield
+	{ 0, 0, 0, 0, 0, 2, 4, 5 }, // Flame Shield
+	{ 1, 0, 0, 0, 0, 0, 0, 0 }, // Drop Target
+	{ 0, 0, 2, 2, 2, 0, 0, 0 }, // Sneaker x2
+	{ 0, 0, 0, 1, 6,10, 5, 0 }, // Sneaker x3
+	{ 0, 1, 1, 0, 0, 0, 0, 0 }, // Banana x3
+	{ 0, 0, 0, 1, 0, 0, 0, 0 }, // Banana x10
+	{ 0, 0, 1, 0, 0, 0, 0, 0 }, // Orbinaut x3
+	{ 0, 0, 0, 1, 1, 0, 0, 0 }, // Orbinaut x4
+	{ 0, 0, 1, 2, 0, 0, 0, 0 }  // Jawz x2
 };
 
 static UINT8 K_KartItemOddsBattle[NUMKARTRESULTS][2] =
 {
-				//P-Odds	 0  1
-			   /*Sneaker*/ { 2, 1 }, // Sneaker
-		/*Rocket Sneaker*/ { 0, 0 }, // Rocket Sneaker
-		 /*Invincibility*/ { 4, 1 }, // Invincibility
-				/*Banana*/ { 0, 0 }, // Banana
-		/*Eggman Monitor*/ { 1, 0 }, // Eggman Monitor
-			  /*Orbinaut*/ { 8, 0 }, // Orbinaut
-				  /*Jawz*/ { 8, 1 }, // Jawz
-				  /*Mine*/ { 6, 1 }, // Mine
-			   /*Ballhog*/ { 2, 1 }, // Ballhog
-   /*Self-Propelled Bomb*/ { 0, 0 }, // Self-Propelled Bomb
-				  /*Grow*/ { 2, 1 }, // Grow
-				/*Shrink*/ { 0, 0 }, // Shrink
-	  /*Thunder Shield*/   { 4, 0 }, // Thunder Shield
-			   /*Hyudoro*/ { 2, 0 }, // Hyudoro
-		   /*Pogo Spring*/ { 3, 0 }, // Pogo Spring
-		  /*Kitchen Sink*/ { 0, 0 }, // Kitchen Sink
-		    /*Super Ring*/ { 0, 0 }, // Super Ring
-			 /*Land Mine*/ { 2, 0 }, // Land Mine
-		 /*Bubble Shield*/ { 1, 0 }, // Bubble Shield
-		  /*Flame Shield*/ { 1, 0 }, // Flame Shield
-		   /*Drop Target*/ { 2, 0 }, // Drop Target
-			/*Sneaker x2*/ { 0, 0 }, // Sneaker x2
-			/*Sneaker x3*/ { 0, 1 }, // Sneaker x3
-			 /*Banana x3*/ { 0, 0 }, // Banana x3
-			/*Banana x10*/ { 1, 1 }, // Banana x10
-		   /*Orbinaut x3*/ { 2, 0 }, // Orbinaut x3
-		   /*Orbinaut x4*/ { 1, 1 }, // Orbinaut x4
-			   /*Jawz x2*/ { 5, 1 }  // Jawz x2
+	//K  L
+	{ 2, 1 }, // Sneaker
+	{ 0, 0 }, // Rocket Sneaker
+	{ 4, 1 }, // Invincibility
+	{ 0, 0 }, // Banana
+	{ 1, 0 }, // Eggman Monitor
+	{ 8, 0 }, // Orbinaut
+	{ 8, 1 }, // Jawz
+	{ 6, 1 }, // Mine
+	{ 2, 1 }, // Ballhog
+	{ 0, 0 }, // Self-Propelled Bomb
+	{ 2, 1 }, // Grow
+	{ 0, 0 }, // Shrink
+	{ 4, 0 }, // Thunder Shield
+	{ 2, 0 }, // Hyudoro
+	{ 3, 0 }, // Pogo Spring
+	{ 0, 0 }, // Kitchen Sink
+	{ 0, 0 }, // Super Ring
+	{ 2, 0 }, // Land Mine
+	{ 1, 0 }, // Bubble Shield
+	{ 1, 0 }, // Flame Shield
+	{ 2, 0 }, // Drop Target
+	{ 0, 0 }, // Sneaker x2
+	{ 0, 1 }, // Sneaker x3
+	{ 0, 0 }, // Banana x3
+	{ 1, 1 }, // Banana x10
+	{ 2, 0 }, // Orbinaut x3
+	{ 1, 1 }, // Orbinaut x4
+	{ 5, 1 }  // Jawz x2
 };
 
 #define DISTVAR (2048) // Magic number distance for use with item roulette tiers