diff --git a/src/font.c b/src/font.c
index aeaabd018..353f21a83 100644
--- a/src/font.c
+++ b/src/font.c
@@ -27,7 +27,7 @@ FontCache (font_t *fnt)
 	c = fnt->start;
 	for (i = 0; i < fnt->size; ++i, ++c)
 	{
-		fnt->font[i] = HU_CachePatch(
+		HU_UpdatePatch(&fnt->font[i],
 				"%s%.*d",
 				fnt->prefix,
 				fnt->digits,
@@ -57,7 +57,7 @@ Font_DumbRegister (const font_t *sfnt)
 
 	memcpy(fnt, sfnt, sizeof (font_t));
 
-	if (!( fnt->font = ZZ_Alloc(sfnt->size * sizeof (patch_t *)) ))
+	if (!( fnt->font = ZZ_Calloc(sfnt->size * sizeof (patch_t *)) ))
 		return -1;
 
 	return fontc++;
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 2a0bfa90c..130c1d437 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -186,21 +186,21 @@ void HU_LoadGraphics(void)
 	Font_Load();
 
 	// minus for negative tallnums
-	tallminus          = HU_CachePatch("STTMINUS");
+	HU_UpdatePatch(&tallminus, "STTMINUS");
 
-	emblemicon         = HU_CachePatch("EMBLICON");
-	songcreditbg       = HU_CachePatch("K_SONGCR");
+	HU_UpdatePatch(&emblemicon, "EMBLICON");
+	HU_UpdatePatch(&songcreditbg, "K_SONGCR");
 
 	// cache ping gfx:
 	for (i = 0; i < 5; i++)
 	{
-		pinggfx[i] = HU_CachePatch("PINGGFX%d", i+1);
-		mping[i] = HU_CachePatch("MPING%d", i+1);
+		HU_UpdatePatch(&pinggfx[i], "PINGGFX%d", i+1);
+		HU_UpdatePatch(&mping[i], "MPING%d", i+1);
 	}
 
 	// fps stuff
-	framecounter       = HU_CachePatch("FRAMER");
-	frameslash         = HU_CachePatch("FRAMESL");;
+	HU_UpdatePatch(&framecounter, "FRAMER");
+	HU_UpdatePatch(&frameslash, "FRAMESL");
 }
 
 // Initialise Heads up
diff --git a/src/k_hud.c b/src/k_hud.c
index 7f54abd49..986ea645a 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -170,23 +170,23 @@ void K_LoadKartHUDGraphics(void)
 	char buffer[9];
 
 	// Null Stuff
-	kp_nodraw = 				W_CachePatchName("K_TRNULL", PU_HUDGFX);
+	HU_UpdatePatch(&kp_nodraw, "K_TRNULL");
 
 	// Stickers
-	kp_timesticker = 			W_CachePatchName("K_STTIME", PU_HUDGFX);
-	kp_timestickerwide = 		W_CachePatchName("K_STTIMW", PU_HUDGFX);
-	kp_lapsticker = 			W_CachePatchName("K_STLAPS", PU_HUDGFX);
-	kp_lapstickerwide = 		W_CachePatchName("K_STLAPW", PU_HUDGFX);
-	kp_lapstickernarrow = 		W_CachePatchName("K_STLAPN", PU_HUDGFX);
-	kp_splitlapflag = 			W_CachePatchName("K_SPTLAP", PU_HUDGFX);
-	kp_bumpersticker = 			W_CachePatchName("K_STBALN", PU_HUDGFX);
-	kp_bumperstickerwide = 		W_CachePatchName("K_STBALW", PU_HUDGFX);
-	kp_capsulesticker = 		W_CachePatchName("K_STCAPN", PU_HUDGFX);
-	kp_capsulestickerwide = 	W_CachePatchName("K_STCAPW", PU_HUDGFX);
-	kp_karmasticker = 			W_CachePatchName("K_STKARM", PU_HUDGFX);
-	kp_spheresticker = 			W_CachePatchName("K_STBSMT", PU_HUDGFX);
-	kp_splitkarmabomb = 		W_CachePatchName("K_SPTKRM", PU_HUDGFX);
-	kp_timeoutsticker = 		W_CachePatchName("K_STTOUT", PU_HUDGFX);
+	HU_UpdatePatch(&kp_timesticker, "K_STTIME");
+	HU_UpdatePatch(&kp_timestickerwide, "K_STTIMW");
+	HU_UpdatePatch(&kp_lapsticker, "K_STLAPS");
+	HU_UpdatePatch(&kp_lapstickerwide, "K_STLAPW");
+	HU_UpdatePatch(&kp_lapstickernarrow, "K_STLAPN");
+	HU_UpdatePatch(&kp_splitlapflag, "K_SPTLAP");
+	HU_UpdatePatch(&kp_bumpersticker, "K_STBALN");
+	HU_UpdatePatch(&kp_bumperstickerwide, "K_STBALW");
+	HU_UpdatePatch(&kp_capsulesticker, "K_STCAPN");
+	HU_UpdatePatch(&kp_capsulestickerwide, "K_STCAPW");
+	HU_UpdatePatch(&kp_karmasticker, "K_STKARM");
+	HU_UpdatePatch(&kp_spheresticker, "K_STBSMT");
+	HU_UpdatePatch(&kp_splitkarmabomb, "K_SPTKRM");
+	HU_UpdatePatch(&kp_timeoutsticker, "K_STTOUT");
 
 	// Pre-start countdown bulbs
 	sprintf(buffer, "K_BULBxx");
@@ -194,7 +194,7 @@ void K_LoadKartHUDGraphics(void)
 	{
 		buffer[6] = '0'+((i+1)/10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_prestartbulb[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_prestartbulb[i], "%s", buffer);
 	}
 
 	sprintf(buffer, "K_SBLBxx");
@@ -202,68 +202,68 @@ void K_LoadKartHUDGraphics(void)
 	{
 		buffer[6] = '0'+((i+1)/10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_prestartbulb_split[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_prestartbulb_split[i], "%s", buffer);
 	}
 
 	// Pre-start position letters
-	kp_prestartletters[0] =		W_CachePatchName("K_PL_P", PU_HUDGFX);
-	kp_prestartletters[1] =		W_CachePatchName("K_PL_O", PU_HUDGFX);
-	kp_prestartletters[2] =		W_CachePatchName("K_PL_S", PU_HUDGFX);
-	kp_prestartletters[3] =		W_CachePatchName("K_PL_I", PU_HUDGFX);
-	kp_prestartletters[4] =		W_CachePatchName("K_PL_T", PU_HUDGFX);
-	kp_prestartletters[5] =		W_CachePatchName("K_PL_N", PU_HUDGFX);
-	kp_prestartletters[6] =		W_CachePatchName("K_PL_EX", PU_HUDGFX);
+	HU_UpdatePatch(&kp_prestartletters[0], "K_PL_P");
+	HU_UpdatePatch(&kp_prestartletters[1], "K_PL_O");
+	HU_UpdatePatch(&kp_prestartletters[2], "K_PL_S");
+	HU_UpdatePatch(&kp_prestartletters[3], "K_PL_I");
+	HU_UpdatePatch(&kp_prestartletters[4], "K_PL_T");
+	HU_UpdatePatch(&kp_prestartletters[5], "K_PL_N");
+	HU_UpdatePatch(&kp_prestartletters[6], "K_PL_EX");
 
-	kp_prestartletters_split[0] =		W_CachePatchName("K_SPL_P", PU_HUDGFX);
-	kp_prestartletters_split[1] =		W_CachePatchName("K_SPL_O", PU_HUDGFX);
-	kp_prestartletters_split[2] =		W_CachePatchName("K_SPL_S", PU_HUDGFX);
-	kp_prestartletters_split[3] =		W_CachePatchName("K_SPL_I", PU_HUDGFX);
-	kp_prestartletters_split[4] =		W_CachePatchName("K_SPL_T", PU_HUDGFX);
-	kp_prestartletters_split[5] =		W_CachePatchName("K_SPL_N", PU_HUDGFX);
-	kp_prestartletters_split[6] =		W_CachePatchName("K_SPL_EX", PU_HUDGFX);
+	HU_UpdatePatch(&kp_prestartletters_split[0], "K_SPL_P");
+	HU_UpdatePatch(&kp_prestartletters_split[1], "K_SPL_O");
+	HU_UpdatePatch(&kp_prestartletters_split[2], "K_SPL_S");
+	HU_UpdatePatch(&kp_prestartletters_split[3], "K_SPL_I");
+	HU_UpdatePatch(&kp_prestartletters_split[4], "K_SPL_T");
+	HU_UpdatePatch(&kp_prestartletters_split[5], "K_SPL_N");
+	HU_UpdatePatch(&kp_prestartletters_split[6], "K_SPL_EX");
 
 	// Starting countdown
-	kp_startcountdown[0] = 		W_CachePatchName("K_CNT3A", PU_HUDGFX);
-	kp_startcountdown[1] = 		W_CachePatchName("K_CNT2A", PU_HUDGFX);
-	kp_startcountdown[2] = 		W_CachePatchName("K_CNT1A", PU_HUDGFX);
-	kp_startcountdown[3] = 		W_CachePatchName("K_CNTGOA", PU_HUDGFX);
-	kp_startcountdown[4] = 		W_CachePatchName("K_DUEL1", PU_HUDGFX);
-	kp_startcountdown[5] = 		W_CachePatchName("K_CNT3B", PU_HUDGFX);
-	kp_startcountdown[6] = 		W_CachePatchName("K_CNT2B", PU_HUDGFX);
-	kp_startcountdown[7] = 		W_CachePatchName("K_CNT1B", PU_HUDGFX);
-	kp_startcountdown[8] = 		W_CachePatchName("K_CNTGOB", PU_HUDGFX);
-	kp_startcountdown[9] = 		W_CachePatchName("K_DUEL2", PU_HUDGFX);
+	HU_UpdatePatch(&kp_startcountdown[0], "K_CNT3A");
+	HU_UpdatePatch(&kp_startcountdown[1], "K_CNT2A");
+	HU_UpdatePatch(&kp_startcountdown[2], "K_CNT1A");
+	HU_UpdatePatch(&kp_startcountdown[3], "K_CNTGOA");
+	HU_UpdatePatch(&kp_startcountdown[4], "K_DUEL1");
+	HU_UpdatePatch(&kp_startcountdown[5], "K_CNT3B");
+	HU_UpdatePatch(&kp_startcountdown[6], "K_CNT2B");
+	HU_UpdatePatch(&kp_startcountdown[7], "K_CNT1B");
+	HU_UpdatePatch(&kp_startcountdown[8], "K_CNTGOB");
+	HU_UpdatePatch(&kp_startcountdown[9], "K_DUEL2");
 	// Splitscreen
-	kp_startcountdown[10] = 	W_CachePatchName("K_SMC3A", PU_HUDGFX);
-	kp_startcountdown[11] = 	W_CachePatchName("K_SMC2A", PU_HUDGFX);
-	kp_startcountdown[12] = 	W_CachePatchName("K_SMC1A", PU_HUDGFX);
-	kp_startcountdown[13] = 	W_CachePatchName("K_SMCGOA", PU_HUDGFX);
-	kp_startcountdown[14] = 	W_CachePatchName("K_SDUEL1", PU_HUDGFX);
-	kp_startcountdown[15] = 	W_CachePatchName("K_SMC3B", PU_HUDGFX);
-	kp_startcountdown[16] = 	W_CachePatchName("K_SMC2B", PU_HUDGFX);
-	kp_startcountdown[17] = 	W_CachePatchName("K_SMC1B", PU_HUDGFX);
-	kp_startcountdown[18] = 	W_CachePatchName("K_SMCGOB", PU_HUDGFX);
-	kp_startcountdown[19] = 	W_CachePatchName("K_SDUEL2", PU_HUDGFX);
+	HU_UpdatePatch(&kp_startcountdown[10], "K_SMC3A");
+	HU_UpdatePatch(&kp_startcountdown[11], "K_SMC2A");
+	HU_UpdatePatch(&kp_startcountdown[12], "K_SMC1A");
+	HU_UpdatePatch(&kp_startcountdown[13], "K_SMCGOA");
+	HU_UpdatePatch(&kp_startcountdown[14], "K_SDUEL1");
+	HU_UpdatePatch(&kp_startcountdown[15], "K_SMC3B");
+	HU_UpdatePatch(&kp_startcountdown[16], "K_SMC2B");
+	HU_UpdatePatch(&kp_startcountdown[17], "K_SMC1B");
+	HU_UpdatePatch(&kp_startcountdown[18], "K_SMCGOB");
+	HU_UpdatePatch(&kp_startcountdown[19], "K_SDUEL2");
 
 	// Fault
-	kp_racefault[0] = 			W_CachePatchName("K_FAULTA", PU_HUDGFX);
-	kp_racefault[1] = 			W_CachePatchName("K_FAULTB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_racefault[0], "K_FAULTA");
+	HU_UpdatePatch(&kp_racefault[1], "K_FAULTB");
 	// Splitscreen
-	kp_racefault[2] = 			W_CachePatchName("K_SMFLTA", PU_HUDGFX);
-	kp_racefault[3] = 			W_CachePatchName("K_SMFLTB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_racefault[2], "K_SMFLTA");
+	HU_UpdatePatch(&kp_racefault[3], "K_SMFLTB");
 	// 2P splitscreen
-	kp_racefault[4] = 			W_CachePatchName("K_2PFLTA", PU_HUDGFX);
-	kp_racefault[5] = 			W_CachePatchName("K_2PFLTB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_racefault[4], "K_2PFLTA");
+	HU_UpdatePatch(&kp_racefault[5], "K_2PFLTB");
 
 	// Finish
-	kp_racefinish[0] = 			W_CachePatchName("K_FINA", PU_HUDGFX);
-	kp_racefinish[1] = 			W_CachePatchName("K_FINB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_racefinish[0], "K_FINA");
+	HU_UpdatePatch(&kp_racefinish[1], "K_FINB");
 	// Splitscreen
-	kp_racefinish[2] = 			W_CachePatchName("K_SMFINA", PU_HUDGFX);
-	kp_racefinish[3] = 			W_CachePatchName("K_SMFINB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_racefinish[2], "K_SMFINA");
+	HU_UpdatePatch(&kp_racefinish[3], "K_SMFINB");
 	// 2P splitscreen
-	kp_racefinish[4] = 			W_CachePatchName("K_2PFINA", PU_HUDGFX);
-	kp_racefinish[5] = 			W_CachePatchName("K_2PFINB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_racefinish[4], "K_2PFINA");
+	HU_UpdatePatch(&kp_racefinish[5], "K_2PFINB");
 
 	// Position numbers
 	sprintf(buffer, "K_POSNxx");
@@ -274,7 +274,7 @@ void K_LoadKartHUDGraphics(void)
 		{
 			//sprintf(buffer, "K_POSN%d%d", i, j);
 			buffer[7] = '0'+j;
-			kp_positionnum[i][j] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+			HU_UpdatePatch(&kp_positionnum[i][j], "%s", buffer);
 		}
 	}
 
@@ -282,7 +282,7 @@ void K_LoadKartHUDGraphics(void)
 	for (i = 0; i < NUMWINFRAMES; i++)
 	{
 		buffer[7] = '0'+i;
-		kp_winnernum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_winnernum[i], "%s", buffer);
 	}
 
 	sprintf(buffer, "OPPRNKxx");
@@ -290,128 +290,128 @@ void K_LoadKartHUDGraphics(void)
 	{
 		buffer[6] = '0'+(i/10);
 		buffer[7] = '0'+(i%10);
-		kp_facenum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_facenum[i], "%s", buffer);
 	}
 
 	sprintf(buffer, "K_CHILIx");
 	for (i = 0; i < 8; i++)
 	{
 		buffer[7] = '0'+(i+1);
-		kp_facehighlight[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_facehighlight[i], "%s", buffer);
 	}
 
-	kp_spbminimap =				W_CachePatchName("SPBMMAP", PU_HUDGFX);
+	HU_UpdatePatch(&kp_spbminimap, "SPBMMAP");
 
 	// Rings & Lives
-	kp_ringsticker[0] =			W_CachePatchName("RNGBACKA", PU_HUDGFX);
-	kp_ringsticker[1] =			W_CachePatchName("RNGBACKB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_ringsticker[0], "RNGBACKA");
+	HU_UpdatePatch(&kp_ringsticker[1], "RNGBACKB");
 
 	sprintf(buffer, "K_RINGx");
 	for (i = 0; i < 6; i++)
 	{
 		buffer[6] = '0'+(i+1);
-		kp_ring[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_ring[i], "%s", buffer);
 	}
 
-	kp_ringdebtminus =			W_CachePatchName("RDEBTMIN", PU_HUDGFX);
+	HU_UpdatePatch(&kp_ringdebtminus, "RDEBTMIN");
 
 	sprintf(buffer, "SPBRNGxx");
 	for (i = 0; i < 16; i++)
 	{
 		buffer[6] = '0'+((i+1) / 10);
 		buffer[7] = '0'+((i+1) % 10);
-		kp_ringspblock[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_ringspblock[i], "%s", buffer);
 	}
 
-	kp_ringstickersplit[0] =	W_CachePatchName("SMRNGBGA", PU_HUDGFX);
-	kp_ringstickersplit[1] =	W_CachePatchName("SMRNGBGB", PU_HUDGFX);
+	HU_UpdatePatch(&kp_ringstickersplit[0], "SMRNGBGA");
+	HU_UpdatePatch(&kp_ringstickersplit[1], "SMRNGBGB");
 
 	sprintf(buffer, "K_SRINGx");
 	for (i = 0; i < 6; i++)
 	{
 		buffer[7] = '0'+(i+1);
-		kp_smallring[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_smallring[i], "%s", buffer);
 	}
 
-	kp_ringdebtminussmall =		W_CachePatchName("SRDEBTMN", PU_HUDGFX);
+	HU_UpdatePatch(&kp_ringdebtminussmall, "SRDEBTMN");
 
 	sprintf(buffer, "SPBRGSxx");
 	for (i = 0; i < 16; i++)
 	{
 		buffer[6] = '0'+((i+1) / 10);
 		buffer[7] = '0'+((i+1) % 10);
-		kp_ringspblocksmall[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_ringspblocksmall[i], "%s", buffer);
 	}
 
 	// Speedometer
-	kp_speedometersticker =		W_CachePatchName("K_SPDMBG", PU_HUDGFX);
+	HU_UpdatePatch(&kp_speedometersticker, "K_SPDMBG");
 
 	sprintf(buffer, "K_SPDMLx");
 	for (i = 0; i < 4; i++)
 	{
 		buffer[7] = '0'+(i+1);
-		kp_speedometerlabel[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_speedometerlabel[i], "%s", buffer);
 	}
 
 	// Extra ranking icons
-	kp_rankbumper =				W_CachePatchName("K_BLNICO", PU_HUDGFX);
-	kp_tinybumper[0] =			W_CachePatchName("K_BLNA", PU_HUDGFX);
-	kp_tinybumper[1] =			W_CachePatchName("K_BLNB", PU_HUDGFX);
-	kp_ranknobumpers =			W_CachePatchName("K_NOBLNS", PU_HUDGFX);
-	kp_rankcapsule =			W_CachePatchName("K_CAPICO", PU_HUDGFX);
-	kp_rankemerald =			W_CachePatchName("K_EMERC", PU_HUDGFX);
-	kp_rankemeraldflash =		W_CachePatchName("K_EMERW", PU_HUDGFX);
-	kp_rankemeraldback =		W_CachePatchName("K_EMERBK", PU_HUDGFX);
+	HU_UpdatePatch(&kp_rankbumper, "K_BLNICO");
+	HU_UpdatePatch(&kp_tinybumper[0], "K_BLNA");
+	HU_UpdatePatch(&kp_tinybumper[1], "K_BLNB");
+	HU_UpdatePatch(&kp_ranknobumpers, "K_NOBLNS");
+	HU_UpdatePatch(&kp_rankcapsule, "K_CAPICO");
+	HU_UpdatePatch(&kp_rankemerald, "K_EMERC");
+	HU_UpdatePatch(&kp_rankemeraldflash, "K_EMERW");
+	HU_UpdatePatch(&kp_rankemeraldback, "K_EMERBK");
 
 	// Battle graphics
-	kp_battlewin = 				W_CachePatchName("K_BWIN", PU_HUDGFX);
-	kp_battlecool = 			W_CachePatchName("K_BCOOL", PU_HUDGFX);
-	kp_battlelose = 			W_CachePatchName("K_BLOSE", PU_HUDGFX);
-	kp_battlewait = 			W_CachePatchName("K_BWAIT", PU_HUDGFX);
-	kp_battleinfo = 			W_CachePatchName("K_BINFO", PU_HUDGFX);
-	kp_wanted = 				W_CachePatchName("K_WANTED", PU_HUDGFX);
-	kp_wantedsplit = 			W_CachePatchName("4PWANTED", PU_HUDGFX);
-	kp_wantedreticle =			W_CachePatchName("MMAPWANT", PU_HUDGFX);
+	HU_UpdatePatch(&kp_battlewin, "K_BWIN");
+	HU_UpdatePatch(&kp_battlecool, "K_BCOOL");
+	HU_UpdatePatch(&kp_battlelose, "K_BLOSE");
+	HU_UpdatePatch(&kp_battlewait, "K_BWAIT");
+	HU_UpdatePatch(&kp_battleinfo, "K_BINFO");
+	HU_UpdatePatch(&kp_wanted, "K_WANTED");
+	HU_UpdatePatch(&kp_wantedsplit, "4PWANTED");
+	HU_UpdatePatch(&kp_wantedreticle, "MMAPWANT");
 
 	// Kart Item Windows
-	kp_itembg[0] = 				W_CachePatchName("K_ITBG", PU_HUDGFX);
-	kp_itembg[1] = 				W_CachePatchName("K_ITBGD", PU_HUDGFX);
-	kp_itemtimer[0] = 			W_CachePatchName("K_ITIMER", PU_HUDGFX);
-	kp_itemmulsticker[0] = 		W_CachePatchName("K_ITMUL", PU_HUDGFX);
-	kp_itemx = 					W_CachePatchName("K_ITX", PU_HUDGFX);
+	HU_UpdatePatch(&kp_itembg[0], "K_ITBG");
+	HU_UpdatePatch(&kp_itembg[1], "K_ITBGD");
+	HU_UpdatePatch(&kp_itemtimer[0], "K_ITIMER");
+	HU_UpdatePatch(&kp_itemmulsticker[0], "K_ITMUL");
+	HU_UpdatePatch(&kp_itemx, "K_ITX");
 
-	kp_superring[0] =			W_CachePatchName("K_ITRING", PU_HUDGFX);
-	kp_sneaker[0] =				W_CachePatchName("K_ITSHOE", PU_HUDGFX);
-	kp_rocketsneaker[0] =		W_CachePatchName("K_ITRSHE", PU_HUDGFX);
+	HU_UpdatePatch(&kp_superring[0], "K_ITRING");
+	HU_UpdatePatch(&kp_sneaker[0], "K_ITSHOE");
+	HU_UpdatePatch(&kp_rocketsneaker[0], "K_ITRSHE");
 
 	sprintf(buffer, "K_ITINVx");
 	for (i = 0; i < 7; i++)
 	{
 		buffer[7] = '1'+i;
-		kp_invincibility[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_invincibility[i], "%s", buffer);
 	}
-	kp_banana[0] =				W_CachePatchName("K_ITBANA", PU_HUDGFX);
-	kp_eggman[0] =				W_CachePatchName("K_ITEGGM", PU_HUDGFX);
+	HU_UpdatePatch(&kp_banana[0], "K_ITBANA");
+	HU_UpdatePatch(&kp_eggman[0], "K_ITEGGM");
 	sprintf(buffer, "K_ITORBx");
 	for (i = 0; i < 4; i++)
 	{
 		buffer[7] = '1'+i;
-		kp_orbinaut[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_orbinaut[i], "%s", buffer);
 	}
-	kp_jawz[0] =				W_CachePatchName("K_ITJAWZ", PU_HUDGFX);
-	kp_mine[0] =				W_CachePatchName("K_ITMINE", PU_HUDGFX);
-	kp_landmine[0] =			W_CachePatchName("K_ITLNDM", PU_HUDGFX);
-	kp_ballhog[0] =				W_CachePatchName("K_ITBHOG", PU_HUDGFX);
-	kp_selfpropelledbomb[0] =	W_CachePatchName("K_ITSPB", PU_HUDGFX);
-	kp_grow[0] =				W_CachePatchName("K_ITGROW", PU_HUDGFX);
-	kp_shrink[0] =				W_CachePatchName("K_ITSHRK", PU_HUDGFX);
-	kp_thundershield[0] =		W_CachePatchName("K_ITTHNS", PU_HUDGFX);
-	kp_bubbleshield[0] =		W_CachePatchName("K_ITBUBS", PU_HUDGFX);
-	kp_flameshield[0] =			W_CachePatchName("K_ITFLMS", PU_HUDGFX);
-	kp_hyudoro[0] = 			W_CachePatchName("K_ITHYUD", PU_HUDGFX);
-	kp_pogospring[0] = 			W_CachePatchName("K_ITPOGO", PU_HUDGFX);
-	kp_kitchensink[0] = 		W_CachePatchName("K_ITSINK", PU_HUDGFX);
-	kp_sadface[0] = 			W_CachePatchName("K_ITSAD", PU_HUDGFX);
+	HU_UpdatePatch(&kp_jawz[0], "K_ITJAWZ");
+	HU_UpdatePatch(&kp_mine[0], "K_ITMINE");
+	HU_UpdatePatch(&kp_landmine[0], "K_ITLNDM");
+	HU_UpdatePatch(&kp_ballhog[0], "K_ITBHOG");
+	HU_UpdatePatch(&kp_selfpropelledbomb[0], "K_ITSPB");
+	HU_UpdatePatch(&kp_grow[0], "K_ITGROW");
+	HU_UpdatePatch(&kp_shrink[0], "K_ITSHRK");
+	HU_UpdatePatch(&kp_thundershield[0], "K_ITTHNS");
+	HU_UpdatePatch(&kp_bubbleshield[0], "K_ITBUBS");
+	HU_UpdatePatch(&kp_flameshield[0], "K_ITFLMS");
+	HU_UpdatePatch(&kp_hyudoro[0], "K_ITHYUD");
+	HU_UpdatePatch(&kp_pogospring[0], "K_ITPOGO");
+	HU_UpdatePatch(&kp_kitchensink[0], "K_ITSINK");
+	HU_UpdatePatch(&kp_sadface[0], "K_ITSAD");
 
 	sprintf(buffer, "FSMFGxxx");
 	for (i = 0; i < 104; i++)
@@ -419,7 +419,7 @@ void K_LoadKartHUDGraphics(void)
 		buffer[5] = '0'+((i+1)/100);
 		buffer[6] = '0'+(((i+1)/10)%10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_flameshieldmeter[i][0] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_flameshieldmeter[i][0], "%s", buffer);
 	}
 
 	sprintf(buffer, "FSMBG0xx");
@@ -427,41 +427,41 @@ void K_LoadKartHUDGraphics(void)
 	{
 		buffer[6] = '0'+((i+1)/10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_flameshieldmeter_bg[i][0] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_flameshieldmeter_bg[i][0], "%s", buffer);
 	}
 
 	// Splitscreen
-	kp_itembg[2] = 				W_CachePatchName("K_ISBG", PU_HUDGFX);
-	kp_itembg[3] = 				W_CachePatchName("K_ISBGD", PU_HUDGFX);
-	kp_itemtimer[1] = 			W_CachePatchName("K_ISIMER", PU_HUDGFX);
-	kp_itemmulsticker[1] = 		W_CachePatchName("K_ISMUL", PU_HUDGFX);
+	HU_UpdatePatch(&kp_itembg[2], "K_ISBG");
+	HU_UpdatePatch(&kp_itembg[3], "K_ISBGD");
+	HU_UpdatePatch(&kp_itemtimer[1], "K_ISIMER");
+	HU_UpdatePatch(&kp_itemmulsticker[1], "K_ISMUL");
 
-	kp_superring[1] =			W_CachePatchName("K_ISRING", PU_HUDGFX);
-	kp_sneaker[1] =				W_CachePatchName("K_ISSHOE", PU_HUDGFX);
-	kp_rocketsneaker[1] =		W_CachePatchName("K_ISRSHE", PU_HUDGFX);
+	HU_UpdatePatch(&kp_superring[1], "K_ISRING");
+	HU_UpdatePatch(&kp_sneaker[1], "K_ISSHOE");
+	HU_UpdatePatch(&kp_rocketsneaker[1], "K_ISRSHE");
 	sprintf(buffer, "K_ISINVx");
 	for (i = 0; i < 6; i++)
 	{
 		buffer[7] = '1'+i;
-		kp_invincibility[i+7] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_invincibility[i+7], "%s", buffer);
 	}
-	kp_banana[1] =				W_CachePatchName("K_ISBANA", PU_HUDGFX);
-	kp_eggman[1] =				W_CachePatchName("K_ISEGGM", PU_HUDGFX);
-	kp_orbinaut[4] =			W_CachePatchName("K_ISORBN", PU_HUDGFX);
-	kp_jawz[1] =				W_CachePatchName("K_ISJAWZ", PU_HUDGFX);
-	kp_mine[1] =				W_CachePatchName("K_ISMINE", PU_HUDGFX);
-	kp_landmine[1] =			W_CachePatchName("K_ISLNDM", PU_HUDGFX);
-	kp_ballhog[1] =				W_CachePatchName("K_ISBHOG", PU_HUDGFX);
-	kp_selfpropelledbomb[1] =	W_CachePatchName("K_ISSPB", PU_HUDGFX);
-	kp_grow[1] =				W_CachePatchName("K_ISGROW", PU_HUDGFX);
-	kp_shrink[1] =				W_CachePatchName("K_ISSHRK", PU_HUDGFX);
-	kp_thundershield[1] =		W_CachePatchName("K_ISTHNS", PU_HUDGFX);
-	kp_bubbleshield[1] =		W_CachePatchName("K_ISBUBS", PU_HUDGFX);
-	kp_flameshield[1] =			W_CachePatchName("K_ISFLMS", PU_HUDGFX);
-	kp_hyudoro[1] = 			W_CachePatchName("K_ISHYUD", PU_HUDGFX);
-	kp_pogospring[1] = 			W_CachePatchName("K_ISPOGO", PU_HUDGFX);
-	kp_kitchensink[1] = 		W_CachePatchName("K_ISSINK", PU_HUDGFX);
-	kp_sadface[1] = 			W_CachePatchName("K_ISSAD", PU_HUDGFX);
+	HU_UpdatePatch(&kp_banana[1], "K_ISBANA");
+	HU_UpdatePatch(&kp_eggman[1], "K_ISEGGM");
+	HU_UpdatePatch(&kp_orbinaut[4], "K_ISORBN");
+	HU_UpdatePatch(&kp_jawz[1], "K_ISJAWZ");
+	HU_UpdatePatch(&kp_mine[1], "K_ISMINE");
+	HU_UpdatePatch(&kp_landmine[1], "K_ISLNDM");
+	HU_UpdatePatch(&kp_ballhog[1], "K_ISBHOG");
+	HU_UpdatePatch(&kp_selfpropelledbomb[1], "K_ISSPB");
+	HU_UpdatePatch(&kp_grow[1], "K_ISGROW");
+	HU_UpdatePatch(&kp_shrink[1], "K_ISSHRK");
+	HU_UpdatePatch(&kp_thundershield[1], "K_ISTHNS");
+	HU_UpdatePatch(&kp_bubbleshield[1], "K_ISBUBS");
+	HU_UpdatePatch(&kp_flameshield[1], "K_ISFLMS");
+	HU_UpdatePatch(&kp_hyudoro[1], "K_ISHYUD");
+	HU_UpdatePatch(&kp_pogospring[1], "K_ISPOGO");
+	HU_UpdatePatch(&kp_kitchensink[1], "K_ISSINK");
+	HU_UpdatePatch(&kp_sadface[1], "K_ISSAD");
 
 	sprintf(buffer, "FSMFSxxx");
 	for (i = 0; i < 104; i++)
@@ -469,7 +469,7 @@ void K_LoadKartHUDGraphics(void)
 		buffer[5] = '0'+((i+1)/100);
 		buffer[6] = '0'+(((i+1)/10)%10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_flameshieldmeter[i][1] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_flameshieldmeter[i][1], "%s", buffer);
 	}
 
 	sprintf(buffer, "FSMBS0xx");
@@ -477,7 +477,7 @@ void K_LoadKartHUDGraphics(void)
 	{
 		buffer[6] = '0'+((i+1)/10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_flameshieldmeter_bg[i][1] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_flameshieldmeter_bg[i][1], "%s", buffer);
 	}
 
 	// CHECK indicators
@@ -485,7 +485,7 @@ void K_LoadKartHUDGraphics(void)
 	for (i = 0; i < 6; i++)
 	{
 		buffer[7] = '1'+i;
-		kp_check[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_check[i], "%s", buffer);
 	}
 
 	// Rival indicators
@@ -493,7 +493,7 @@ void K_LoadKartHUDGraphics(void)
 	for (i = 0; i < 2; i++)
 	{
 		buffer[7] = '1'+i;
-		kp_rival[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_rival[i], "%s", buffer);
 	}
 
 	// Rival indicators
@@ -504,33 +504,33 @@ void K_LoadKartHUDGraphics(void)
 		for (j = 0; j < 2; j++)
 		{
 			buffer[7] = '1'+j;
-			kp_localtag[i][j] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+			HU_UpdatePatch(&kp_localtag[i][j], "%s", buffer);
 		}
 	}
 
 	// Typing indicator
-	kp_talk = W_CachePatchName("K_TALK", PU_HUDGFX);
-	kp_typdot = W_CachePatchName("K_TYPDOT", PU_HUDGFX);
+	HU_UpdatePatch(&kp_talk, "K_TALK");
+	HU_UpdatePatch(&kp_typdot, "K_TYPDOT");
 
 	// Eggman warning numbers
 	sprintf(buffer, "K_EGGNx");
 	for (i = 0; i < 4; i++)
 	{
 		buffer[6] = '0'+i;
-		kp_eggnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_eggnum[i], "%s", buffer);
 	}
 
 	// First person mode
-	kp_fpview[0] = 				W_CachePatchName("VIEWA0", PU_HUDGFX);
-	kp_fpview[1] =				W_CachePatchName("VIEWB0D0", PU_HUDGFX);
-	kp_fpview[2] = 				W_CachePatchName("VIEWC0E0", PU_HUDGFX);
+	HU_UpdatePatch(&kp_fpview[0], "VIEWA0");
+	HU_UpdatePatch(&kp_fpview[1], "VIEWB0D0");
+	HU_UpdatePatch(&kp_fpview[2], "VIEWC0E0");
 
 	// Input UI Wheel
 	sprintf(buffer, "K_WHEELx");
 	for (i = 0; i < 5; i++)
 	{
 		buffer[7] = '0'+i;
-		kp_inputwheel[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_inputwheel[i], "%s", buffer);
 	}
 
 	// HERE COMES A NEW CHALLENGER
@@ -539,7 +539,7 @@ void K_LoadKartHUDGraphics(void)
 	{
 		buffer[6] = '0'+((i+1)/10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_challenger[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_challenger[i], "%s", buffer);
 	}
 
 	// Lap start animation
@@ -547,7 +547,7 @@ void K_LoadKartHUDGraphics(void)
 	for (i = 0; i < 7; i++)
 	{
 		buffer[6] = '0'+(i+1);
-		kp_lapanim_lap[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_lapanim_lap[i], "%s", buffer);
 	}
 
 	sprintf(buffer, "K_LAPFxx");
@@ -555,7 +555,7 @@ void K_LoadKartHUDGraphics(void)
 	{
 		buffer[6] = '0'+((i+1)/10);
 		buffer[7] = '0'+((i+1)%10);
-		kp_lapanim_final[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_lapanim_final[i], "%s", buffer);
 	}
 
 	sprintf(buffer, "K_LAPNxx");
@@ -565,7 +565,7 @@ void K_LoadKartHUDGraphics(void)
 		for (j = 0; j < 3; j++)
 		{
 			buffer[7] = '0'+(j+1);
-			kp_lapanim_number[i][j] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+			HU_UpdatePatch(&kp_lapanim_number[i][j], "%s", buffer);
 		}
 	}
 
@@ -573,39 +573,39 @@ void K_LoadKartHUDGraphics(void)
 	for (i = 0; i < 2; i++)
 	{
 		buffer[7] = '0'+(i+1);
-		kp_lapanim_emblem[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_lapanim_emblem[i], "%s", buffer);
 	}
 
 	sprintf(buffer, "K_LAPH0x");
 	for (i = 0; i < 3; i++)
 	{
 		buffer[7] = '0'+(i+1);
-		kp_lapanim_hand[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_lapanim_hand[i], "%s", buffer);
 	}
 
-	kp_yougotem = (patch_t *) W_CachePatchName("YOUGOTEM", PU_HUDGFX);
-	kp_itemminimap = (patch_t *) W_CachePatchName("MMAPITEM", PU_HUDGFX);
+	HU_UpdatePatch(&kp_yougotem, "YOUGOTEM");
+	HU_UpdatePatch(&kp_itemminimap, "MMAPITEM");
 
 	sprintf(buffer, "ALAGLESx");
 	for (i = 0; i < 10; ++i)
 	{
 		buffer[7] = '0'+i;
-		kp_alagles[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_alagles[i], "%s", buffer);
 	}
 
 	sprintf(buffer, "BLAGLESx");
 	for (i = 0; i < 6; ++i)
 	{
 		buffer[7] = '0'+i;
-		kp_blagles[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
+		HU_UpdatePatch(&kp_blagles[i], "%s", buffer);
 	}
 
-	kp_cpu = (patch_t *) W_CachePatchName("K_CPU", PU_HUDGFX);
+	HU_UpdatePatch(&kp_cpu, "K_CPU");
 
-	kp_nametagstem = (patch_t *) W_CachePatchName("K_NAMEST", PU_HUDGFX);
+	HU_UpdatePatch(&kp_nametagstem, "K_NAMEST");
 
-	kp_trickcool[0] = W_CachePatchName("K_COOL1", PU_HUDGFX);
-	kp_trickcool[1] = W_CachePatchName("K_COOL2", PU_HUDGFX);
+	HU_UpdatePatch(&kp_trickcool[0], "K_COOL1");
+	HU_UpdatePatch(&kp_trickcool[1], "K_COOL2");
 }
 
 // For the item toggle menu
diff --git a/src/p_setup.c b/src/p_setup.c
index 62cb26d81..e0c00fe3e 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4462,7 +4462,7 @@ boolean P_AddWadFile(const char *wadfilename)
 	P_InitPicAnims();
 
 	// Flush and reload HUD graphics
-	ST_UnloadGraphics();
+	//ST_UnloadGraphics();
 	HU_LoadGraphics();
 	ST_LoadGraphics();
 
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 3e0788f4d..d2f774f95 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -261,114 +261,114 @@ void ST_LoadGraphics(void)
 	// cache the status bar overlay icons (fullscreen mode)
 
 	// Prefix "STT" is whitelisted (doesn't trigger ISGAMEMODIFIED), btw
-	sborings = W_CachePatchName("STTRINGS", PU_HUDGFX);
-	sboredrings = W_CachePatchName("STTRRING", PU_HUDGFX);
-	sboscore = W_CachePatchName("STTSCORE", PU_HUDGFX);
-	sbotime = W_CachePatchName("STTTIME", PU_HUDGFX); // Time logo
-	sboredtime = W_CachePatchName("STTRTIME", PU_HUDGFX);
-	sbocolon = W_CachePatchName("STTCOLON", PU_HUDGFX); // Colon for time
-	sboperiod = W_CachePatchName("STTPERIO", PU_HUDGFX); // Period for time centiseconds
+	HU_UpdatePatch(&sborings, "STTRINGS");
+	HU_UpdatePatch(&sboredrings, "STTRRING");
+	HU_UpdatePatch(&sboscore, "STTSCORE");
+	HU_UpdatePatch(&sbotime, "STTTIME"); // Time logo
+	HU_UpdatePatch(&sboredtime, "STTRTIME");
+	HU_UpdatePatch(&sbocolon, "STTCOLON"); // Colon for time
+	HU_UpdatePatch(&sboperiod, "STTPERIO"); // Period for time centiseconds
 
-	slidgame = W_CachePatchName("SLIDGAME", PU_HUDGFX);
-	slidtime = W_CachePatchName("SLIDTIME", PU_HUDGFX);
-	slidover = W_CachePatchName("SLIDOVER", PU_HUDGFX);
+	HU_UpdatePatch(&slidgame, "SLIDGAME");
+	HU_UpdatePatch(&slidtime, "SLIDTIME");
+	HU_UpdatePatch(&slidover, "SLIDOVER");
 
-	stlivex = W_CachePatchName("STLIVEX", PU_HUDGFX);
-	livesback = W_CachePatchName("STLIVEBK", PU_HUDGFX);
-	nrec_timer = W_CachePatchName("NGRTIMER", PU_HUDGFX); // Timer for NiGHTS
-	getall = W_CachePatchName("GETALL", PU_HUDGFX); // Special Stage HUD
-	timeup = W_CachePatchName("TIMEUP", PU_HUDGFX); // Special Stage HUD
-	race1 = W_CachePatchName("RACE1", PU_HUDGFX);
-	race2 = W_CachePatchName("RACE2", PU_HUDGFX);
-	race3 = W_CachePatchName("RACE3", PU_HUDGFX);
-	racego = W_CachePatchName("RACEGO", PU_HUDGFX);
-	nightslink = W_CachePatchName("NGHTLINK", PU_HUDGFX);
+	HU_UpdatePatch(&stlivex, "STLIVEX");
+	HU_UpdatePatch(&livesback, "STLIVEBK");
+	HU_UpdatePatch(&nrec_timer, "NGRTIMER"); // Timer for NiGHTS
+	HU_UpdatePatch(&getall, "GETALL"); // Special Stage HUD
+	HU_UpdatePatch(&timeup, "TIMEUP"); // Special Stage HUD
+	HU_UpdatePatch(&race1, "RACE1");
+	HU_UpdatePatch(&race2, "RACE2");
+	HU_UpdatePatch(&race3, "RACE3");
+	HU_UpdatePatch(&racego, "RACEGO");
+	HU_UpdatePatch(&nightslink, "NGHTLINK");
 
 	for (i = 0; i < 6; ++i)
 	{
-		hunthoming[i] = W_CachePatchName(va("HOMING%d", i+1), PU_HUDGFX);
-		itemhoming[i] = W_CachePatchName(va("HOMITM%d", i+1), PU_HUDGFX);
+		HU_UpdatePatch(&hunthoming[i], "HOMING%d", i+1);
+		HU_UpdatePatch(&itemhoming[i], "HOMITM%d", i+1);
 	}
 
-	curweapon = W_CachePatchName("CURWEAP", PU_HUDGFX);
-	normring = W_CachePatchName("RINGIND", PU_HUDGFX);
-	bouncering = W_CachePatchName("BNCEIND", PU_HUDGFX);
-	infinityring = W_CachePatchName("INFNIND", PU_HUDGFX);
-	autoring = W_CachePatchName("AUTOIND", PU_HUDGFX);
-	explosionring = W_CachePatchName("BOMBIND", PU_HUDGFX);
-	scatterring = W_CachePatchName("SCATIND", PU_HUDGFX);
-	grenadering = W_CachePatchName("GRENIND", PU_HUDGFX);
-	railring = W_CachePatchName("RAILIND", PU_HUDGFX);
-	jumpshield = W_CachePatchName("TVWWICON", PU_HUDGFX);
-	forceshield = W_CachePatchName("TVFOICON", PU_HUDGFX);
-	ringshield = W_CachePatchName("TVATICON", PU_HUDGFX);
-	watershield = W_CachePatchName("TVELICON", PU_HUDGFX);
-	bombshield = W_CachePatchName("TVARICON", PU_HUDGFX);
-	pityshield = W_CachePatchName("TVPIICON", PU_HUDGFX);
-	pinkshield = W_CachePatchName("TVPPICON", PU_HUDGFX);
-	flameshield = W_CachePatchName("TVFLICON", PU_HUDGFX);
-	bubbleshield = W_CachePatchName("TVBBICON", PU_HUDGFX);
-	thundershield = W_CachePatchName("TVZPICON", PU_HUDGFX);
-	invincibility = W_CachePatchName("TVIVICON", PU_HUDGFX);
-	sneakers = W_CachePatchName("TVSSICON", PU_HUDGFX);
-	gravboots = W_CachePatchName("TVGVICON", PU_HUDGFX);
+	HU_UpdatePatch(&curweapon, "CURWEAP");
+	HU_UpdatePatch(&normring, "RINGIND");
+	HU_UpdatePatch(&bouncering, "BNCEIND");
+	HU_UpdatePatch(&infinityring, "INFNIND");
+	HU_UpdatePatch(&autoring, "AUTOIND");
+	HU_UpdatePatch(&explosionring, "BOMBIND");
+	HU_UpdatePatch(&scatterring, "SCATIND");
+	HU_UpdatePatch(&grenadering, "GRENIND");
+	HU_UpdatePatch(&railring, "RAILIND");
+	HU_UpdatePatch(&jumpshield, "TVWWICON");
+	HU_UpdatePatch(&forceshield, "TVFOICON");
+	HU_UpdatePatch(&ringshield, "TVATICON");
+	HU_UpdatePatch(&watershield, "TVELICON");
+	HU_UpdatePatch(&bombshield, "TVARICON");
+	HU_UpdatePatch(&pityshield, "TVPIICON");
+	HU_UpdatePatch(&pinkshield, "TVPPICON");
+	HU_UpdatePatch(&flameshield, "TVFLICON");
+	HU_UpdatePatch(&bubbleshield, "TVBBICON");
+	HU_UpdatePatch(&thundershield, "TVZPICON");
+	HU_UpdatePatch(&invincibility, "TVIVICON");
+	HU_UpdatePatch(&sneakers, "TVSSICON");
+	HU_UpdatePatch(&gravboots, "TVGVICON");
 
-	tagico = W_CachePatchName("TAGICO", PU_HUDGFX);
-	rflagico = W_CachePatchName("RFLAGICO", PU_HUDGFX);
-	bflagico = W_CachePatchName("BFLAGICO", PU_HUDGFX);
-	rmatcico = W_CachePatchName("RMATCICO", PU_HUDGFX);
-	bmatcico = W_CachePatchName("BMATCICO", PU_HUDGFX);
-	gotrflag = W_CachePatchName("GOTRFLAG", PU_HUDGFX);
-	gotbflag = W_CachePatchName("GOTBFLAG", PU_HUDGFX);
-	fnshico = W_CachePatchName("FNSHICO", PU_HUDGFX);
-	nonicon = W_CachePatchName("NONICON", PU_HUDGFX);
-	nonicon2 = W_CachePatchName("NONICON2", PU_HUDGFX);
+	HU_UpdatePatch(&tagico, "TAGICO");
+	HU_UpdatePatch(&rflagico, "RFLAGICO");
+	HU_UpdatePatch(&bflagico, "BFLAGICO");
+	HU_UpdatePatch(&rmatcico, "RMATCICO");
+	HU_UpdatePatch(&bmatcico, "BMATCICO");
+	HU_UpdatePatch(&gotrflag, "GOTRFLAG");
+	HU_UpdatePatch(&gotbflag, "GOTBFLAG");
+	HU_UpdatePatch(&fnshico, "FNSHICO");
+	HU_UpdatePatch(&nonicon, "NONICON");
+	HU_UpdatePatch(&nonicon2, "NONICON2");
 
 	// NiGHTS HUD things
-	bluestat = W_CachePatchName("BLUESTAT", PU_HUDGFX);
-	byelstat = W_CachePatchName("BYELSTAT", PU_HUDGFX);
-	orngstat = W_CachePatchName("ORNGSTAT", PU_HUDGFX);
-	redstat = W_CachePatchName("REDSTAT", PU_HUDGFX);
-	yelstat = W_CachePatchName("YELSTAT", PU_HUDGFX);
-	nbracket = W_CachePatchName("NBRACKET", PU_HUDGFX);
-	nring = W_CachePatchName("NRNG1", PU_HUDGFX);
+	HU_UpdatePatch(&bluestat, "BLUESTAT");
+	HU_UpdatePatch(&byelstat, "BYELSTAT");
+	HU_UpdatePatch(&orngstat, "ORNGSTAT");
+	HU_UpdatePatch(&redstat, "REDSTAT");
+	HU_UpdatePatch(&yelstat, "YELSTAT");
+	HU_UpdatePatch(&nbracket, "NBRACKET");
+	HU_UpdatePatch(&nring, "NRNG1");
 	for (i = 0; i < 12; ++i)
 	{
-		nhud[i] = W_CachePatchName(va("NHUD%d", i+1), PU_HUDGFX);
-		nbon[i] = W_CachePatchName(va("NBON%d", i+1), PU_HUDGFX);
+		HU_UpdatePatch(&nhud[i], "NHUD%d", i+1);
+		HU_UpdatePatch(&nbon[i], "NBON%d", i+1);
 	}
-	nsshud = W_CachePatchName("NSSHUD", PU_HUDGFX);
-	nssbon = W_CachePatchName("NSSBON", PU_HUDGFX);
-	minicaps = W_CachePatchName("MINICAPS", PU_HUDGFX);
+	HU_UpdatePatch(&nsshud, "NSSHUD");
+	HU_UpdatePatch(&nssbon, "NSSBON");
+	HU_UpdatePatch(&minicaps, "MINICAPS");
 
 	for (i = 0; i < 8; ++i)
 	{
-		narrow[i] = W_CachePatchName(va("NARROW%d", i+1), PU_HUDGFX);
-		nredar[i] = W_CachePatchName(va("NREDAR%d", i+1), PU_HUDGFX);
+		HU_UpdatePatch(&narrow[i], "NARROW%d", i+1);
+		HU_UpdatePatch(&nredar[i], "NREDAR%d", i+1);
 	}
 
 	// non-animated version
-	narrow[8] = W_CachePatchName("NARROW9", PU_HUDGFX);
+	HU_UpdatePatch(&narrow[8], "NARROW9");
 
-	drillbar = W_CachePatchName("DRILLBAR", PU_HUDGFX);
+	HU_UpdatePatch(&drillbar, "DRILLBAR");
 	for (i = 0; i < 3; ++i)
-		drillfill[i] = W_CachePatchName(va("DRILLFI%d", i+1), PU_HUDGFX);
-	capsulebar = W_CachePatchName("CAPSBAR", PU_HUDGFX);
-	capsulefill = W_CachePatchName("CAPSFILL", PU_HUDGFX);
-	minus5sec = W_CachePatchName("MINUS5", PU_HUDGFX);
+		HU_UpdatePatch(&drillfill[i], "DRILLFI%d", i+1);
+	HU_UpdatePatch(&capsulebar, "CAPSBAR");
+	HU_UpdatePatch(&capsulefill, "CAPSFILL");
+	HU_UpdatePatch(&minus5sec, "MINUS5");
 
 	for (i = 0; i < 7; ++i)
-		ngradeletters[i] = W_CachePatchName(va("GRADE%d", i), PU_HUDGFX);
+		HU_UpdatePatch(&ngradeletters[i], "GRADE%d", i);
 
 	K_LoadKartHUDGraphics();
 
 	// Midnight Channel:
-	hud_tv1 = W_CachePatchName("HUD_TV1", PU_HUDGFX);
-	hud_tv2 = W_CachePatchName("HUD_TV2", PU_HUDGFX);
+	HU_UpdatePatch(&hud_tv1, "HUD_TV1");
+	HU_UpdatePatch(&hud_tv2, "HUD_TV2");
 
 #ifdef HAVE_DISCORDRPC
 	// Discord Rich Presence
-	envelope = W_CachePatchName("K_REQUES", PU_HUDGFX);
+	HU_UpdatePatch(&envelope, "K_REQUES");
 #endif
 }