X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=12abff2191ae8f333f6f593f5121ddf049981831;hb=f768856b2c9713d03c38ba3e6d2c423a67d955b0;hp=b457667e3ea70023f486076324f7585b7ce5bee5;hpb=16c35f41a25bb2edf3d4b7d664049d2923000f96;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index b457667e3..12abff219 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -14,6 +14,13 @@ Misc HUD functions
 //   1/4 height: bottom part
 void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize)
 {
+	if (theBorderSize_x <= 0 && theBorderSize_y <= 0) // no border
+	{
+		// draw only the central part
+		drawsubpic(theOrigin, theSize, pic, '0.25 0.25 0', '0.5 0.5 0', theColor, theAlpha, 0);
+		return;
+	}
+
 	vector dX, dY;
 	vector width, height;
 	vector bW, bH;
@@ -75,8 +82,13 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the
 	}
 }
 
+// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
+// TODO: make a default skin, and fallback to these!
+
 // drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
-void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
+void drawpic_aspect_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
+	pic = strcat(hud_skin_path, "/", pic);
+
 	vector imgsize;
 	imgsize = drawgetimagesize(pic);
 	float imgaspect;
@@ -96,18 +108,36 @@ void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha
 	}
 }
 
-// draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
-void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
-	drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag);
+// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
+void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
+	vector imgsize;
+	imgsize = drawgetimagesize(pic);
+	float imgaspect;
+	imgaspect = imgsize_x/imgsize_y;
+
+	vector oldsz;
+	oldsz = sz;
+	float aspect;
+	aspect = sz_x/sz_y;
+
+	if(aspect > imgaspect) {
+		sz_x = sz_y * imgaspect;
+		drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);
+	} else {
+		sz_y = sz_x / imgaspect; 
+		drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);
+	}
 }
 
 // TODO: aspect!
-void drawpic_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-	drawpic_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
+void drawpic_aspect_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
+	return;
+	//drawpic_aspect_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
 }
 
-void drawpic_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-	drawpic_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
+void drawpic_aspect_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
+	return;
+	//drawpic_aspect_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
 }
 
 // return HUD background color
@@ -146,99 +176,6 @@ vector HUD_AccuracyColor(float accuracy)
 	return rgb;
 }
 
-// draw number in the XSCALE font
-void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
-{
-	float l, i;
-	string str, tmp, l_length;
-	float minus, plus;
-	vector vsize, num_color;
-
-	vsize_x = vsize_y = lettersize;
-	vsize_z = 0;
-
-	// showsign 1: always prefix with minus sign (useful in race distribution display)
-	// showsign 2: always prefix with plus sign (useful in race distribution display)
-	// showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
-
-	if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3))
-	{
-		plus = true;
-		pos_x -= lettersize;
-	} else
-		plus = false;
-
-	if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0))
-	{
-		minus = true;
-		num = -num;
-		pos_x -= lettersize;
-	} else
-		minus = false;
-
-	if(digits < 0)
-	{
-		tmp = ftos(num);
-		digits = -digits;
-		str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
-	} else
-		str = ftos(num);
-
-	l = strlen(str);
-	l_length = ftos(l);
-
-	if(l > digits)
-	{
-		str = substring(str, l-digits, 999);
-		l = strlen(str);
-	} else if(l < digits)
-		pos_x += (digits-l) * lettersize;
-
-	if (highlighted == 1) {
-		vector hl_size;
-		hl_size_x = vsize_x * l + vsize_x * 0.2;
-		hl_size_y = vsize_y * 1.1;
-		hl_size_z = 0;
-		if(minus)
-			hl_size_x = hl_size_x + vsize_x;
-
-		vector hl_pos;
-		hl_pos_x = pos_x - lettersize/10;
-		hl_pos_y = pos_y - lettersize/20;
-		hl_pos_z = 0;
-
-		drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags);
-	}
-
-	if (stroke == 1)
-		num_color = '1 1 1';
-	else
-		num_color = rgb;
-
-	if(minus)
-	{
-		if (stroke == 1)
-			drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags);
-		drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags);
-		pos_x += lettersize;
-	} else if(plus)
-	{
-		if (stroke == 1)
-			drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags);
-		drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags);
-		pos_x += lettersize;
-	}
-
-	for(i = 0; i < l; ++i)
-	{
-		tmp = substring(str, i, 1);
-		if (stroke == 1)
-			drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-		drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags);
-		pos_x += lettersize;
-	}
-}
-
 vector HUD_Get_Num_Color (float x, float maxvalue)
 {
 	vector color;
@@ -274,13 +211,6 @@ vector HUD_Get_Num_Color (float x, float maxvalue)
 	}
 	return color;
 }
-// color the number differently based on how big it is (used in the health/armor panel)
-void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, float alpha)
-{
-	vector color;
-	color = HUD_Get_Num_Color (x, 200);
-	HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
-}
 
 float stringwidth_colors(string s, vector theSize)
 {
@@ -614,38 +544,45 @@ void HUD_Panel_ExportCfg(string cfgname)
 		float i;
 		for (i = 0; i < HUD_PANEL_NUM; ++i)
 		{
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), " ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i)))), "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_pos \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_pos")), "\"", "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_size \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_size")), "\"", "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg")), "\"", "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color")), "\"", "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color_team \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color_team")), "\"", "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_alpha \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_alpha")), "\"", "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_border \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_border")), "\"", "\n"));
-			fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_padding \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_padding")), "\"", "\n"));
+//			HUD_Panel_GetName(i)
+//			HUD_Panel_UpdateCvarsForId(i)
+
+			fputs(fh, strcat("seta hud_", panel_name, " ", ftos(cvar(strcat("hud_", panel_name))), "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_pos \"", cvar_string(strcat("hud_", panel_name, "_pos")), "\"", "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_size \"", cvar_string(strcat("hud_", panel_name, "_size")), "\"", "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_bg \"", cvar_string(strcat("hud_", panel_name, "_bg")), "\"", "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_bg_color \"", cvar_string(strcat("hud_", panel_name, "_bg_color")), "\"", "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_bg_color_team \"", cvar_string(strcat("hud_", panel_name, "_bg_color_team")), "\"", "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_bg_alpha \"", cvar_string(strcat("hud_", panel_name, "_bg_alpha")), "\"", "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_bg_border \"", cvar_string(strcat("hud_", panel_name, "_bg_border")), "\"", "\n"));
+			fputs(fh, strcat("seta hud_", panel_name, "_bg_padding \"", cvar_string(strcat("hud_", panel_name, "_bg_padding")), "\"", "\n"));
 			switch(i) {
-				case 0:
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_accuracy_yellow ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_accuracy_yellow"))), "\n"));
+				case HUD_PANEL_WEAPONICONS:
+					fputs(fh, strcat("seta hud_", panel_name, "_accuracy_yellow ", ftos(cvar(strcat("hud_", panel_name, "_accuracy_yellow"))), "\n"));
 					break;
-				case 1:
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_onlycurrent ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_onlycurrent"))), "\n"));
+				case HUD_PANEL_INVENTORY:
+					fputs(fh, strcat("seta hud_", panel_name, "_onlycurrent ", ftos(cvar(strcat("hud_", panel_name, "_onlycurrent"))), "\n"));
+					fputs(fh, strcat("seta hud_", panel_name, "_iconalign ", ftos(cvar(strcat("hud_", panel_name, "_iconalign"))), "\n"));
 					break;
-				case 2:
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n"));
+				case HUD_PANEL_POWERUPS:
+					fputs(fh, strcat("seta hud_", panel_name, "_flip ", ftos(cvar(strcat("hud_", panel_name, "_flip"))), "\n"));
+					fputs(fh, strcat("seta hud_", panel_name, "_iconalign ", ftos(cvar(strcat("hud_", panel_name, "_iconalign"))), "\n"));
+					fputs(fh, strcat("seta hud_", panel_name, "_baralign ", ftos(cvar(strcat("hud_", panel_name, "_baralign"))), "\n"));
 					break;
-				case 3:
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_mirror ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_mirror"))), "\n"));
+				case HUD_PANEL_HEALTHARMOR:
+					fputs(fh, strcat("seta hud_", panel_name, "_flip ", ftos(cvar(strcat("hud_", panel_name, "_flip"))), "\n"));
+					fputs(fh, strcat("seta hud_", panel_name, "_iconalign ", ftos(cvar(strcat("hud_", panel_name, "_iconalign"))), "\n"));
+					fputs(fh, strcat("seta hud_", panel_name, "_baralign ", ftos(cvar(strcat("hud_", panel_name, "_baralign"))), "\n"));
+					break;
+				case HUD_PANEL_NOTIFY:
+					fputs(fh, strcat("seta hud_", panel_name, "_flip ", ftos(cvar(strcat("hud_", panel_name, "_flip"))), "\n"));
+					fputs(fh, strcat("seta hud_", panel_name, "_info_top ", ftos(cvar(strcat("hud_", panel_name, "_info_top"))), "\n"));
 					break;
-				case 4:
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_flip ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_flip"))), "\n"));
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_info_top ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_info_top"))), "\n"));
+				case HUD_PANEL_RADAR:
+					fputs(fh, strcat("seta hud_", panel_name, "_foreground_alpha ", ftos(cvar(strcat("hud_", panel_name, "_foreground_alpha"))), "\n"));
 					break;
-				case 6:
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_foreground_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_foreground_alpha"))), "\n"));
-				case 9:
-					fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", HUD_Panel_GetName(i), "_alreadyvoted_alpha"))), "\n"));
+				case HUD_PANEL_VOTE:
+					fputs(fh, strcat("seta hud_", panel_name, "_alreadyvoted_alpha ", ftos(cvar(strcat("hud_", panel_name, "_alreadyvoted_alpha"))), "\n"));
 					break;
 			}
 			fputs(fh, "\n");
@@ -656,19 +593,11 @@ void HUD_Panel_ExportCfg(string cfgname)
 	fclose(fh);
 }
 
-// return active status of panel
-float HUD_Panel_CheckActive(float id)
-{
-	if (cvar_or(strcat("hud_", HUD_Panel_GetName(id)), 1))
-		return 1;
-	return 0;
-}
-
-// return size of given panel
-vector HUD_Panel_GetSize(float id)
+// return smoothly faded size of given panel when a dialog is active
+vector HUD_Panel_GetMenuSize(float id)
 {
 	vector mySize;
-	mySize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
+	mySize = stov(cvar_string(strcat("hud_", panel_name, "_size")));
 
 	mySize = eX * mySize_x * vid_conwidth + eY * mySize_y * vid_conheight;
 
@@ -700,18 +629,18 @@ vector HUD_Panel_GetSize(float id)
 	return mySize;
 }
 
-// return pos of given panel
-vector HUD_Panel_GetPos(float id)
+// return smoothly faded pos of given panel when a dialog is active
+vector HUD_Panel_GetMenuPos(float id)
 {
 	vector pos;
-	pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos")));
+	pos = stov(cvar_string(strcat("hud_", panel_name, "_pos")));
 
 	pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight;
 
 	if(disable_menu_alphacheck == 2 && id == highlightedPanel)
 	{
 		vector mySize, menu_enable_panelpos;
-		mySize = HUD_Panel_GetSize(id);
+		mySize = HUD_Panel_GetMenuSize(id);
 		if(mySize_x > mySize_y)
 			menu_enable_panelpos = eX * 0.5 * vid_conwidth - eX * 0.5 * mySize_x + eY * 0.82 * vid_conheight;
 		else
@@ -721,15 +650,6 @@ vector HUD_Panel_GetPos(float id)
 	return pos;
 }
 
-float HUD_Panel_GetBorder(float id)
-{
-	string border;
-	border = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_border"));
-	if(border == "")
-		border = cvar_string("hud_bg_border");
-	return stof(border);
-}
-
 vector HUD_Panel_GetColor(float id)
 {
 	float f;
@@ -737,90 +657,47 @@ vector HUD_Panel_GetColor(float id)
 	string color;
 
 	// fetch per-panel color
-	if(teamplay && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")) != "") {
-		f = stof(getplayerkey(self.sv_entnum, "colors"));
-		color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")));
+	if(teamplay && cvar_string(strcat("hud_", panel_name, "_bg_color_team")) != "") {
+		f = stof(getplayerkey(player_localentnum - 1, "colors"));
+		color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", panel_name, "_bg_color_team")));
 	}
 	else
-		color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color"));
+		color = cvar_string(strcat("hud_", panel_name, "_bg_color"));
 	color_vec = stov(color);
 
 	if(color == "") { // fetch default color
 		color = cvar_string("hud_bg_color");
 		color_vec = stov(color);
 		if(teamplay && cvar(strcat("hud_bg_color_team"))) {
-			f = stof(getplayerkey(self.sv_entnum, "colors"));
+			f = stof(getplayerkey(player_localentnum - 1, "colors"));
 			color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_bg_color_team");
 		}
 		else if(color == "shirt") {
-			f = stof(getplayerkey(self.sv_entnum, "colors"));
+			f = stof(getplayerkey(player_localentnum - 1, "colors"));
 			color_vec = colormapPaletteColor(floor(f / 16), 0);
 		}
 		else if(color == "pants") {
-			f = stof(getplayerkey(self.sv_entnum, "colors"));
+			f = stof(getplayerkey(player_localentnum - 1, "colors"));
 			color_vec = colormapPaletteColor(mod(f, 16), 1);
 		}
 	}
 	else if(color == "shirt") {
-		f = stof(getplayerkey(self.sv_entnum, "colors"));
-		color_vec = colormapPaletteColor(floor(f / 16), 0);
-	}
-	else if(color == "pants") {
-		f = stof(getplayerkey(self.sv_entnum, "colors"));
-		color_vec = colormapPaletteColor(mod(f, 16), 1);
-	}
-	return color_vec;
-}
-
-vector HUD_Panel_Dock_GetColor(void)
-{
-	float f;
-	vector color_vec;
-	string color;
-	color = cvar_string("hud_dock_color");
-	color_vec = stov(color);
-	if(teamplay && cvar(strcat("hud_dock_color_team"))) {
-		f = stof(getplayerkey(self.sv_entnum, "colors"));
-		color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team");
-	}
-	else if(color == "shirt") {
-		f = stof(getplayerkey(self.sv_entnum, "colors"));
+		f = stof(getplayerkey(player_localentnum - 1, "colors"));
 		color_vec = colormapPaletteColor(floor(f / 16), 0);
 	}
 	else if(color == "pants") {
-		f = stof(getplayerkey(self.sv_entnum, "colors"));
+		f = stof(getplayerkey(player_localentnum - 1, "colors"));
 		color_vec = colormapPaletteColor(mod(f, 16), 1);
 	}
 	return color_vec;
 }
 
-float HUD_Panel_GetBgAlpha(float id)
-{
-	string alpha;
-	alpha = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_alpha"));
-	if(alpha == "")
-		alpha = cvar_string("hud_bg_alpha");
-
-	if(hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == id) // do not set a minalpha cap when showing the config dialog for this panel
-		alpha = ftos((1 - cvar("_menu_alpha")) * max(cvar("hud_configure_bg_minalpha"), stof(alpha)) + (cvar("_menu_alpha")) * stof(alpha));
-	else if(hud_configure)
-		alpha = ftos(max(cvar("hud_configure_bg_minalpha"), stof(alpha)));
-
-	if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
-		return 0.25;
-
-	if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog
-		return stof(alpha);
-	else
-		return stof(alpha) * menu_fade_alpha;
-}
-
 float HUD_Panel_GetFgAlpha(float id)
 {
 	float alpha;
 	alpha = hud_fg_alpha;
 
-	if(hud_configure && !cvar(strcat("hud_", HUD_Panel_GetName(id)))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
+	if(autocvar__hud_configure && !cvar(strcat("hud_", panel_name))) // ALWAYS show disabled panels at 0.25 alpha when in config mode
 		return 0.25;
 
 	if(disable_menu_alphacheck == 2 && highlightedPanel == id) // don't fade this panel when showing the panel-specific menu dialog
@@ -829,55 +706,50 @@ float HUD_Panel_GetFgAlpha(float id)
 		return alpha * menu_fade_alpha;
 }
 
-float HUD_Panel_GetPadding(float id)
-{
-	string padding;
-	padding = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
-	if(padding == "")
-		padding = cvar_string("hud_bg_padding");
-
-	vector mySize;
-	mySize = HUD_Panel_GetSize(id);
-	float smallestsize;
-	smallestsize = min(mySize_x, mySize_y);
-	return min(smallestsize/2 - 5, stof(padding));
-}
-
 // draw the background/borders
 void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha)
 {
-	if(!hud_configure && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg")) == "0")
+	if(!autocvar__hud_configure && panel_bg == "0")
 		return;
 
-	string bg;
-	bg = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg"));
-	if(bg == "")
-		bg = cvar_string("hud_bg");
+	if(panel_bg == "")
+		panel_bg = cvar_string("hud_bg");
 
-	if(bg == "0" && hud_configure) {
-		bg = "border"; // we probably want to see a background in config mode at all times...
+	if(panel_bg == "0" && autocvar__hud_configure) {
+		panel_bg = "border"; // we probably want to see a background in config mode at all times...
 	}
 
-	if(bg != "0")
+	if(panel_bg != "0")
 	{
-		float border;
-		border = max(0.0000001, HUD_Panel_GetBorder(id)); // draw_BorderPicture does not like border = 0
+
+		string border;
+		border = cvar_string(strcat("hud_", panel_name, "_bg_border"));
+		if(border == "")
+			border = cvar_string("hud_bg_border");
+
+		float borderf;
+		borderf = stof(border);
 
 		vector color;
-		color = HUD_Panel_GetColor(id);
+		color = stov(panel_bg_color);
 
-		if(alpha)
-			alpha = HUD_Panel_GetBgAlpha(id) * alpha; // allow panels to fade in/out by passing an alpha value
-		else
-			alpha = HUD_Panel_GetBgAlpha(id);
+		//if(alpha)
+		//	alpha = HUD_Panel_GetBgAlpha(id) * alpha; // allow panels to fade in/out by passing an alpha value
+		//else
+		//	alpha = HUD_Panel_GetBgAlpha(id);
 
-		draw_BorderPicture(pos - '1 1 0' * border, strcat("gfx/hud/", cvar_string("hud_skin"), "/", bg), mySize + '1 1 0' * 2 * border, color, alpha, '1 1 0' * (border/BORDER_MULTIPLIER));
+		draw_BorderPicture(pos - '1 1 0' * borderf, strcat("gfx/hud/", cvar_string("hud_skin"), "/", panel_bg), mySize + '1 1 0' * 2 * borderf, color, alpha, '1 1 0' * (borderf/BORDER_MULTIPLIER));
 	}
+
+	if(highlightedPanel_prev == id && autocvar__hud_configure)
+		drawfill(pos - '1 1 0' * borderf, mySize + '1 1 0' * 2 * borderf, '1 1 1', .1 * (1 - cvar("_menu_alpha")), DRAWFLAG_ADDITIVE);
 }
 
 void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag)
 {
-//float	drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328;
+	if(!alpha)
+		return;
+
 	string pic;
 	pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/");
 	if(vertical) {
@@ -893,10 +765,9 @@ void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector
 	}
 }
 
-vector HUD_Panel_GetProgressBarColor(string item)
-{
-	return stov(cvar_string(strcat("hud_progressbar_", item, "_color")));
-}
+// TODO: autocvar
+#define HUD_Panel_GetProgressBarColor(item) \
+stov(cvar_string(strcat("hud_progressbar_", item, "_color")))
 
 // check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
 vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
@@ -914,11 +785,13 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
 	targCenter = '0 0 0'; // shut up fteqcc, there IS a reference
 
 	for (i = 0; i < HUD_PANEL_NUM; ++i) {
-		if(i == id || !HUD_Panel_CheckActive(i))
+		HUD_Panel_UpdateCvarsForId(i)
+
+		if(i == id || !panel_enabled)
 			continue;
 
-		targPos = HUD_Panel_GetPos(i) - '1 1 0' * HUD_Panel_GetBorder(id);
-		targSize = HUD_Panel_GetSize(i) + '2 2 0' * HUD_Panel_GetBorder(id);
+		targPos = panel_pos;
+		targSize = panel_size;
 
 		if(myPos_y + mySize_y < targPos_y)
 			continue;
@@ -974,27 +847,27 @@ vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
 void HUD_Panel_SetPos(float id, vector pos)
 {
 	vector oldPos;
-	oldPos = HUD_Panel_GetPos(id);
+	oldPos = panel_pos;
 
 	vector mySize;
-	mySize = HUD_Panel_GetSize(id);
+	mySize = panel_size;
 
-	if(cvar("hud_configure_checkcollisions"))
+	if(autocvar_hud_configure_checkcollisions)
 		pos = HUD_Panel_CheckMove(id, pos, mySize);
 
 	pos_x = bound(0, pos_x, vid_conwidth - mySize_x);
 	pos_y = bound(0, pos_y, vid_conheight - mySize_y);
 
-	if(cvar("hud_configure_grid"))
+	if(autocvar_hud_configure_grid)
 	{
-		pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
-		pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
+		pos_x = floor((pos_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_x, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
+		pos_y = floor((pos_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_y, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
 	}
 
 	string s;
 	s = strcat(ftos(pos_x/vid_conwidth), " ", ftos(pos_y/vid_conheight));
 
-	cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
+	cvar_set(strcat("hud_", panel_name, "_pos"), s);
 }
 
 // check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
@@ -1005,19 +878,21 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
 	vector targPos;
 	vector targSize;
 	vector targEndPos;
+
 	vector dist;
+	float ratio;
+	ratio = mySize_x/mySize_y;
 
 	for (i = 0; i < HUD_PANEL_NUM; ++i) {
-		if(i == id || !HUD_Panel_CheckActive(i))
+		if(i == id || !panel_enabled)
 			continue;
 
-		targBorder = HUD_Panel_GetBorder(i);
-		targPos = HUD_Panel_GetPos(i) - '1 1 0' * targBorder;
-		targSize = HUD_Panel_GetSize(i) + '2 2 0' * targBorder;
+		targPos = panel_pos;
+		targSize = panel_size;
 		targEndPos = targPos + targSize;
 
 		// resizeorigin is WITHIN target panel, just abort any collision testing against that particular panel to produce expected behaviour!
-		if(resizeorigin_x > targPos_x && resizeorigin_x < targPos_x + targSize_x && resizeorigin_y > targPos_y && resizeorigin_y < targPos_y + targSize_y)
+		if(resizeorigin_x > targPos_x && resizeorigin_x < targEndPos_x && resizeorigin_y > targPos_y && resizeorigin_y < targEndPos_y)
 			continue;
 
 		if (resizeCorner == 1)
@@ -1040,7 +915,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
 			// in this case resizeorigin (bottom-right point) and the bottom-right point of the panel
 			dist_x = resizeorigin_x - targEndPos_x;
 			dist_y = resizeorigin_y - targEndPos_y;
-			if (dist_y < 0)
+			if (dist_y < 0 || dist_x / dist_y > ratio)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
@@ -1058,7 +933,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
 
 			dist_x = targPos_x - resizeorigin_x;
 			dist_y = resizeorigin_y - targEndPos_y;
-			if (dist_y < 0)
+			if (dist_y < 0 || dist_x / dist_y > ratio)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
@@ -1076,7 +951,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
 
 			dist_x = resizeorigin_x - targEndPos_x;
 			dist_y = targPos_y - resizeorigin_y;
-			if (dist_y < 0)
+			if (dist_y < 0 || dist_x / dist_y > ratio)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
@@ -1094,46 +969,32 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
 
 			dist_x = targPos_x - resizeorigin_x;
 			dist_y = targPos_y - resizeorigin_y;
-			if (dist_y < 0)
+			if (dist_y < 0 || dist_x / dist_y > ratio)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
 		}
 		if(cvar("hud_configure_checkcollisions_debug"))
-			drawfill(targPos + '1 1 0' * targBorder, targSize - '2 2 0' * targBorder, '1 1 0', .3, DRAWFLAG_NORMAL);
+			drawfill(targPos, targSize, '1 1 0', .3, DRAWFLAG_NORMAL);
 	}
 
 	return mySize;
 }
 
-void HUD_Panel_SetPosSize(float id)
+void HUD_Panel_SetPosSize(float id, vector mySize)
 {
 	vector resizeorigin;
 	resizeorigin = panel_click_resizeorigin;
-	vector mySize, myPos;
-
-	if(resizeCorner == 1) {
-		mySize_x = resizeorigin_x - (mousepos_x - panel_click_distance_x);
-		mySize_y = resizeorigin_y - (mousepos_y - panel_click_distance_y);
-	} else if(resizeCorner == 2) {		
-		mySize_x = mousepos_x + panel_click_distance_x - resizeorigin_x;
-		mySize_y = panel_click_distance_y + resizeorigin_y - mousepos_y;
-	} else if(resizeCorner == 3) {
-		mySize_x = resizeorigin_x + panel_click_distance_x - mousepos_x;
-		mySize_y = mousepos_y + panel_click_distance_y - resizeorigin_y;
-	} else { // resizeCorner == 4
-		mySize_x = mousepos_x - (resizeorigin_x - panel_click_distance_x);
-		mySize_y = mousepos_y - (resizeorigin_y - panel_click_distance_y);
-	}
+	vector myPos;
 
 	// minimum panel size cap
 	mySize_x = max(0.025 * vid_conwidth, mySize_x);
 	mySize_y = max(0.025 * vid_conheight, mySize_y);
 
-	if(id == 12) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small.
+	if(id == HUD_PANEL_CHAT) // some panels have their own restrictions, like the chat panel (which actually only moves the engine chat print around). Looks bad if it's too small.
 	{
 		mySize_x = max(17 * cvar("con_chatsize"), mySize_x);
-		mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y);
+		mySize_y = max(2 * cvar("con_chatsize") + 2 * panel_bg_padding, mySize_y);
 	}
 
 	// collision testing|
@@ -1170,16 +1031,14 @@ void HUD_Panel_SetPosSize(float id)
 		drawfill(myPos, mySize, '1 1 1', .2, DRAWFLAG_NORMAL);
 
 	// before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken
-	if(cvar("hud_configure_grid"))
+	if(autocvar_hud_configure_grid)
 	{
-		mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
-		mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
+		mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, autocvar_hud_configure_grid_x, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
+		mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, autocvar_hud_configure_grid_y, 0.2) + 0.5) * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
 	}
 
-	if(cvar("hud_configure_checkcollisions"))
-	{
+	if(autocvar_hud_configure_checkcollisions)
 		mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin);
-	}
 
 	// minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then)
 	mySize_x = max(0.025 * vid_conwidth, mySize_x);
@@ -1201,15 +1060,14 @@ void HUD_Panel_SetPosSize(float id)
 	}
 
 	if(cvar("hud_configure_checkcollisions_debug"))
-	if(cvar("hud_configure_checkcollisions"))
 		drawfill(myPos, mySize, '0 1 0', .3, DRAWFLAG_NORMAL);
 
 	string s;
 	s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight));
-	cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s);
+	cvar_set(strcat("hud_", panel_name, "_size"), s);
 
 	s = strcat(ftos(myPos_x/vid_conwidth), " ", ftos(myPos_y/vid_conheight));
-	cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
+	cvar_set(strcat("hud_", panel_name, "_pos"), s);
 }
 
 float mouseClicked;
@@ -1219,9 +1077,106 @@ vector prevMouseClickedPos; // pos during previous mouse click, to check for dou
 
 float menu_enabled;
 float menu_enabled_time;
+float pressed_key_time;
+void HUD_Panel_Arrow_Action(float nPrimary)
+{
+	if (highlightedPanel_prev == -1 || mouseClicked)
+		return;
+
+	hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && cvar("hud_configure_checkcollisions"));
+
+	float step;
+	if(autocvar_hud_configure_grid)
+	{
+		if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW)
+		{
+			if (hudShiftState & S_SHIFT)
+				step = bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
+			else
+				step = 2 * bound(0.005, autocvar_hud_configure_grid_y, 0.2) * vid_conheight;
+		}
+		else
+		{
+			if (hudShiftState & S_SHIFT)
+				step = bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
+			else
+				step = 2 * bound(0.005, autocvar_hud_configure_grid_x, 0.2) * vid_conwidth;
+		}
+	}
+	else
+	{
+		if (nPrimary == K_UPARROW || nPrimary == K_DOWNARROW)
+			step = vid_conheight;
+		else
+			step = vid_conwidth;
+		if (hudShiftState & S_SHIFT)
+			step = (step / 256); // more precision
+		else
+			step = (step / 64) * (1 + 2 * (time - pressed_key_time));
+	}
+
+	highlightedPanel = highlightedPanel_prev;
+
+	HUD_Panel_UpdateCvarsForId(highlightedPanel)
+
+	if (hudShiftState & S_ALT) // resize
+	{
+		highlightedAction = 1;
+		if(nPrimary == K_UPARROW)
+			resizeCorner = 1;
+		else if(nPrimary == K_RIGHTARROW)
+			resizeCorner = 2;
+		else if(nPrimary == K_LEFTARROW)
+			resizeCorner = 3;
+		else // if(nPrimary == K_DOWNARROW)
+			resizeCorner = 4;
+
+		// ctrl+arrow reduces the size, instead of increasing it
+		// Note that ctrl disables collisions check too, but it's fine
+		// since we don't collide with anything reducing the size
+		if (hudShiftState & S_CTRL) {
+			step = -step;
+			resizeCorner = 5 - resizeCorner;
+		}
+
+		vector mySize;
+		mySize = panel_size;
+		panel_click_resizeorigin = panel_pos;
+		if(resizeCorner == 1) {
+			panel_click_resizeorigin += mySize;
+			mySize_y += step;
+		} else if(resizeCorner == 2) {
+			panel_click_resizeorigin_y += mySize_y;
+			mySize_x += step;
+		} else if(resizeCorner == 3) {
+			panel_click_resizeorigin_x += mySize_x;
+			mySize_x += step;
+		} else { // resizeCorner == 4
+			mySize_y += step;
+		}
+		HUD_Panel_SetPosSize(highlightedPanel, mySize);
+	}
+	else // move
+	{
+		highlightedAction = 2;
+		vector pos;
+		pos = panel_pos;
+		if(nPrimary == K_UPARROW)
+			pos_y -= step;
+		else if(nPrimary == K_DOWNARROW)
+			pos_y += step;
+		else if(nPrimary == K_LEFTARROW)
+			pos_x -= step;
+		else // if(nPrimary == K_RIGHTARROW)
+			pos_x += step;
+
+		HUD_Panel_SetPos(highlightedPanel, pos);
+	}
+}
+
 float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
-	if(!hud_configure)
+	if(!autocvar__hud_configure)
 		return false;
 
 	// allow console bind to work
@@ -1237,6 +1192,17 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 			hit_con_bind = 1;
 	}
 
+	if(bInputType == 0) {
+		if(nPrimary == K_ALT) hudShiftState |= S_ALT;
+		if(nPrimary == K_CTRL) hudShiftState |= S_CTRL;
+		if(nPrimary == K_SHIFT) hudShiftState |= S_SHIFT;
+	}
+	else if(bInputType == 1) {
+		if(nPrimary == K_ALT) hudShiftState -= (hudShiftState & S_ALT);
+		if(nPrimary == K_CTRL) hudShiftState -= (hudShiftState & S_CTRL);
+		if(nPrimary == K_SHIFT) hudShiftState -= (hudShiftState & S_SHIFT);
+	}
+
 	if(nPrimary == K_MOUSE1)
 	{
 		if(bInputType == 0) { // key pressed
@@ -1250,18 +1216,138 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
 	}
 	else if(nPrimary == K_ESCAPE)
 	{
+		if (bInputType == 1)
+			return true;
 		disable_menu_alphacheck = 1;
 		menu_enabled = 1;
 		menu_enabled_time = time;
 		localcmd("menu_showhudexit\n");
 	}
+	else if(nPrimary == K_UPARROW || nPrimary == K_DOWNARROW || nPrimary == K_LEFTARROW || nPrimary == K_RIGHTARROW)
+	{
+		if (bInputType == 1)
+		{
+			pressed_key_time = 0;
+			return true;
+		}
+		else if (pressed_key_time == 0)
+			pressed_key_time = time;
 
+		HUD_Panel_Arrow_Action(nPrimary); //move or resize panel
+	}
 	else if(hit_con_bind)
 		return false;
 
 	return true; // Suppress ALL other input
 }
 
+float HUD_Panel_HighlightCheck()
+{
+	float i, border;
+	vector panelPos;
+	vector panelSize;
+
+	for(i = 0; i < HUD_PANEL_NUM; ++i)
+	{
+		panelPos = panel_pos;
+		panelSize = panel_size;
+		border = 10; // FORCED border so a small border size doesn't mean you can't resize
+
+		// move
+		if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
+		{
+			return 1;
+		}
+		// resize from topleft border
+		else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+		{
+			return 2;
+		}
+		// resize from topright border
+		else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+		{
+			return 3;
+		}
+		// resize from bottomleft border
+		else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
+		{
+			return 3;
+		}
+		// resize from bottomright border
+		else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
+		{
+			return 2;
+		}
+	}
+	return 0;
+}
+
+void HUD_Panel_Highlight()
+{
+	float i, border;
+	vector panelPos;
+	vector panelSize;
+
+	for(i = 0; i < HUD_PANEL_NUM; ++i)
+	{
+		panelPos = panel_pos;
+		panelSize = panel_size;
+		border = 10; // FORCED border so a small border size doesn't mean you can't resize
+
+		// move
+		if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
+		{
+			highlightedPanel = i;
+			highlightedAction = 1;
+			panel_click_distance = mousepos - panelPos;
+			return;
+		}
+		// resize from topleft border
+		else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+		{
+			highlightedPanel = i;
+			highlightedAction = 2;
+			resizeCorner = 1;
+			panel_click_distance = mousepos - panelPos;
+			panel_click_resizeorigin = panelPos + panelSize;
+			return;
+		}
+		// resize from topright border
+		else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+		{
+			highlightedPanel = i;
+			highlightedAction = 2;
+			resizeCorner = 2;
+			panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x;
+			panel_click_distance_y = mousepos_y - panelPos_y;
+			panel_click_resizeorigin = panelPos + eY * panelSize_y;
+			return;
+		}
+		// resize from bottomleft border
+		else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
+		{
+			highlightedPanel = i;
+			highlightedAction = 2;
+			resizeCorner = 3;
+			panel_click_distance_x = mousepos_x - panelPos_x;
+			panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y;
+			panel_click_resizeorigin = panelPos + eX * panelSize_x;
+			return;
+		}
+		// resize from bottomright border
+		else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
+		{
+			highlightedPanel = i;
+			highlightedAction = 2;
+			resizeCorner = 4;
+			panel_click_distance = panelSize - mousepos + panelPos;
+			panel_click_resizeorigin = panelPos;
+			return;
+		}
+	}
+}
+
+float highlightcheck;
 void HUD_Panel_Mouse()
 {
 	// TODO: needs better check... is there any float that contains the current state of the menu? _menu_alpha isn't apparently updated the frame the menu gets enabled
@@ -1276,7 +1362,8 @@ void HUD_Panel_Mouse()
 	print("Menu alpha: ", cvar_string("_menu_alpha"), "\n");
 	*/
 
-	if(mouseClicked == 0 && disable_menu_alphacheck != 2) { // don't reset these variables in disable_menu_alphacheck mode 2!
+	if(mouseClicked == 0 && disable_menu_alphacheck != 2 && highlightedPanel >= 0) { // don't reset these variables in disable_menu_alphacheck mode 2!
+		highlightedPanel_prev = highlightedPanel;
 		highlightedPanel = -1;
 		highlightedAction = 0;
 	}
@@ -1286,90 +1373,32 @@ void HUD_Panel_Mouse()
 	mousepos_x = bound(0, mousepos_x, vid_conwidth);
 	mousepos_y = bound(0, mousepos_y, vid_conheight);
 
-	drawpic(mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
-
 	if(mouseClicked)
 	{
-		float i, border;
-		vector panelPos;
-		vector panelSize;
-
-		for(i = 0; i < HUD_PANEL_NUM; ++i)
-		{
-			panelPos = HUD_Panel_GetPos(i);
-			panelSize = HUD_Panel_GetSize(i);
-			border = HUD_Panel_GetBorder(i);
-			if(prevMouseClicked == 0) {
-				// move
-				if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
-				{
-					highlightedPanel = i;
-					highlightedAction = 1;
-				}
-				// resize from topleft border
-				else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
-				{
-					highlightedPanel = i;
-					highlightedAction = 2;
-					resizeCorner = 1;
-				}
-				// resize from topright border
-				else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - border && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
-				{
-					highlightedPanel = i;
-					highlightedAction = 2;
-					resizeCorner = 2;
-				}
-				// resize from bottomleft border
-				else if(mousepos_x >= panelPos_x - border && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + border)
-				{
-					highlightedPanel = i;
-					highlightedAction = 2;
-					resizeCorner = 3;
-				}
-				// resize from bottomright border
-				else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + border && mousepos_y <= panelPos_y + panelSize_y + border)
-				{
-					highlightedPanel = i;
-					highlightedAction = 2;
-					resizeCorner = 4;
-				}
-			}
-
-			if(highlightedPanel == i)
-			{
-				if(prevMouseClicked == 0)
-				{
-					if(highlightedAction == 1)
-						panel_click_distance = mousepos - panelPos;
-					else if(highlightedAction == 2)
-					{
-						if(resizeCorner == 1) {
-							panel_click_distance = mousepos - panelPos;
-							panel_click_resizeorigin = panelPos + panelSize;
-						} else if(resizeCorner == 2) {
-							panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x;
-							panel_click_distance_y = mousepos_y - panelPos_y;
-							panel_click_resizeorigin = panelPos + eY * panelSize_y;
-						} else if(resizeCorner == 3) {
-							panel_click_distance_x = mousepos_x - panelPos_x;
-							panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y;
-							panel_click_resizeorigin = panelPos + eX * panelSize_x;
-						} else if(resizeCorner == 4) {
-							panel_click_distance = panelSize - mousepos + panelPos;
-							panel_click_resizeorigin = panelPos;
-						}
-					}	
-				}
+		if(prevMouseClicked == 0)
+			HUD_Panel_Highlight(); // sets highlightedPanel, highlightedAction, panel_click_distance, panel_click_resizeorigin
 
-				if(cvar("hud_configure_checkcollisions_debug"))
-					drawfill(panelPos, panelSize, '1 0 0', .3, DRAWFLAG_NORMAL);
+		hud_configure_checkcollisions = (!(hudShiftState & S_CTRL) && cvar("hud_configure_checkcollisions"));
 
-				if(highlightedAction == 1)
-					HUD_Panel_SetPos(i, mousepos - panel_click_distance);
-				else if(highlightedAction == 2)
-					HUD_Panel_SetPosSize(i);
+		if(highlightedAction == 1)
+			HUD_Panel_SetPos(highlightedPanel, mousepos - panel_click_distance);
+		else if(highlightedAction == 2)
+		{
+			vector mySize;
+			if(resizeCorner == 1) {
+				mySize_x = panel_click_resizeorigin_x - (mousepos_x - panel_click_distance_x);
+				mySize_y = panel_click_resizeorigin_y - (mousepos_y - panel_click_distance_y);
+			} else if(resizeCorner == 2) {
+				mySize_x = mousepos_x + panel_click_distance_x - panel_click_resizeorigin_x;
+				mySize_y = panel_click_distance_y + panel_click_resizeorigin_y - mousepos_y;
+			} else if(resizeCorner == 3) {
+				mySize_x = panel_click_resizeorigin_x + panel_click_distance_x - mousepos_x;
+				mySize_y = mousepos_y + panel_click_distance_y - panel_click_resizeorigin_y;
+			} else { // resizeCorner == 4
+				mySize_x = mousepos_x - (panel_click_resizeorigin_x - panel_click_distance_x);
+				mySize_y = mousepos_y - (panel_click_resizeorigin_y - panel_click_distance_y);
 			}
+			HUD_Panel_SetPosSize(highlightedPanel, mySize);
 		}
 
 		// doubleclick check
@@ -1388,6 +1417,24 @@ void HUD_Panel_Mouse()
 			prevMouseClickedPos = mousepos;
 		}
 	}
+	else
+	{
+		highlightcheck = HUD_Panel_HighlightCheck();
+	}
+	// draw cursor after performing move/resize to have the panel pos/size updated before highlightcheck
+	string cursor;
+	vector cursorsize;
+	cursorsize = '32 32 0';
+
+	if(highlightcheck == 0)
+		drawpic(mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	else if(highlightcheck == 1)
+		drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_move.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	else if(highlightcheck == 2)
+		drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_resize.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+	else
+		drawpic(mousepos - cursorsize * 0.5, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor_resize2.tga"), '32 32 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+
 	prevMouseClicked = mouseClicked;
 }
 
@@ -1423,14 +1470,18 @@ float weaponorder_cmp(float i, float j, entity pass)
 void HUD_WeaponIcons(void)
 {
 	float id = HUD_PANEL_WEAPONICONS;
+	HUD_Panel_UpdateCvarsForId(id);
 	float alpha, stat_weapons; // "constants"
 	vector pos, mySize, accuracy_color;
 	float i, weapid, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
 
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = stov(cvar_string("hud_weaponicons_pos"));
+	pos = eX * pos_x * vid_conwidth + eY * pos_y * vid_conheight;
+
+	mySize = panel_size;
 
 	stat_weapons = getstati(STAT_WEAPONS);
+	weapon_cnt = 0;
 	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 	{
 		self = get_weaponinfo(i);
@@ -1446,22 +1497,25 @@ void HUD_WeaponIcons(void)
 		if(weaponorder_cmp_str_save)
 			strunzone(weaponorder_cmp_str_save);
 		weaponorder_cmp_str_save = strzone(weaponorder_cmp_str);
+		weapon_cnt = 0;
 		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 		{
 			self = get_weaponinfo(i);
 			if(self.impulse >= 0)
+			{
 				weaponorder[weapon_cnt] = self;
+				++weapon_cnt;
+			}
 		}
 		heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
 	}
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	// hits
@@ -1490,6 +1544,13 @@ void HUD_WeaponIcons(void)
 
 	columns = ceil(WEP_COUNT/rows);
 	float row, column;
+
+	float a;
+	float when;
+	when = cvar("hud_weaponicons_complainbubble_time");
+	float fadetime;
+	fadetime = cvar("hud_weaponicons_complainbubble_fadetime");
+
 	for(i = 0; i < weapon_cnt; ++i)
 	{
 		self = weaponorder[i];
@@ -1502,7 +1563,7 @@ void HUD_WeaponIcons(void)
 
 		// draw background behind currently selected weapon
 		if(self.weapon == activeweapon)
-			drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
 		// draw the weapon accuracy on the HUD
 		if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
@@ -1512,20 +1573,60 @@ void HUD_WeaponIcons(void)
 
 			accuracy_color = HUD_AccuracyColor(weapon_stats);
 			if(weapon_damage)
-				drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 
 		// draw the weapon icon
 		if((self.impulse >= 0) && (stat_weapons & self.weapons))
 		{
-			drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
 			if(cvar_or("hud_weaponicons_number", 1))
 				drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
+		// draw a "ghost weapon icon" if you don't have the weapon
 		else
 		{
-			drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '0 0 0', HUD_Panel_GetFgAlpha(id) * 0.5, DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '0 0 0', HUD_Panel_GetFgAlpha(id) * 0.5, DRAWFLAG_NORMAL);
+		}
+
+		// draw the complain message
+		if(time - complain_weapon_time < when + fadetime && self.weapon == complain_weapon && cvar("hud_weaponicons_complainbubble"))
+		{
+			if(fadetime)
+			{
+				if(complain_weapon_time + when > time)
+					a = 1;
+				else
+					a = bound(0, (complain_weapon_time + when + fadetime - time) / fadetime, 1);
+			}
+			else
+			{
+				if(complain_weapon_time + when > time)
+					a = 1;
+				else
+					a = 0;
+			}
+
+			vector complain_bubble_size = '100 50 0' * bound(0.25, cvar("hud_weaponicons_complainbubble_size"), 2);
+			drawpic_aspect_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - complain_bubble_size + 0.5 * (eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows)), "weapon_complainbubble", complain_bubble_size, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+
+			string s;
+			vector color;
+			if(complain_weapon_type == 0) {
+				s = "Out of ammo for the";
+				color = '1 0 0';
+			}
+			else if(complain_weapon_type == 1) {
+				s = "You don't have the";
+				color = '1 1 0';
+			}
+			else {
+				s = "Map doesn't have the";
+				color = '1 1 1';
+			}
+			drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - complain_bubble_size + eX * 0.05 * complain_bubble_size_x + eY * (1/6) * complain_bubble_size_y + 0.5 * (eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows)), s, eX * 0.9 * complain_bubble_size_x + eY * 0.2 * complain_bubble_size_y, 0.2 * complain_bubble_size_y, color, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+			drawstring_aspect(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows) - complain_bubble_size + eX * 0.05 * complain_bubble_size_x + eY * (11/30) * complain_bubble_size_y + 0.5 * (eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows)), complain_weapon_name, eX * 0.9 * complain_bubble_size_x + eY * 0.25 * complain_bubble_size_y, 0.25 * complain_bubble_size_y, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 		}
 
 		++row;
@@ -1579,104 +1680,176 @@ string GetAmmoPicture(float i)
 	}
 }
 
+void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_selected)
+{
+	float a;
+	a = getstati(GetAmmoStat(itemcode)); // how much ammo do we have of type itemcode?
+	if(autocvar__hud_configure)
+		a = 100;
+
+	vector color;
+	if(a < 10)
+		color = '0.7 0 0';
+	else
+		color = '1 1 1';
+
+	float alpha;
+	if(currently_selected)
+		alpha = 1;
+	else
+		alpha = 0.7;
+
+	vector newSize, newPos;
+	if(mySize_x/mySize_y > 3)
+	{
+		newSize_x = 3 * mySize_y;
+		newSize_y = mySize_y;
+
+		newPos_x = myPos_x + (mySize_x - newSize_x) / 2;
+		newPos_y = myPos_y;
+	}
+	else
+	{
+		newSize_y = 1/3 * mySize_x;
+		newSize_x = mySize_x;
+
+		newPos_y = myPos_y + (mySize_y - newSize_y) / 2;
+		newPos_x = myPos_x;
+	}
+
+	vector picpos, numpos;
+	if(cvar("hud_inventory_iconalign"))
+	{
+		numpos = newPos;
+		picpos = newPos + eX * 2 * newSize_y;
+	}
+	else
+	{
+		numpos = newPos + eX * newSize_y;
+		picpos = newPos;
+	}
+
+	if (currently_selected)
+		drawpic_aspect_skin(newPos, "ammo_current_bg", newSize, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY), DRAWFLAG_NORMAL);
+
+	drawfont = hud_bigfont;
+	drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, newSize_y, color, HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY) * alpha, DRAWFLAG_NORMAL);
+	drawfont = hud_font;
+	drawpic_aspect_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY) * alpha, DRAWFLAG_NORMAL);
+}
+
 void HUD_Inventory(void)
 {
 	float id = HUD_PANEL_INVENTORY;
-	float i;
-	float stat_items;
+	HUD_Panel_UpdateCvarsForId(id);
+	float i, currently_selected;
 
-	vector pos, mySize, mysize, mypos;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	vector pos, mySize;
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
-	// ammo
-	stat_items = getstati(STAT_ITEMS);
-	for (i = 0; i < 4; ++i) {
-		float a;
-		a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
-		if(hud_configure)
-			a = 100;
+	float rows, columns;
+	rows = mySize_y/mySize_x;
+	rows = bound(1, floor((sqrt(4 * (3/1) * rows * AMMO_COUNT + rows * rows) + rows + 0.5) / 2), AMMO_COUNT);
+	//                               ^^^ ammo item aspect goes here
+
+	columns = ceil(AMMO_COUNT/rows);
 
+	float row, column;
+	// ammo
+	for (i = 0; i < AMMO_COUNT; ++i) {
+		currently_selected = getstati(STAT_ITEMS) & GetAmmoItemCode(i);
 		if(cvar("hud_inventory_onlycurrent")) {
-			if(hud_configure)
+			if(autocvar__hud_configure)
 				i = 2;
-			if (stat_items & GetAmmoItemCode(i) || hud_configure) {
-				drawpic_skin(pos, GetAmmoPicture(i), '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				if(a < 10)
-					HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				else
-					HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			}
-			if(hud_configure)
-				break;
+			if (currently_selected || autocvar__hud_configure)
+				DrawAmmoItem(pos, mySize, i, currently_selected);
+			break;
 		} else {
-			if (a > 0) {
-				if(mySize_x/mySize_y >= 10) { // arrange horizontally
-					switch (i) {
-						case 0: mypos_x = pos_x; 			mypos_y = pos_y; 			break; // shells
-						case 1: mypos_x = pos_x + 0.25 * mySize_x;	mypos_y = pos_y; 			break; // bullets
-						case 2: mypos_x = pos_x + 0.5  * mySize_x; 	mypos_y = pos_y; 			break; // rockets
-						case 3: mypos_x = pos_x + 0.75 * mySize_x; 	mypos_y = pos_y;			break; // cells
-					}
-					mysize_x = 0.25 * mySize_x;
-					mysize_y = mySize_y;
-				} else if(mySize_x/mySize_y >= 2.5) { // arrange in a 2x2 grid
-					switch (i) {
-						case 0: mypos_x = pos_x + 0.5 * mySize_x; 	mypos_y = pos_y + 0.5 * mySize_y; 	break; // shells
-						case 1: mypos_x = pos_x + 0.5 * mySize_x;	mypos_y = pos_y; 			break; // bullets
-						case 2: mypos_x = pos_x; 			mypos_y = pos_y + 0.5 * mySize_y; 	break; // rockets
-						case 3: mypos_x = pos_x; 			mypos_y = pos_y; 			break; // cells
-					}
-					mysize_x = 0.5 * mySize_x;
-					mysize_y = 0.5 * mySize_y;
-				} else { // arrange vertically
-					switch (i) {
-						case 0: mypos_x = pos_x; 			mypos_y = pos_y; 			break; // shells
-						case 1: mypos_x = pos_x;			mypos_y = pos_y + 0.25 * mySize_y; 	break; // bullets
-						case 2: mypos_x = pos_x; 			mypos_y = pos_y + 0.5  * mySize_y; 	break; // rockets
-						case 3: mypos_x = pos_x; 			mypos_y = pos_y + 0.75 * mySize_y; 	break; // cells
-					}
-					mysize_x = mySize_x;
-					mysize_y = 0.25 * mySize_y;
-				}
-
-				if (stat_items & GetAmmoItemCode(i))
-					drawpic_skin(mypos, "ammo_current_bg", mysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				if (a < 10) {
-					if(stat_items & GetAmmoItemCode(i))
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-					else
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL);
-				} else {
-					if(stat_items & GetAmmoItemCode(i))
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-					else
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL);
-				}
+			DrawAmmoItem(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), i, currently_selected);
+			++row;
+			if(row >= rows)
+			{
+				row = 0;
+				column = column + 1;
 			}
 		}
 	}
 }
 
+void DrawNumIcon(float id, vector myPos, vector mySize, float x, string icon, float left, vector color)
+{
+	vector newSize, newPos;
+	if(mySize_x/mySize_y > 3)
+	{
+		newSize_x = 3 * mySize_y;
+		newSize_y = mySize_y;
+
+		newPos_x = myPos_x + (mySize_x - newSize_x) / 2;
+		newPos_y = myPos_y;
+	}
+	else
+	{
+		newSize_y = 1/3 * mySize_x;
+		newSize_x = mySize_x;
+
+		newPos_y = myPos_y + (mySize_y - newSize_y) / 2;
+		newPos_x = myPos_x;
+	}
+
+	vector picpos, numpos;
+	float iconalign;
+	iconalign = cvar(strcat("hud_", panel_name, "_iconalign"));
+	if(left)
+	{
+		if(iconalign == 1 || iconalign == 3) // right align
+		{
+			numpos = newPos;
+			picpos = newPos + eX * 2 * newSize_y;
+		}
+		else // left align
+		{
+			numpos = newPos + eX * newSize_y;
+			picpos = newPos;
+		}
+	}
+	else
+	{
+		if(iconalign == 0 || iconalign == 3) // left align
+		{
+			numpos = newPos + eX * newSize_y;
+			picpos = newPos;
+		} 
+		else // right align
+		{
+			numpos = newPos;
+			picpos = newPos + eX * 2 * newSize_y;
+		}
+	}
+
+	drawfont = hud_bigfont;
+	drawstring_aspect(numpos, ftos(x), eX * (2/3) * newSize_x + eY * newSize_y, newSize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawfont = hud_font;
+	drawpic_aspect_skin(picpos, icon, '1 1 0' * newSize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+}
 
 // Powerups (#2)
 //
 void HUD_Powerups(void) {
 	float id = HUD_PANEL_POWERUPS;
+	HUD_Panel_UpdateCvarsForId(id);
 	float stat_items;
 	stat_items = getstati(STAT_ITEMS);
 
-	if(!hud_configure)
+	if(!autocvar__hud_configure)
 	{
 		if not(stat_items & IT_STRENGTH)
 			if not(stat_items & IT_INVINCIBLE)
@@ -1687,16 +1860,15 @@ void HUD_Powerups(void) {
 	}
 
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	float strength_time, shield_time;
@@ -1704,14 +1876,12 @@ void HUD_Powerups(void) {
 	strength_time = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99);
 	shield_time = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99);
 
-	if(hud_configure)
+	if(autocvar__hud_configure)
 	{
 		strength_time = 15;
 		shield_time = 27;
 	}
 
-	float len;
-
 	vector barpos, barsize;
 	vector picpos;
 	vector numpos;
@@ -1720,7 +1890,7 @@ void HUD_Powerups(void) {
 	float leftcnt, rightcnt;
 	float leftexact, rightexact;
 	float leftalpha, rightalpha;
-	if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) {
+	if (cvar(strcat("hud_", panel_name, "_flip"))) {
 		leftname = "strength";
 		leftcnt = ceil(strength_time);
 		leftexact = strength_time;
@@ -1740,154 +1910,127 @@ void HUD_Powerups(void) {
 	leftalpha = bound(0, leftexact, 1);
 	rightalpha = bound(0, rightexact, 1);
 
+	float baralign, iconalign;
+	baralign = cvar(strcat("hud_", panel_name, "_baralign"));
+	iconalign = cvar(strcat("hud_", panel_name, "_iconalign"));
+
 	if (mySize_x/mySize_y > 4)
 	{
 		if(leftcnt)
 		{
-			len = strlen(ftos(leftcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 1 || baralign == 3) { // right align
 				barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/30);
 				barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y;
-				picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y;
-				numpos = picpos - eX * 2 * 0.5 * mySize_y + eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-			} else {
+			} else { // left align
 				barpos = pos;
 				barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y;
-				picpos = pos;
-				numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			if(leftcnt <= 5)
-				drawpic_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
-			else
-				drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, leftcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			DrawNumIcon(id, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, '1 1 1');
+			// TODO: expand
+			//if(leftcnt <= 5)
+			//	drawpic_aspect_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
+			//else
+			//	drawpic_aspect_skin(picpos, leftname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 
 		if(rightcnt)
 		{
-			len = strlen(ftos(rightcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 0 || baralign == 3) { // left align
 				barpos = pos + eX * 0.5 * mySize_x;
 				barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y;
-				picpos = pos + eX * 0.5 * mySize_x;
-				numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-			} else {
+			} else { // right align
 				barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30);
 				barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y;
-				picpos = pos + eX * mySize_x - eX * mySize_y;
-				numpos = picpos - eX * mySize_y + eY * 0.25 * mySize_y;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			if(rightcnt <= 5)
-				drawpic_skin_expanding_two(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
-			else
-				drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, rightcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			DrawNumIcon(id, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, '1 1 1');
 		}
 	}
 	else if (mySize_x/mySize_y > 1.5)
 	{
 		if(leftcnt)
 		{
-			len = strlen(ftos(leftcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 1 || baralign == 3) { // right align
 				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30);
 				barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y;
-				picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y;
-				numpos = picpos - eX * len * 0.5 * mySize_y;
-			} else {
+			} else { // left align
 				barpos = pos;
 				barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y;
-				picpos = pos;
-				numpos = picpos + eX * 0.5 * mySize_y;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			if(leftcnt <= 5)
-				drawpic_skin_expanding_two(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
-			else
-				drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			DrawNumIcon(id, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, '1 1 1');
 		}
 
 		if(rightcnt)
 		{
-			len = strlen(ftos(rightcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-				barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-				picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y;
-				numpos = picpos - eX * len * 0.5 * mySize_y;
-			} else {
+			if(baralign == 0 || baralign == 3) { // left align
 				barpos = pos + eY * 0.5 * mySize_y;
 				barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-				picpos = pos + eY * 0.5 * mySize_y;
-				numpos = picpos + eX * 0.5 * mySize_y;
+			} else { // right align
+				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
+				barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			if(rightcnt <= 5)
-				drawpic_skin_expanding_two(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
-			else
-				drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			DrawNumIcon(id, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, '1 1 1');
 		}
 	}
 	else
 	{
 		if(leftcnt)
 		{
-			len = strlen(ftos(leftcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 1 || baralign == 3) { // down align
+				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30);
+				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
+			} else { // up align
 				barpos = pos;
 				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
+			}
+
+			if(iconalign == 1 || iconalign == 3) { // down align
+				picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x);
+				numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x;
+			} else { // up align
 				picpos = pos + eX * 0.05 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x;
-			} else {
-				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30);
-				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
-				picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x;
+				numpos = pos + eY * 0.4 * mySize_x;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			if(leftcnt <= 5)
-				drawpic_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
+				drawpic_aspect_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
 			else
-				drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, leftcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 
 		if(rightcnt)
 		{
-			len = strlen(ftos(rightcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 0 || baralign == 3) { // up align
 				barpos = pos + eX * 0.5 * mySize_x;
 				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
-				picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
-			} else {
+			} else { // down align
 				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30) + eX * 0.5 * mySize_x;
 				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
-				picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x + eX * 0.5 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
+			}
+
+			if(iconalign == 0 || iconalign == 3) { // up align
+				picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
+				numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
+			} else { // down align
+				picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x;
+				numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			if(rightcnt <= 5)
-				drawpic_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
+				drawpic_aspect_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
 			else
-				drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, rightcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 	}
 }
@@ -1897,17 +2040,17 @@ void HUD_Powerups(void) {
 void HUD_HealthArmor(void)
 {
 	float id = HUD_PANEL_HEALTHARMOR;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	float armor, health;
@@ -1917,7 +2060,7 @@ void HUD_HealthArmor(void)
 	float fuel;
 	fuel = getstati(GetAmmoStat(4)); // how much fuel do we have?
 
-	if(hud_configure)
+	if(autocvar__hud_configure)
 	{
 		armor = 150;
 		health = 100;
@@ -1927,11 +2070,14 @@ void HUD_HealthArmor(void)
 	if(health <= 0)
 		return;
 
-	float len;
 	vector barpos, barsize;
 	vector picpos;
 	vector numpos;
 
+	float baralign, iconalign;
+	baralign = cvar(strcat("hud_", panel_name, "_baralign"));
+	iconalign = cvar(strcat("hud_", panel_name, "_iconalign"));
+
 	if(cvar("hud_healtharmor") == 2) // combined health and armor display
 	{
 		vector v;
@@ -1940,53 +2086,51 @@ void HUD_HealthArmor(void)
 		float x;
 		x = floor(v_x + 1);
 
-		if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+		if(baralign == 1 || baralign == 3) { // right align
 			barpos = pos + eX * mySize_x - eX * mySize_x * min(1, x/400);
 			barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y;
-			picpos = pos;
-			numpos = picpos + eX * 1.5 * mySize_y;
-		} else {
+		} else { // left align
 			barpos = pos;
 			barsize = eX * mySize_x * min(1, x/400) + eY * mySize_y;
-			picpos = pos + eX * 3 * mySize_y;
-			numpos = pos;
 		}
 
+		string biggercount;
 		if(v_z) // NOT fully armored
 		{
+			biggercount = "health";
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("health"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			drawpic_skin(picpos, "health", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			if(armor)
-				drawpic_skin(picpos + eX * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * armor / health, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "armor", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * armor / health, DRAWFLAG_NORMAL);
 		}
 		else
 		{
+			biggercount = "armor";
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("armor"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			drawpic_skin(picpos + eX * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id) * health / armor, DRAWFLAG_NORMAL);
-			if(armor)
-				drawpic_skin(picpos, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			if(health)
+				drawpic_aspect_skin(pos + eX * mySize_x - eX * 0.5 * mySize_y, "health", '0.5 0.5 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
-		HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor
+		DrawNumIcon(id, pos, mySize, x, biggercount, 1, HUD_Get_Num_Color(x, 2 * 200));
 
 		// fuel
-		if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-			barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-			barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-		} else {
-			barpos = pos;
-			barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-		}
 		if(fuel)
+		{
+			if(baralign == 0 || baralign == 3) { // left align
+				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+			} else {
+				barpos = pos;
+				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+			}
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+		}
 	}
-
 	else
 	{
 		string leftname, rightname;
 		float leftcnt, rightcnt;
 		float leftactive, rightactive;
 		float leftalpha, rightalpha;
-		if (cvar(strcat("hud_", HUD_Panel_GetName(id), "_flip"))) { // old style layout with armor left/top of health
+		if (cvar(strcat("hud_", panel_name, "_flip"))) { // old style layout with armor left/top of health
 			leftname = "armor";
 			leftcnt = armor;
 			if(leftcnt)
@@ -2010,167 +2154,149 @@ void HUD_HealthArmor(void)
 			rightalpha = min((armor+10)/55, 1);
 		}
 
-		if (mySize_x/mySize_y > 5)
+		if (mySize_x/mySize_y > 4)
 		{
 			if(leftactive)
 			{
-				len = strlen(ftos(leftcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 1 || baralign == 3) { // right align
 					barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200);
 					barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y;
-					picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y;
-					numpos = picpos - eX * 3 * 0.5 * mySize_y + eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-				} else {
+				} else { // left align
 					barpos = pos;
 					barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y;
-					picpos = pos;
-					numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				DrawNumIcon(id, pos, eX * 0.5 * mySize_x + eY * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200));
 			}
 
 			if(rightactive)
 			{
-				len = strlen(ftos(rightcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 0 || baralign == 3) { // left align
 					barpos = pos + eX * 0.5 * mySize_x;
 					barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y;
-					picpos = pos + eX * 0.5 * mySize_x;
-					numpos = picpos + eX * mySize_y - eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-				} else {
+				} else { // right align
 					barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200);
 					barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y;
-					picpos = pos + eX * mySize_x - eX * mySize_y;
-					numpos = picpos - eX * 1.5 * mySize_y + eY * 0.25 * mySize_y;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				DrawNumIcon(id, pos + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200));
 			}
 
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-			} else {
-				barpos = pos;
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-			}
 			if(fuel)
+			{
+				if(baralign == 0 || baralign == 3) { // left align
+					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+				} else {
+					barpos = pos;
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+				}
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+			}
 		}
-		else if (mySize_x/mySize_y > 2)
+		else if (mySize_x/mySize_y > 1.5)
 		{
 			if(leftactive)
 			{
-				len = strlen(ftos(leftcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 1 || baralign == 3) { // right align
 					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200);
-					barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
-					picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y;
-					numpos = picpos - eX * len * 0.5 * mySize_y;
-				} else {
+					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+				} else { // left align
 					barpos = pos;
-					barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
-					picpos = pos;
-					numpos = picpos + eX * 0.5 * mySize_y;
+					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				DrawNumIcon(id, pos, eX * mySize_x + eY * 0.5 * mySize_y, leftcnt, leftname, 1, HUD_Get_Num_Color(leftcnt, 200));
 			}
 
 			if(rightactive)
 			{
-				len = strlen(ftos(rightcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-					picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y;
-					numpos = picpos - eX * len * 0.5 * mySize_y;
-				} else {
+				if(baralign == 0 || baralign == 3) { // left align
 					barpos = pos + eY * 0.5 * mySize_y;
 					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-					picpos = pos + eY * 0.5 * mySize_y;
-					numpos = picpos + eX * 0.5 * mySize_y;
+				} else { // right align
+					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				DrawNumIcon(id, pos + eY * 0.5 * mySize_y, eX * mySize_x + eY * 0.5 * mySize_y, rightcnt, rightname, 0, HUD_Get_Num_Color(leftcnt, 200));
 			}
 
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
-			} else {
-				barpos = pos;
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
-			}
 			if(fuel)
+			{
+				if(baralign == 0 || baralign == 3) { // left align
+					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
+				} else {
+					barpos = pos;
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
+				}
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+			}
 		}
 		else
 		{
 			if(leftactive)
 			{
-				len = strlen(ftos(leftcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 1 || baralign == 3) { // down align
+					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200);
+					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
+				} else { // up align
 					barpos = pos;
 					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
+				}
+
+				if(iconalign == 1 || iconalign == 3) { // down align
+					picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x);
+					numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x;
+				} else { // up align
 					picpos = pos + eX * 0.05 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x;
-				} else {
-					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200);
-					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
-					picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x;
+					numpos = pos + eY * 0.4 * mySize_x;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id));
+				drawpic_aspect_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
 			if(rightactive)
 			{
-				len = strlen(ftos(rightcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 0 || baralign == 3) { // up align
 					barpos = pos + eX * 0.5 * mySize_x;
 					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200);
-					picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
-				} else {
+				} else { // down align
 					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200) + eX * 0.5 * mySize_x;
 					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200);
-					picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x + eX * 0.5 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x + eX * 0.5 * mySize_x;
+				}
+
+				if(iconalign == 0 || iconalign == 3) { // up align
+					picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
+					numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
+				} else { // down align
+					picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x;
+					numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id));
+				drawpic_aspect_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos;
-				barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
-			} else {
-				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100);
-				barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
-			}
 			if(fuel)
+			{
+				if(baralign == 0 || baralign == 3) { // left align
+					barpos = pos;
+					barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
+				} else {
+					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100);
+					barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
+				}
 				HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+			}
 		}
 	}
 }
@@ -2227,7 +2353,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 {
 	float w;
 	float alsoprint;
-	alsoprint = (cvar("hud_notify_print") || !HUD_Panel_CheckActive(4)); // print message to console if: notify panel disabled, or cvar to do so enabled
+	alsoprint = (cvar("hud_notify_print") || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
 	
 	if(msg == MSG_SUICIDE) {
 		// TODO: cl_gentle
@@ -2638,17 +2764,17 @@ void HUD_Centerprint(string s1, string s2, float type, float msg)
 void HUD_Notify (void)
 {
 	float id = HUD_PANEL_NOTIFY;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	float entries, height;
@@ -2702,7 +2828,7 @@ void HUD_Notify (void)
 		// TODO: less copypaste code below
 		//
 		// Y [used by] X
-		if(killnotify_actiontype[j] == 0 && !hud_configure) 
+		if(killnotify_actiontype[j] == 0 && !autocvar__hud_configure) 
 		{
 			attacker = textShortenToWidth(killnotify_attackers[j], mySize_x - 2 * height, fontsize, stringwidth_colors);
 
@@ -2712,62 +2838,62 @@ void HUD_Notify (void)
 			weap_pos = pos + eX * 0.5 * (mySize_x - width_attacker) - eX * height + eY * i * height;
 			if(killnotify_deathtype[j] == DEATH_GENERIC)
 			{
-				drawpic_skin(weap_pos, "notify_death", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_death", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_NOAMMO)
 			{
-				drawpic_skin(weap_pos, "notify_outofammo", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_outofammo", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_KILL)
 			{
-				drawpic_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_selfkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_CAMP)
 			{
-				drawpic_skin(weap_pos, "notify_camping", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_camping", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == KILL_TEAM_RED)
 			{
-				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
 			{
-				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_DROWN)
 			{
-				drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_SLIME)
 			{
-				drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_LAVA)
 			{
-				drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_FALL)
 			{
-				drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR)
 			{
-				drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM)
 			{
-				drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == INFO_GOTFLAG)
@@ -2776,7 +2902,7 @@ void HUD_Notify (void)
 					s = "red";
 				else
 					s = "blue";
-				drawpic_skin(weap_pos, strcat("flag_", s, "_carrying"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, strcat("flag_", s, "_carrying"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == INFO_RETURNFLAG)
@@ -2785,7 +2911,7 @@ void HUD_Notify (void)
 					s = "red";
 				else
 					s = "blue";
-				drawpic_skin(weap_pos, strcat("flag_", s, "_taken"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, strcat("flag_", s, "_taken"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == INFO_LOSTFLAG)
@@ -2794,14 +2920,14 @@ void HUD_Notify (void)
 					s = "red";
 				else
 					s = "blue";
-				drawpic_skin(weap_pos, strcat("flag_", s, "_lost"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, strcat("flag_", s, "_lost"), '1 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 		}
 		// X [did action to] Y
 		else
 		{
-			if(hud_configure)
+			if(autocvar__hud_configure)
 			{
 				attacker = textShortenToWidth("Player1", 0.5 * mySize_x - height, fontsize, stringwidth_colors);
 				victim = textShortenToWidth("Player2", 0.5 * mySize_x - height, fontsize, stringwidth_colors);
@@ -2818,64 +2944,64 @@ void HUD_Notify (void)
 			pos_victim = pos + eX * 0.5 * ((0.5 * mySize_x - height) - width_victim) + eY * 0.5 * fontsize_y + eX * 0.5 * mySize_x + eX * height + eY * i * height;
 			weap_pos = pos + eX * 0.5 * mySize_x - eX * height + eY * i * height;
 
-			if(hud_configure) // example actions for config mode
+			if(autocvar__hud_configure) // example actions for config mode
 			{
-				drawpic_skin(weap_pos, strcat("weapon", "electro"), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, strcat("weapon", "electro"), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(WEP_VALID(killnotify_deathtype[j]))
 			{
 				self = get_weaponinfo(killnotify_deathtype[j]);
-				drawpic_skin(weap_pos, strcat("weapon", self.netname), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, strcat("weapon", self.netname), '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == KILL_TEAM_RED)
 			{
-				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
 			{
-				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_DROWN)
 			{
-				drawpic_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_water", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_SLIME)
 			{
-				drawpic_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_slime", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_LAVA)
 			{
-				drawpic_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_lava", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_FALL)
 			{
-				drawpic_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_fall", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_SHOOTING_STAR)
 			{
-				drawpic_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_shootingstar", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_HURTTRIGGER || killnotify_deathtype[j] == DEATH_CUSTOM) // DEATH_CUSTOM is also void, right?
 			{
-				drawpic_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_aspect_skin(weap_pos, "notify_void", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
@@ -2883,6 +3009,7 @@ void HUD_Notify (void)
 
 	}
 
+	// TODO: separate panel for these?
 	// Info messages
 	//
 	entity tm;
@@ -3020,7 +3147,7 @@ void HUD_Notify (void)
 			}
 		}
 	}
-	if(hud_configure)
+	if(autocvar__hud_configure)
 	{
 		s = "^7Press ^3ESC ^7to show HUD options.";
 		drawcolorcodedstring(o, s, fontsize, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
@@ -3049,17 +3176,17 @@ string seconds_tostring(float sec)
 void HUD_Timer(void)
 {
 	float id = HUD_PANEL_TIMER;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	string timer;
@@ -3092,7 +3219,9 @@ void HUD_Timer(void)
 		timer = seconds_tostring(timeleft);
 	}
 
+	drawfont = hud_bigfont;
 	drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, HUD_Panel_GetFgAlpha(HUD_PANEL_TIMER), DRAWFLAG_NORMAL);
+	drawfont = hud_font;
 }
 
 // Radar (#6)
@@ -3100,17 +3229,17 @@ void HUD_Timer(void)
 void HUD_Radar(void)
 {
 	float id = HUD_PANEL_RADAR;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	local float color1, color2; // color already declared as a global in hud.qc
@@ -3226,21 +3355,21 @@ void HUD_Radar(void)
 void HUD_Score(void)
 {
 	float id = HUD_PANEL_SCORE;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	float score, distribution, leader;
-	float score_len, distr_len;
+	float score_len;
 	vector distribution_color;
 	entity tm, pl, me;
 	me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
@@ -3284,20 +3413,20 @@ void HUD_Score(void)
 				distribution_color = eX;
 				minusplus = 2; // minusplus 1: always prefix with plus sign
 			}
-			HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
+			//HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			//HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
 		}
 		// race record display
 		if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
-			drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
-		HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-		HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-		drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
+		//HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		//HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
 
-		HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-		drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
+		//HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
 		*/
 	} else if (!teamplay) { // non-teamgames
 		// me vector := [team/connected frags id]
@@ -3305,7 +3434,7 @@ void HUD_Score(void)
 		if(pl == me)
 			pl = pl.sort_next;
 
-		if(hud_configure)
+		if(autocvar__hud_configure)
 			distribution = 42;
 		else if(pl)
 			distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
@@ -3313,7 +3442,7 @@ void HUD_Score(void)
 			distribution = 0;
 
 		score = me.(scores[ps_primary]);
-		if(hud_configure)
+		if(autocvar__hud_configure)
 			score = 123;
 
 		if(distribution >= 5) {
@@ -3328,22 +3457,23 @@ void HUD_Score(void)
 			distribution_color = eX;
 
 		score_len = strlen(ftos(score));
-		distr_len = strlen(ftos(distribution));
 
-		HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawstring_aspect(pos + eX * 0.75 * mySize_x, ftos(distribution), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		if (leader)
-			drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-		HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawfont = hud_bigfont;
+		drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawfont = hud_font;
 	} else { // teamgames
 		float max_fragcount;
 		max_fragcount = -99;
 
 		float teamnum;
 		for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-			if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !hud_configure)) // no players? don't display
+			if(tm.team == COLOR_SPECTATOR || (!tm.team_size && !autocvar__hud_configure)) // no players? don't display
 				continue;
 			score = tm.(teamscores[ts_primary]);
-			if(hud_configure)
+			if(autocvar__hud_configure)
 				score = 123;
 			leader = 0;
 			
@@ -3356,14 +3486,16 @@ void HUD_Score(void)
 				if (max_fragcount == score)
 					leader = 1;
 				if (leader)
-					drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+					drawpic_aspect_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawfont = hud_bigfont;
+				drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, GetTeamRGB(tm.team) * 0.8, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawfont = hud_font;
 			} else {
 				if (max_fragcount == score)
 					leader = 1;
 				if (leader)
-					drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("num_leading_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+					drawpic_aspect_skin(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, strcat("num_leading_", ftos(score_len)), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 				teamnum += 1;
 			}
 		}
@@ -3374,24 +3506,42 @@ void HUD_Score(void)
 //
 void HUD_RaceTimer (void) {
 	float id = HUD_PANEL_RACETIMER;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
+	{
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
+	}
+
+	// always force 2:1 aspect
+	vector newSize;
+	if(mySize_x/mySize_y > 2)
+	{
+		newSize_x = 2 * mySize_y;
+		newSize_y = mySize_y;
+
+		pos_x = pos_x + (mySize_x - newSize_x) / 2;
+	}
+	else
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		newSize_y = 1/2 * mySize_x;
+		newSize_x = mySize_x;
+
+		pos_y = pos_y + (mySize_y - newSize_y) / 2;
 	}
+	mySize = newSize;
 
 	drawfont = hud_bigfont;
 	float a, t;
 	string s, forcetime;
 
-	if(hud_configure)
+	if(autocvar__hud_configure)
 	{
 		s = "0:13:37";
 		drawstring(pos + eX * 0.5 * mySize_x - '0.5 0 0' * stringwidth(s, FALSE, '0.60 0.60 0' * mySize_y), s, '0.60 0.60 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
@@ -3518,9 +3668,10 @@ float vote_change; // "time" when vote_active changed
 void HUD_VoteWindow(void) 
 {
 	float id = HUD_PANEL_VOTE;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	string s;
 	float a;
@@ -3529,12 +3680,12 @@ void HUD_VoteWindow(void)
 		vote_prev = vote_active;
 	}
 
-	if(vote_active || hud_configure)
+	if(vote_active || autocvar__hud_configure)
 		vote_alpha = bound(0, (time - vote_change) * 2, 1);
 	else
 		vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
 
-	if(hud_configure)
+	if(autocvar__hud_configure)
 	{
 		vote_yescount = 3;
 		vote_nocount = 2;
@@ -3547,22 +3698,39 @@ void HUD_VoteWindow(void)
 	a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
 
 	HUD_Panel_DrawBg(id, pos, mySize, a);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
+	{
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
+	}
+
+	// always force 2:1 aspect
+	vector newSize;
+	if(mySize_x/mySize_y > 2)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		newSize_x = 2 * mySize_y;
+		newSize_y = mySize_y;
+
+		pos_x = pos_x + (mySize_x - newSize_x) / 2;
 	}
+	else
+	{
+		newSize_y = 1/2 * mySize_x;
+		newSize_x = mySize_x;
 
-	drawpic_skin(pos, "voteprogress_back", mySize, '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		pos_y = pos_y + (mySize_y - newSize_y) / 2;
+	}
+	mySize = newSize;
+
+	drawpic_aspect_skin(pos, "voteprogress_back", mySize, '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
 	s = "A vote has been called for: ";
-	drawstring(pos + '0.5 0 0' * mySize_x + '0 0.1 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/5)), s, '1 1 0' * mySize_y*(1/5), '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	s = textShortenToWidth(vote_called_vote, mySize_x * 0.96, '1 1 0' * mySize_y*(1/5), stringwidth_colors); // TODO: broken?
-	if(hud_configure)
+	drawstring_aspect(pos + eY * (1/12) * mySize_y, s, eX * mySize_x + eY * (3/12) * mySize_y, mySize_y*(3/12), '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	s = textShortenToWidth(vote_called_vote, mySize_x, '1 1 0' * mySize_y * (3/12), stringwidth_colors); // TODO: broken?
+	if(autocvar__hud_configure)
 		s = "Configure the HUD";
-	drawcolorcodedstring(pos + '0.52 0 0' * mySize_x + '0 0.3 0' * mySize_y - eX * stringwidth(s, FALSE, '1 1 0' * 0.5 * mySize_y*(1/6)), s, '1 1 0' * mySize_y*(1/6), a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawstring_aspect(pos + eY * (4/12) * mySize_y, s, eX * mySize_x + eY * (2/12) * mySize_y, mySize_y*(2/12), '1 1 1', a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
 	// print the yes/no counts
 	s = strcat("Yes: ", ftos(vote_yescount));
@@ -3572,19 +3740,19 @@ void HUD_VoteWindow(void)
 
 	// draw the progress bars
 	drawsetcliparea(pos_x, pos_y, mySize_x * 0.5 * (vote_yescount/vote_needed), mySize_y);
-	drawpic_skin(pos, "voteprogress_prog", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos, "voteprogress_prog", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
 	drawsetcliparea(pos_x + mySize_x - mySize_x * 0.5 * (vote_nocount/vote_needed), pos_y, mySize_x * 0.5, mySize_y);
-	drawpic_skin(pos, "voteprogress_prog", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos, "voteprogress_prog", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
 	// draw the highlights
 	if(vote_highlighted == 1) {
 		drawsetcliparea(pos_x, pos_y, mySize_x * 0.5, mySize_y);
-		drawpic_skin(pos, "voteprogress_voted", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(pos, "voteprogress_voted", mySize, eY, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 	}
 	else if(vote_highlighted == 2) {
 		drawsetcliparea(pos_x + 0.5 * mySize_x, pos_y, mySize_x * 0.5, mySize_y);
-		drawpic_skin(pos, "voteprogress_voted", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(pos, "voteprogress_voted", mySize, eX, a * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 	}
 
 	drawresetcliparea();
@@ -3628,7 +3796,7 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 	else
 		mod_active = 0;
 
-	if(hud_configure)
+	if(autocvar__hud_configure)
 	{
 		redflag = 1;
 		blueflag = 2;
@@ -3739,15 +3907,15 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 
 	f = bound(0, redflag_statuschange_elapsedtime*2, 1);
 	if(red_icon_prevstatus && f < 1)
-		drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+		drawpic_aspect_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
 	if(red_icon)
-		drawpic_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL);
 
 	f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
 	if(blue_icon_prevstatus && f < 1)
-		drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+		drawpic_aspect_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
 	if(blue_icon)
-		drawpic_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL);
 }
 
 // Keyhunt HUD modicon section
@@ -3842,16 +4010,16 @@ void HUD_Mod_KH(vector pos, vector mySize)
 			switch(keyteam)
 			{
 				case COLOR_TEAM1:
-					drawpic_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(pa, "kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 				case COLOR_TEAM2:
-					drawpic_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(pa, "kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 				case COLOR_TEAM3:
-					drawpic_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(pa, "kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 				case COLOR_TEAM4:
-					drawpic_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(pa, "kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 				default:
 					break;
@@ -3859,16 +4027,16 @@ void HUD_Mod_KH(vector pos, vector mySize)
 			switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
 			{
 				case 0:
-					drawpic_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(p, "kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 				case 1:
-					drawpic_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(p, "kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 				case 2:
-					drawpic_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(p, "kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 				case 3:
-					drawpic_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+					drawpic_aspect_skin(p, "kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
 					break;
 			}
 		}
@@ -3934,7 +4102,7 @@ void HUD_Mod_NexBall(vector pos, vector mySize)
 	}
 
 	if (stat_items & IT_KEY1)
-		drawpic_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
 }
 
 // Race/CTS HUD mod icons
@@ -4040,20 +4208,20 @@ void HUD_Mod_Race(vector pos, vector mySize)
 	rankpos = pos + '0.5 0.25 0' * mySize_y - eX * stringwidth(rankname, TRUE, '1 1 0' * 0.15 * mySize_y);
 
 	if(race_status == 0)
-		drawpic_skin(pos, "race_newfail", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(pos, "race_newfail", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 	else if(race_status == 1) {
-		drawpic_skin(pos, "race_newtime", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(pos, "race_newtime", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 		drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 		drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 	} else if(race_status == 2) {
 		if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank)
-			drawpic_skin(pos, "race_newrankgreen", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(pos, "race_newrankgreen", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 		else
-			drawpic_skin(pos, "race_newrankyellow", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+			drawpic_aspect_skin(pos, "race_newrankyellow", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 		drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 		drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 	} else if(race_status == 3) {
-		drawpic_skin(pos, "race_newrecordserver", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(pos, "race_newrecordserver", '1 1 0' * 0.9 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 		drawcolorcodedstring(namepos, s, '1 1 0' * 0.1 * mySize_y, HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 		drawstring(rankpos, rankname, '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * a, DRAWFLAG_NORMAL);
 	}
@@ -4077,20 +4245,21 @@ float mod_change; // "time" when mod_active changed
 
 void HUD_ModIcons(void)
 {
-	if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !hud_configure)
+	if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && !autocvar__hud_configure)
 		return;
 
 	float id = HUD_PANEL_MODICONS;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	if(mod_active != mod_prev) {
 		mod_change = time;
 		mod_prev = mod_active;
 	}
 
-	if(mod_active || hud_configure)
+	if(mod_active || autocvar__hud_configure)
 		mod_alpha = bound(0, (time - mod_change) * 2, 1);
 	else
 		mod_alpha = bound(0, 1 - (time - mod_change) * 2, 1);
@@ -4098,18 +4267,17 @@ void HUD_ModIcons(void)
 	if(mod_alpha)
 		HUD_Panel_DrawBg(id, pos, mySize, mod_alpha);
 
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	// these MUST be ran in order to update mod_active
 	if(gametype == GAME_KEYHUNT)
 		HUD_Mod_KH(pos, mySize);
-	else if(gametype == GAME_CTF || hud_configure)
+	else if(gametype == GAME_CTF || autocvar__hud_configure)
 		HUD_Mod_CTF(pos, mySize); // forcealpha only needed for ctf icons, as only they are shown in config mode
 	else if(gametype == GAME_NEXBALL)
 		HUD_Mod_NexBall(pos, mySize);
@@ -4122,17 +4290,17 @@ void HUD_ModIcons(void)
 void HUD_DrawPressedKeys(void)
 {
 	float id = HUD_PANEL_PRESSEDKEYS;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	vector keysize;
@@ -4140,12 +4308,12 @@ void HUD_DrawPressedKeys(void)
 	float pressedkeys;
 
 	pressedkeys = getstatf(STAT_PRESSED_KEYS);
-	drawpic_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (1/3), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (2/3), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (1/3), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_aspect_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (2/3), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 }
 
 // Handle chat as a panel (#12)
@@ -4153,17 +4321,17 @@ void HUD_DrawPressedKeys(void)
 void HUD_Chat(void)
 {
 	float id = HUD_PANEL_CHAT;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	cvar_set("con_chatrect", "1");
@@ -4174,7 +4342,7 @@ void HUD_Chat(void)
 	cvar_set("con_chatwidth", ftos(mySize_x/vid_conwidth));
 	cvar_set("con_chat", ftos(floor(mySize_y/cvar("con_chatsize") - 0.5)));
 
-	if(hud_configure)
+	if(autocvar__hud_configure)
 	{
 		float chatsize;
 		chatsize = cvar("con_chatsize");
@@ -4203,17 +4371,17 @@ float frametimeavg2; // 2 frames ago
 void HUD_EngineInfo(void)
 {
 	float id = HUD_PANEL_ENGINEINFO;
+	HUD_Panel_UpdateCvarsForId(id);
 	vector pos, mySize;
-	pos = HUD_Panel_GetPos(id);
-	mySize = HUD_Panel_GetSize(id);
+	pos = panel_pos;
+	mySize = panel_size;
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
-	float padding;
-	padding = HUD_Panel_GetPadding(id);
-	if(padding)
+	padding = panel_bg_padding;
+	if(panel_bg_padding)
 	{
-		pos += '1 1 0' * padding;
-		mySize -= '2 2 0' * padding;
+		pos += '1 1 0' * panel_bg_padding;
+		mySize -= '2 2 0' * panel_bg_padding;
 	}
 
 	if(cvar("hud_engineinfo_framecounter_exponentialmovingaverage"))
@@ -4244,7 +4412,9 @@ void HUD_EngineInfo(void)
 
 	vector color;
 	color = HUD_Get_Num_Color (prevfps, 100);
+	drawfont = hud_bigfont;
 	drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), mySize, mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawfont = hud_font;
 }
 /*
 ==================
@@ -4359,6 +4529,8 @@ void HUD_Reset (void)
 
 void HUD_Main (void)
 {
+	hud_skin_path = strcat("gfx/hud/", cvar_string("hud_skin"));
+
 	if(disable_menu_alphacheck == 1)
 		menu_fade_alpha = 1;
 	else
@@ -4372,62 +4544,77 @@ void HUD_Main (void)
 	hud_fontsize = HUD_GetFontsize("hud_fontsize");
 	hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec");
 
-	hud_configure = cvar("_hud_configure");
-
 	// Drawing stuff
 
 	// HUD configure visible grid
-	if(hud_configure && cvar("hud_configure_grid") && cvar("hud_configure_grid_alpha"))
+	if(autocvar__hud_configure && autocvar_hud_configure_grid && autocvar_hud_configure_grid_alpha)
 	{
 		float i;
 		// x-axis
-		for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_x"), 0.2); ++i)
+		for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_x, 0.2); ++i)
 		{
-			drawfill(eX * i * vid_conwidth * bound(0.005, cvar("hud_configure_grid_x"), 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+			drawfill(eX * i * vid_conwidth * bound(0.005, autocvar_hud_configure_grid_x, 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
 		}
 		// y-axis
-		for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_y"), 0.2); ++i)
+		for(i = 0; i < 1/bound(0.005, autocvar_hud_configure_grid_y, 0.2); ++i)
 		{
-			drawfill(eY * i * vid_conheight * bound(0.005, cvar("hud_configure_grid_y"), 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+			drawfill(eY * i * vid_conheight * bound(0.005, autocvar_hud_configure_grid_y, 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', autocvar_hud_configure_grid_alpha, DRAWFLAG_NORMAL);
 		}
 	}
 
-	if(cvar_string("hud_dock") != "")
-		drawpic('0 0 0', strcat("gfx/hud/", cvar_string("hud_skin"), "/", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
+	float f;
+	vector color_vec;
+	string color;
+	color = cvar_string("hud_dock_color");
+	color_vec = stov(color);
+	if(teamplay && cvar(strcat("hud_dock_color_team"))) {
+		f = stof(getplayerkey(player_localentnum - 1, "colors"));
+		color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team");
+	}
+	else if(color == "shirt") {
+		f = stof(getplayerkey(player_localentnum - 1, "colors"));
+		color_vec = colormapPaletteColor(floor(f / 16), 0);
+	}
+	else if(color == "pants") {
+		f = stof(getplayerkey(player_localentnum - 1, "colors"));
+		color_vec = colormapPaletteColor(mod(f, 16), 1);
+	}
+
+	if(cvar_string("hud_dock") != "" && cvar_string("hud_dock") != "0")
+		drawpic('0 0 0', strcat("gfx/hud/", cvar_string("hud_skin"), "/", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, color_vec, cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
 
-	if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure)
+	if(autocvar_hud_radar || autocvar__hud_configure)
 		if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay))
 			HUD_Radar();
-	if(HUD_Panel_CheckActive(HUD_PANEL_WEAPONICONS) || hud_configure)
+	if(autocvar_hud_weaponicons || autocvar__hud_configure)
 		HUD_WeaponIcons();
-	if(HUD_Panel_CheckActive(HUD_PANEL_INVENTORY) || hud_configure)
+	if(autocvar_hud_inventory || autocvar__hud_configure)
 		HUD_Inventory();
-	if(HUD_Panel_CheckActive(HUD_PANEL_POWERUPS) || hud_configure)
+	if(autocvar_hud_powerups || autocvar__hud_configure)
 		HUD_Powerups();
-	if(HUD_Panel_CheckActive(HUD_PANEL_HEALTHARMOR) || hud_configure)
+	if(autocvar_hud_healtharmor || autocvar__hud_configure)
 		HUD_HealthArmor();
-	if(HUD_Panel_CheckActive(HUD_PANEL_NOTIFY) || hud_configure)
+	if(autocvar_hud_notify || autocvar__hud_configure)
 		HUD_Notify();
-	if(HUD_Panel_CheckActive(HUD_PANEL_TIMER) || hud_configure)
+	if(autocvar_hud_timer || autocvar__hud_configure)
 		HUD_Timer();
-	if(HUD_Panel_CheckActive(HUD_PANEL_SCORE) || hud_configure)
+	if(autocvar_hud_score || autocvar__hud_configure)
 		HUD_Score();
-	if(HUD_Panel_CheckActive(HUD_PANEL_RACETIMER) || hud_configure)
-		if(gametype == GAME_RACE || gametype == GAME_CTS || hud_configure)
+	if(autocvar_hud_racetimer || autocvar__hud_configure)
+		if(gametype == GAME_RACE || gametype == GAME_CTS || autocvar__hud_configure)
 			HUD_RaceTimer();
-	if(HUD_Panel_CheckActive(HUD_PANEL_VOTE) || hud_configure)
+	if(autocvar_hud_vote || autocvar__hud_configure)
 		HUD_VoteWindow();
-	if(HUD_Panel_CheckActive(HUD_PANEL_MODICONS) || hud_configure)
+	if(autocvar_hud_modicons || autocvar__hud_configure)
 		HUD_ModIcons();
-	// TODO hud'ify
-	if(HUD_Panel_CheckActive(HUD_PANEL_PRESSEDKEYS) || hud_configure)
-		if(spectatee_status > 0 || cvar("hud_pressedkeys") >= 2 || hud_configure)
+	if(autocvar_hud_pressedkeys || autocvar__hud_configure)
+		if(spectatee_status > 0 || cvar("hud_pressedkeys") >= 2 || autocvar__hud_configure)
 			HUD_DrawPressedKeys();
-	if(HUD_Panel_CheckActive(HUD_PANEL_CHAT) || hud_configure)
+	if(autocvar_hud_chat || autocvar__hud_configure)
 		HUD_Chat();
 	else
 		cvar_set("con_chatrect", "0");
-	if(HUD_Panel_CheckActive(HUD_PANEL_ENGINEINFO) || hud_configure)
+	if(autocvar_hud_engineinfo || autocvar__hud_configure)
 		HUD_EngineInfo();
 
 	// TODO hud_'ify these
@@ -4436,9 +4623,11 @@ void HUD_Main (void)
 	if (cvar("cl_showacceleration"))
 		HUD_ShowAcceleration();
 
-	if (hud_configure && spectatee_status) // try to join if we are in hud_configure mode, but still spectating (in order to get rid of motd and such)
+	if (autocvar__hud_configure && spectatee_status && hud_configure_prev == -1) // try to join if we are in hud_configure mode, but still spectating, and in the first frame (in order to get rid of motd when launching a server via the menu "HUD Setup" button)
 		localcmd("cmd selectteam auto; cmd join\n");
 
-	if (!hud_configure) // hud config mode disabled, enable normal alpha stuff again
+	hud_configure_prev = autocvar__hud_configure;
+
+	if (!autocvar__hud_configure) // hud config mode disabled, enable normal alpha stuff again
 		disable_menu_alphacheck = 0;
 }