From d971eb56497f81534a42ccef461c22526c33ed4d Mon Sep 17 00:00:00 2001
From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 17 Jul 2010 02:28:43 +0300
Subject: [PATCH] several fixes. Good thing this wasn't merged to _stable yet,
 lol

---
 _hud_descriptions.cfg      | 356 ++++++++++++++++++-------------------
 defaultXonotic.cfg         |   4 +-
 hud_default.cfg            | 198 +++++++++++++++++++++
 hud_luminos_default.cfg    |  14 +-
 hud_old_nexuiz.cfg         |  10 +-
 qcsrc/client/autocvars.qh  |  16 +-
 qcsrc/client/hud.qc        |   1 -
 qcsrc/client/hud.qh        |  15 +-
 qcsrc/client/scoreboard.qc |   8 +-
 9 files changed, 410 insertions(+), 212 deletions(-)
 create mode 100644 hud_default.cfg

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 488cfeb7b..7f15b0140 100644
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -1,13 +1,13 @@
 // this is a dummy skin that contains only the cvar descriptions, so that we can leave them out from the real skin files themselves.
 // please add any new cvars into this file, with null string values
 seta hud_skin "" "skin folder where to look for images"
-seta hud_bg "" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
-seta hud_bg_color "" "default background color for the panels, accepts \"shirt\" and \"pants\""
-seta hud_bg_color_team "" "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
-seta hud_bg_alpha "" "default alpha of the background"
-seta hud_bg_border "" "default border size for the panels"
-seta hud_bg_padding "" "default padding of contents from the border"
-seta hud_fg_alpha "" "alpha of the foreground"
+seta hud_panel_bg "" "default background for the panels, file must exist in gfx/hud/[skin name]/, 0 = disable background by default"
+seta hud_panel_bg_color "" "default background color for the panels, accepts \"shirt\" and \"pants\""
+seta hud_panel_bg_color_team "" "default setting for overriding panel color with team color in team games, 0.5 = less saturated"
+seta hud_panel_bg_alpha "" "default alpha of the background"
+seta hud_panel_bg_border "" "default border size for the panels"
+seta hud_panel_bg_padding "" "default padding of contents from the border"
+seta hud_panel_fg_alpha "" "alpha of the foreground"
 
 seta hud_dock "" "enable a fullscreen background for the hud, useful for creating artificial docks, \"\" = disable"
 seta hud_dock_color "" "dock color, accepts \"shirt\" and \"pants\""
@@ -28,174 +28,174 @@ seta hud_configure_grid "" "snap to grid when moving/resizing panels"
 seta hud_configure_grid_xsize "" "snap to X * vid_conwidth"
 seta hud_configure_grid_ysize "" "snap to Y * vid_conheight"
 
-seta hud_weaponicons "" "enable/disable this panel"
-seta hud_weaponicons_pos "" "position of this panel"
-seta hud_weaponicons_size "" "size of this panel"
-seta hud_weaponicons_bg "" "if set to something else than \"\" = override default background"
-seta hud_weaponicons_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_weaponicons_bg_color_team "" "override panel color with team color in team based games"
-seta hud_weaponicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_weaponicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_weaponicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_weaponicons_aspect "" "use this aspect on the items"
-seta hud_weaponicons_complainbubble "" "complain bubble (out of ammo, weapon not available etc)"
-seta hud_weaponicons_complainbubble_padding "" "padding for the complainbubble"
-seta hud_weaponicons_complainbubble_color_outofammo "" "color of the complainbubble when showing out of ammo message"
-seta hud_weaponicons_complainbubble_color_donthave "" "color of the complainbubble when showing don't have weapon message"
-seta hud_weaponicons_complainbubble_color_unavailable "" "color of the complainbubble when showing weapon unavailable message"
-seta hud_weaponicons_ammo_color "" "color of status bar"
-seta hud_weaponicons_ammo_alpha "" "alpha of status bar"
-
-seta hud_inventory "" "enable/disable this panel"
-seta hud_inventory_pos "" "position of this panel"
-seta hud_inventory_size "" "size of this panel"
-seta hud_inventory_onlycurrent "" "1 = show only current ammo type"
-seta hud_inventory_iconalign "" "0 = align icons to the left, 1 = align icons to the right"
-seta hud_inventory_bg "" "if set to something else than \"\" = override default background"
-seta hud_inventory_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_inventory_bg_color_team "" "override panel color with team color in team based games"
-seta hud_inventory_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_inventory_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_inventory_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_powerups "" "enable/disable this panel"
-seta hud_powerups_pos "" "position of this panel"
-seta hud_powerups_size "" "size of this panel"
-seta hud_powerups_flip "" "flip strength/shield positions"
-seta hud_powerups_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
-seta hud_powerups_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
-seta hud_powerups_bg "" "if set to something else than \"\" = override default background"
-seta hud_powerups_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_powerups_bg_color_team "" "override panel color with team color in team based games"
-seta hud_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
-seta hud_healtharmor_pos "" "position of this panel"
-seta hud_healtharmor_size "" "size of this panel"
-seta hud_healtharmor_flip "" "flip health/armor positions"
-seta hud_healtharmor_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
-seta hud_healtharmor_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
-seta hud_healtharmor_bg "" "if set to something else than \"\" = override default background"
-seta hud_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_healtharmor_bg_color_team "" "override panel color with team color in team based games"
-seta hud_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_notify "" "enable/disable this panel"
-seta hud_notify_pos "" "position of this base of the panel"
-seta hud_notify_size "" "size of this panel with all notifications on"
-seta hud_notify_bg "" "if set to something else than \"\" = override default background"
-seta hud_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_notify_bg_color_team "" "override panel color with team color in team based games"
-seta hud_notify_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_notify_flip "" "order the list top to bottom instead of bottom to top"
-seta hud_notify_print "" "also con_notify print the messages that are shown on the notify panel"
-
-seta hud_timer "" "enable/disable this panel"
-seta hud_timer_pos "" "position of this base of the panel"
-seta hud_timer_size "" "size of this panel"
-seta hud_timer_bg "" "if set to something else than \"\" = override default background"
-seta hud_timer_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_timer_bg_color_team "" "override panel color with team color in team based games"
-seta hud_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_radar "" "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
-seta hud_radar_pos "" "position of this base of the panel"
-seta hud_radar_size "" "size of this panel"
-seta hud_radar_bg "" "if set to something else than \"\" = override default background"
-seta hud_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_radar_bg_color_team "" "override panel color with team color in team based games"
-seta hud_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_radar_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_radar_foreground_alpha "" "alpha of the map"
-
-seta hud_score "" "enable/disable this panel"
-seta hud_score_pos "" "position of this base of the panel"
-seta hud_score_size "" "size of this panel"
-seta hud_score_bg "" "if set to something else than \"\" = override default background"
-seta hud_score_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_score_bg_color_team "" "override panel color with team color in team based games"
-seta hud_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_racetimer "" "enable/disable this panel"
-seta hud_racetimer_pos "" "position of this base of the panel"
-seta hud_racetimer_size "" "size of this panel"
-seta hud_racetimer_bg "" "if set to something else than \"\" = override default background"
-seta hud_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_racetimer_bg_color_team "" "override panel color with team color in team based games"
-seta hud_racetimer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_vote "" "enable/disable this panel"
-seta hud_vote_pos "" "position of this base of the panel"
-seta hud_vote_size "" "size of this panel"
-seta hud_vote_alreadyvoted_alpha "" "alpha of the vote dialog after you have voted"
-seta hud_vote_bg "" "if set to something else than \"\" = override default background"
-seta hud_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_vote_bg_color_team "" "override panel color with team color in team based games"
-seta hud_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_modicons "" "enable/disable this panel"
-seta hud_modicons_pos "" "position of this base of the panel"
-seta hud_modicons_size "" "size of this panel"
-seta hud_modicons_bg "" "if set to something else than \"\" = override default background"
-seta hud_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_modicons_bg_color_team "" "override panel color with team color in team based games"
-seta hud_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_pressedkeys "" "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
-seta hud_pressedkeys_pos "" "position of this base of the panel"
-seta hud_pressedkeys_size "" "size of this panel"
-seta hud_pressedkeys_bg "" "if set to something else than \"\" = override default background"
-seta hud_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
-seta hud_pressedkeys_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_pressedkeys_aspect "" "forced aspect on panel"
-
-seta hud_chat "" "enable/disable this panel"
-seta hud_chat_pos "" "position of this base of the panel"
-seta hud_chat_size "" "size of this panel"
-seta hud_chat_bg "" "if set to something else than \"\" = override default background"
-seta hud_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_chat_bg_color_team "" "override panel color with team color in team based games"
-seta hud_chat_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_engineinfo "" "enable/disable this panel
-seta hud_engineinfo_pos "" "position of this base of the panel"
-seta hud_engineinfo_size "" "size of this panel"
-seta hud_engineinfo_bg "" "if set to something else than \"\" = override default background"
-seta hud_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_engineinfo_bg_color_team "" "override panel color with team color in team based games"
-seta hud_engineinfo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-
-seta hud_infomessages "" "enable/disable this panel
-seta hud_infomessages_pos "" "position of this base of the panel"
-seta hud_infomessages_size "" "size of this panel"
-seta hud_infomessages_bg "" "if set to something else than \"\" = override default background"
-seta hud_infomessages_bg_color "" "if set to something else than \"\" = override default panel background color"
-seta hud_infomessages_bg_color_team "" "override panel color with team color in team based games"
-seta hud_infomessages_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
-seta hud_infomessages_bg_border "" "if set to something else than \"\" = override default size of border around the background"
-seta hud_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
-seta hud_infomessages_flip "" "1 = align the items to the right"
+seta hud_panel_weapons "" "enable/disable this panel"
+seta hud_panel_weapons_pos "" "position of this panel"
+seta hud_panel_weapons_size "" "size of this panel"
+seta hud_panel_weapons_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_weapons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_weapons_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_weapons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_weapons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_weapons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_weapons_aspect "" "use this aspect on the items"
+seta hud_panel_weapons_complainbubble "" "complain bubble (out of ammo, weapon not available etc)"
+seta hud_panel_weapons_complainbubble_padding "" "padding for the complainbubble"
+seta hud_panel_weapons_complainbubble_color_outofammo "" "color of the complainbubble when showing out of ammo message"
+seta hud_panel_weapons_complainbubble_color_donthave "" "color of the complainbubble when showing don't have weapon message"
+seta hud_panel_weapons_complainbubble_color_unavailable "" "color of the complainbubble when showing weapon unavailable message"
+seta hud_panel_weapons_ammo_color "" "color of status bar"
+seta hud_panel_weapons_ammo_alpha "" "alpha of status bar"
+
+seta hud_panel_ammo "" "enable/disable this panel"
+seta hud_panel_ammo_pos "" "position of this panel"
+seta hud_panel_ammo_size "" "size of this panel"
+seta hud_panel_ammo_onlycurrent "" "1 = show only current ammo type"
+seta hud_panel_ammo_iconalign "" "0 = align icons to the left, 1 = align icons to the right"
+seta hud_panel_ammo_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_ammo_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_ammo_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_ammo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_ammo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_ammo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_powerups "" "enable/disable this panel"
+seta hud_panel_powerups_pos "" "position of this panel"
+seta hud_panel_powerups_size "" "size of this panel"
+seta hud_panel_powerups_flip "" "flip strength/shield positions"
+seta hud_panel_powerups_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
+seta hud_panel_powerups_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
+seta hud_panel_powerups_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_powerups_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_powerups_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_powerups_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_powerups_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_powerups_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_healtharmor "" "enable/disable this panel, 2 = combined health/armor display"
+seta hud_panel_healtharmor_pos "" "position of this panel"
+seta hud_panel_healtharmor_size "" "size of this panel"
+seta hud_panel_healtharmor_flip "" "flip health/armor positions"
+seta hud_panel_healtharmor_baralign "" "0 = align bars to the left, 1 = align bars to the right, 2 = align right bar to the right, 3 = align left bar to the right"
+seta hud_panel_healtharmor_iconalign "" "0 = align icons to the left, 1 = align icons to the right, 2 = align right icon to the right, 3 = align left icon to the right"
+seta hud_panel_healtharmor_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_healtharmor_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_healtharmor_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_healtharmor_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_healtharmor_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_healtharmor_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_notify "" "enable/disable this panel"
+seta hud_panel_notify_pos "" "position of this base of the panel"
+seta hud_panel_notify_size "" "size of this panel with all notifications on"
+seta hud_panel_notify_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_notify_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_notify_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_notify_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_notify_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_notify_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_notify_flip "" "order the list top to bottom instead of bottom to top"
+seta hud_panel_notify_print "" "also con_notify print the messages that are shown on the notify panel"
+
+seta hud_panel_timer "" "enable/disable this panel"
+seta hud_panel_timer_pos "" "position of this base of the panel"
+seta hud_panel_timer_size "" "size of this panel"
+seta hud_panel_timer_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_timer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_timer_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_timer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_timer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_timer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_radar "" "enable/disable this panel, 2 = also enable in non-teambased gamemodes"
+seta hud_panel_radar_pos "" "position of this base of the panel"
+seta hud_panel_radar_size "" "size of this panel"
+seta hud_panel_radar_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_radar_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_radar_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_radar_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_radar_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_radar_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_radar_foreground_alpha "" "alpha of the map"
+
+seta hud_panel_score "" "enable/disable this panel"
+seta hud_panel_score_pos "" "position of this base of the panel"
+seta hud_panel_score_size "" "size of this panel"
+seta hud_panel_score_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_score_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_score_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_score_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_score_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_score_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_racetimer "" "enable/disable this panel"
+seta hud_panel_racetimer_pos "" "position of this base of the panel"
+seta hud_panel_racetimer_size "" "size of this panel"
+seta hud_panel_racetimer_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_racetimer_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_racetimer_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_racetimer_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_racetimer_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_racetimer_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_vote "" "enable/disable this panel"
+seta hud_panel_vote_pos "" "position of this base of the panel"
+seta hud_panel_vote_size "" "size of this panel"
+seta hud_panel_vote_alreadyvoted_alpha "" "alpha of the vote dialog after you have voted"
+seta hud_panel_vote_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_vote_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_vote_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_vote_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_vote_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_vote_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_modicons "" "enable/disable this panel"
+seta hud_panel_modicons_pos "" "position of this base of the panel"
+seta hud_panel_modicons_size "" "size of this panel"
+seta hud_panel_modicons_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_modicons_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_modicons_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_modicons_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_modicons_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_modicons_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_pressedkeys "" "enable/disable this panel, 1 = show only when spectating other players, 2 = show always"
+seta hud_panel_pressedkeys_pos "" "position of this base of the panel"
+seta hud_panel_pressedkeys_size "" "size of this panel"
+seta hud_panel_pressedkeys_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_pressedkeys_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_pressedkeys_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_pressedkeys_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_pressedkeys_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_pressedkeys_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_pressedkeys_aspect "" "forced aspect on panel"
+
+seta hud_panel_chat "" "enable/disable this panel"
+seta hud_panel_chat_pos "" "position of this base of the panel"
+seta hud_panel_chat_size "" "size of this panel"
+seta hud_panel_chat_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_chat_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_chat_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_chat_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_chat_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_chat_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_engineinfo "" "enable/disable this panel
+seta hud_panel_engineinfo_pos "" "position of this base of the panel"
+seta hud_panel_engineinfo_size "" "size of this panel"
+seta hud_panel_engineinfo_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_engineinfo_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_engineinfo_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_engineinfo_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_engineinfo_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_engineinfo_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+
+seta hud_panel_infomessages "" "enable/disable this panel
+seta hud_panel_infomessages_pos "" "position of this base of the panel"
+seta hud_panel_infomessages_size "" "size of this panel"
+seta hud_panel_infomessages_bg "" "if set to something else than \"\" = override default background"
+seta hud_panel_infomessages_bg_color "" "if set to something else than \"\" = override default panel background color"
+seta hud_panel_infomessages_bg_color_team "" "override panel color with team color in team based games"
+seta hud_panel_infomessages_bg_alpha "" "if set to something else than \"\" = override default panel background alpha"
+seta hud_panel_infomessages_bg_border "" "if set to something else than \"\" = override default size of border around the background"
+seta hud_panel_infomessages_bg_padding "" "if set to something else than \"\" = override default padding of contents from border"
+seta hud_panel_infomessages_flip "" "1 = align the items to the right"
diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 9947e97b4..68c356b2b 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1333,8 +1333,8 @@ seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info pr
 
 // hud cvar descriptions
 exec _hud_descriptions.cfg
-// exec the default skin config
-exec hud_luminos_default.cfg
+// exec the default skin config. remember, NO menu_restart in the deafault cfg (dp segfaults at startup otherwise)
+exec hud_default.cfg
 
 // user preference cvars (i.e. shouldn't be adjusted by a skin config) 
 seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon"
diff --git a/hud_default.cfg b/hud_default.cfg
new file mode 100644
index 000000000..6d992d8bf
--- /dev/null
+++ b/hud_default.cfg
@@ -0,0 +1,198 @@
+seta hud_skin "luminos"
+seta hud_panel_bg "border_horizontal"
+seta hud_panel_bg_color "0.875 0.375 0"
+seta hud_panel_bg_color_team "0"
+seta hud_panel_bg_alpha "1"
+seta hud_panel_bg_border "6"
+seta hud_panel_bg_padding "2"
+seta hud_panel_fg_alpha "1"
+
+seta hud_dock "dock"
+seta hud_dock_color "0 0.1875 0.4375"
+seta hud_dock_color_team "0.700000"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha "0.500000"
+seta hud_progressbar_strength_color "0 0 0.6"
+seta hud_progressbar_shield_color "0.6 0 0.6"
+seta hud_progressbar_health_color "0.6 0 0"
+seta hud_progressbar_armor_color "0 0.6 0"
+seta hud_progressbar_fuel_color "0.6 0.6 0"
+seta hud_progressbar_nexball_color "0.7 0.1 0"
+
+seta _hud_panelorder "4 6 5 9 3 1 7 12 0 10 2 11 14 8 13 "
+
+seta hud_configure_grid "1"
+seta hud_configure_grid_xsize "0.01"
+seta hud_configure_grid_ysize "0.01"
+
+seta hud_panel_weapons 1
+seta hud_panel_weapons_pos "0.908906 0.088047"
+seta hud_panel_weapons_size "0.066564 0.641367"
+seta hud_panel_weapons_bg "border_vertical"
+seta hud_panel_weapons_bg_color ""
+seta hud_panel_weapons_bg_color_team ""
+seta hud_panel_weapons_bg_alpha ""
+seta hud_panel_weapons_bg_border ""
+seta hud_panel_weapons_bg_padding ""
+seta hud_panel_weapons_complainbubble "1"
+seta hud_panel_weapons_complainbubble_padding "-10"
+seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0"
+seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
+seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
+seta hud_panel_weapons_ammo_color "0 1 0"
+seta hud_panel_weapons_ammo_alpha "1"
+seta hud_panel_weapons_aspect "1"
+
+seta hud_panel_ammo 1
+seta hud_panel_ammo_pos "0.193516 0.925605"
+seta hud_panel_ammo_size "0.093750 0.061719"
+seta hud_panel_ammo_bg ""
+seta hud_panel_ammo_bg_color ""
+seta hud_panel_ammo_bg_color_team ""
+seta hud_panel_ammo_bg_alpha ""
+seta hud_panel_ammo_bg_border ""
+seta hud_panel_ammo_bg_padding ""
+seta hud_panel_ammo_onlycurrent "1"
+seta hud_panel_ammo_iconalign "0"
+
+seta hud_panel_powerups 1
+seta hud_panel_powerups_pos "0.363282 0.015742"
+seta hud_panel_powerups_size "0.262500 0.048047"
+seta hud_panel_powerups_bg ""
+seta hud_panel_powerups_bg_color ""
+seta hud_panel_powerups_bg_color_team ""
+seta hud_panel_powerups_bg_alpha "0"
+seta hud_panel_powerups_bg_border ""
+seta hud_panel_powerups_bg_padding ""
+seta hud_panel_powerups_flip "1"
+seta hud_panel_powerups_iconalign "0"
+seta hud_panel_powerups_baralign "0"
+
+seta hud_panel_healtharmor 1
+seta hud_panel_healtharmor_pos "0.305859 0.925606"
+seta hud_panel_healtharmor_size "0.311485 0.061230"
+seta hud_panel_healtharmor_bg ""
+seta hud_panel_healtharmor_bg_color ""
+seta hud_panel_healtharmor_bg_color_team "0"
+seta hud_panel_healtharmor_bg_alpha "1"
+seta hud_panel_healtharmor_bg_border ""
+seta hud_panel_healtharmor_bg_padding ""
+seta hud_panel_healtharmor_flip "0
+seta hud_panel_healtharmor_iconalign "0"
+seta hud_panel_healtharmor_baralign "0"
+
+seta hud_panel_notify 1
+seta hud_panel_notify_pos "0.663125 0.748536"
+seta hud_panel_notify_size "0.320000 0.180000"
+seta hud_panel_notify_bg ""
+seta hud_panel_notify_bg_color ""
+seta hud_panel_notify_bg_color_team ""
+seta hud_panel_notify_bg_alpha "0"
+seta hud_panel_notify_bg_border ""
+seta hud_panel_notify_bg_padding ""
+seta hud_panel_notify_flip "0"
+seta hud_panel_notify_print "0"
+
+seta hud_panel_timer 1
+seta hud_panel_timer_pos "0.880000 0.012070"
+seta hud_panel_timer_size "0.100000 0.032520"
+seta hud_panel_timer_bg ""
+seta hud_panel_timer_bg_color ""
+seta hud_panel_timer_bg_color_team ""
+seta hud_panel_timer_bg_alpha ""
+seta hud_panel_timer_bg_border ""
+seta hud_panel_timer_bg_padding "0"
+
+seta hud_panel_radar 1
+seta hud_panel_radar_pos "0.023750 0.024395"
+seta hud_panel_radar_size "0.182969 0.224140"
+seta hud_panel_radar_bg "border_vertical"
+seta hud_panel_radar_bg_color ""
+seta hud_panel_radar_bg_color_team ""
+seta hud_panel_radar_bg_alpha ""
+seta hud_panel_radar_bg_border ""
+seta hud_panel_radar_bg_padding "-3"
+seta hud_panel_radar_foreground_alpha "0.800000"
+
+seta hud_panel_score 1
+seta hud_panel_score_pos "0.023516 0.925605"
+seta hud_panel_score_size "0.152344 0.060254"
+seta hud_panel_score_bg ""
+seta hud_panel_score_bg_color ""
+seta hud_panel_score_bg_color_team ""
+seta hud_panel_score_bg_alpha ""
+seta hud_panel_score_bg_border ""
+seta hud_panel_score_bg_padding ""
+
+seta hud_panel_racetimer 1
+seta hud_panel_racetimer_pos "0.354531 0.206289"
+seta hud_panel_racetimer_size "0.280000 0.093333"
+seta hud_panel_racetimer_bg ""
+seta hud_panel_racetimer_bg_color ""
+seta hud_panel_racetimer_bg_color_team ""
+seta hud_panel_racetimer_bg_alpha "0"
+seta hud_panel_racetimer_bg_border ""
+seta hud_panel_racetimer_bg_padding ""
+
+seta hud_panel_vote 1
+seta hud_panel_vote_pos "0.021094 0.650586"
+seta hud_panel_vote_size "0.264218 0.102462"
+seta hud_panel_vote_bg ""
+seta hud_panel_vote_bg_color ""
+seta hud_panel_vote_bg_color_team ""
+seta hud_panel_vote_bg_alpha ""
+seta hud_panel_vote_bg_border ""
+seta hud_panel_vote_bg_padding ""
+seta hud_panel_vote_alreadyvoted_alpha "0.750000"
+
+seta hud_panel_modicons 1
+seta hud_panel_modicons_pos "0.036563 0.271796"
+seta hud_panel_modicons_size "0.084766 0.199903"
+seta hud_panel_modicons_bg ""
+seta hud_panel_modicons_bg_color ""
+seta hud_panel_modicons_bg_color_team ""
+seta hud_panel_modicons_bg_alpha ""
+seta hud_panel_modicons_bg_border ""
+seta hud_panel_modicons_bg_padding ""
+
+seta hud_panel_pressedkeys 1
+seta hud_panel_pressedkeys_pos "0.411562 0.545429"
+seta hud_panel_pressedkeys_size "0.177656 0.120531"
+seta hud_panel_pressedkeys_bg ""
+seta hud_panel_pressedkeys_bg_color ""
+seta hud_panel_pressedkeys_bg_color_team "0"
+seta hud_panel_pressedkeys_bg_alpha "0"
+seta hud_panel_pressedkeys_bg_border ""
+seta hud_panel_pressedkeys_bg_padding ""
+seta hud_panel_pressedkeys_aspect "1.600000"
+
+seta hud_panel_chat 1
+seta hud_panel_chat_pos "0.020000 0.774374"
+seta hud_panel_chat_size "0.627968 0.112696"
+seta hud_panel_chat_bg ""
+seta hud_panel_chat_bg_color ""
+seta hud_panel_chat_bg_color_team ""
+seta hud_panel_chat_bg_alpha "0"
+seta hud_panel_chat_bg_border ""
+seta hud_panel_chat_bg_padding ""
+
+seta hud_panel_engineinfo 1
+seta hud_panel_engineinfo_pos "0.860000 0.950000"
+seta hud_panel_engineinfo_size "0.130000 0.034667"
+seta hud_panel_engineinfo_bg ""
+seta hud_panel_engineinfo_bg_color ""
+seta hud_panel_engineinfo_bg_color_team ""
+seta hud_panel_engineinfo_bg_alpha "0"
+seta hud_panel_engineinfo_bg_border ""
+seta hud_panel_engineinfo_bg_padding ""
+
+seta hud_panel_infomessages 1
+seta hud_panel_infomessages_pos "0.388751 0.378243"
+seta hud_panel_infomessages_size "0.233282 0.061679"
+seta hud_panel_infomessages_bg ""
+seta hud_panel_infomessages_bg_color ""
+seta hud_panel_infomessages_bg_color_team ""
+seta hud_panel_infomessages_bg_alpha "0"
+seta hud_panel_infomessages_bg_border ""
+seta hud_panel_infomessages_bg_padding ""
diff --git a/hud_luminos_default.cfg b/hud_luminos_default.cfg
index e56e3bcee..8ed8cc76a 100644
--- a/hud_luminos_default.cfg
+++ b/hud_luminos_default.cfg
@@ -1,11 +1,11 @@
 seta hud_skin "luminos"
-seta hud_bg "border_horizontal"
-seta hud_bg_color "0.875 0.375 0"
-seta hud_bg_color_team "0"
-seta hud_bg_alpha "1"
-seta hud_bg_border "6"
-seta hud_bg_padding "2"
-seta hud_fg_alpha "1"
+seta hud_panel_bg "border_horizontal"
+seta hud_panel_bg_color "0.875 0.375 0"
+seta hud_panel_bg_color_team "0"
+seta hud_panel_bg_alpha "1"
+seta hud_panel_bg_border "6"
+seta hud_panel_bg_padding "2"
+seta hud_panel_fg_alpha "1"
 
 seta hud_dock "dock"
 seta hud_dock_color "0 0.1875 0.4375"
diff --git a/hud_old_nexuiz.cfg b/hud_old_nexuiz.cfg
index 07220fe7f..d17e20aa6 100644
--- a/hud_old_nexuiz.cfg
+++ b/hud_old_nexuiz.cfg
@@ -20,15 +20,15 @@ seta hud_progressbar_armor_color "0 0.6 0"
 seta hud_progressbar_fuel_color "0.6 0.6 0"
 seta hud_progressbar_nexball_color "0.7 0.1 0"
 
-seta _hud_panelorder "2 14 4 12 0 11 13 6 5 9 3 1 7 10 8 "
+seta _hud_panelorder "3 7 5 6 0 2 14 4 12 11 13 9 1 10 8 "
 
 seta hud_configure_grid "1"
 seta hud_configure_grid_xsize "0.01"
 seta hud_configure_grid_ysize "0.01"
 
 seta hud_panel_weapons 1
-seta hud_panel_weapons_pos "0.370000 0.850000"
-seta hud_panel_weapons_size "0.330000 0.070000"
+seta hud_panel_weapons_pos "0.370000 0.870000"
+seta hud_panel_weapons_size "0.330000 0.060000"
 seta hud_panel_weapons_bg "0"
 seta hud_panel_weapons_bg_color ""
 seta hud_panel_weapons_bg_color_team ""
@@ -110,13 +110,13 @@ seta hud_panel_radar_size "0.200000 0.260000"
 seta hud_panel_radar_bg "border_radar"
 seta hud_panel_radar_bg_color ""
 seta hud_panel_radar_bg_color_team ""
-seta hud_panel_radar_bg_alpha ""
+seta hud_panel_radar_bg_alpha "0.3"
 seta hud_panel_radar_bg_border ""
 seta hud_panel_radar_bg_padding "-10"
 seta hud_panel_radar_foreground_alpha "0.800000"
 
 seta hud_panel_score 1
-seta hud_panel_score_pos "0.760000 0.913333"
+seta hud_panel_score_pos "0.760000 0.920000"
 seta hud_panel_score_size "0.240000 0.080000"
 seta hud_panel_score_bg "0"
 seta hud_panel_score_bg_color ""
diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 651491f47..5d91d6405 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -10,6 +10,8 @@ var float autocvar_cl_gentle;
 var float autocvar_cl_gentle_gibs;
 var float autocvar_cl_gentle_messages;
 
+var float autocvar_hud_color_bg_team;
+
 var float autocvar__menu_alpha;
 
 var float autocvar__hud_configure;
@@ -37,13 +39,13 @@ var vector autocvar_hud_progressbar_armor_color;
 var vector autocvar_hud_progressbar_fuel_color;
 var vector autocvar_hud_progressbar_nexball_color;
 
-var string autocvar_hud_bg;
-var vector autocvar_hud_bg_color;
-var float autocvar_hud_bg_color_team;
-var float autocvar_hud_bg_alpha;
-var float autocvar_hud_bg_border;
-var float autocvar_hud_bg_padding;
-var float autocvar_hud_fg_alpha;
+var string autocvar_hud_panel_bg;
+var vector autocvar_hud_panel_bg_color;
+var float autocvar_hud_panel_bg_color_team;
+var float autocvar_hud_panel_bg_alpha;
+var float autocvar_hud_panel_bg_border;
+var float autocvar_hud_panel_bg_padding;
+var float autocvar_hud_panel_fg_alpha;
 
 var float autocvar_hud_panel_weapons;
 var vector autocvar_hud_panel_weapons_pos;
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 9fa3be806..0bf4c5051 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4655,7 +4655,6 @@ void HUD_Main (void)
 
 	hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5);
 	hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5);
-	hud_color_bg_team = cvar("hud_color_bg_team");
 
 	hud_fontsize = HUD_GetFontsize("hud_fontsize");
 	hud_fontsize_spec = HUD_GetFontsize("hud_fontsize_spec");
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 5039d427c..3a073bee9 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -12,7 +12,6 @@ var float highlightedPanel_prev = -1;
 float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
 
 const float BORDER_MULTIPLIER = 0.25;
-float hud_color_bg_team;
 float scoreboard_bottom;
 float weapon_hits[WEP_MAXCOUNT];
 float weapon_fired[WEP_MAXCOUNT];
@@ -102,7 +101,7 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\
 	panel_bg = "0";\
 } else {\
 	if(panel_bg_str == "") {\
-		panel_bg = autocvar_hud_bg;\
+		panel_bg = autocvar_hud_panel_bg;\
 	} else if(panel_bg_str == "0" && autocvar__hud_configure) {\
 		panel_bg = "border";\
 	} else {\
@@ -122,7 +121,7 @@ if((teamplay) && panel_bg_color_team) {\
 	panel_bg_color = '1 0 0' * panel_bg_color_team;\
 } else {\
 	if(panel_bg_color_str == "") {\
-		panel_bg_color = autocvar_hud_bg_color;\
+		panel_bg_color = autocvar_hud_panel_bg_color;\
 	} else {\
 		if(panel_bg_color_str == "shirt") {\
 			panel_bg_color = colormapPaletteColor(floor(stof(getplayerkey(player_localentnum - 1, "colors")) / 16), 0);\
@@ -137,7 +136,7 @@ if((teamplay) && panel_bg_color_team) {\
 // Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str
 #define HUD_Panel_GetColorTeam()\
 if(panel_bg_color_team_str == "") {\
-	panel_bg_color_team = autocvar_hud_bg_color_team;\
+	panel_bg_color_team = autocvar_hud_panel_bg_color_team;\
 } else {\
 	panel_bg_color_team = stof(panel_bg_color_team_str);\
 }
@@ -146,7 +145,7 @@ if(panel_bg_color_team_str == "") {\
 // comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel
 #define HUD_Panel_GetBgAlpha()\
 if(panel_bg_alpha_str == "") {\
-	panel_bg_alpha_str = ftos(autocvar_hud_bg_alpha);\
+	panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha);\
 }\
 panel_bg_alpha = stof(panel_bg_alpha_str);\
 if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel == active_panel) {\
@@ -163,7 +162,7 @@ if(autocvar__hud_configure && disable_menu_alphacheck == 2 && highlightedPanel =
 // comment on line 2 of macro: // ALWAYS show disabled panels at 0.25 alpha when in config mode
 // comment on line 4 of macro: // don't fade this panel when showing the panel-specific menu dialog
 #define HUD_Panel_GetFgAlpha()\
-panel_fg_alpha = autocvar_hud_fg_alpha;\
+panel_fg_alpha = autocvar_hud_panel_fg_alpha;\
 if(autocvar__hud_configure && !panel_enabled)\
 	panel_fg_alpha = 0.25;\
 if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel))\
@@ -172,7 +171,7 @@ if(!(disable_menu_alphacheck == 2 && highlightedPanel == active_panel))\
 // Get border. See comments above, it's similar.
 #define HUD_Panel_GetBorder()\
 if(panel_bg_border_str == "") {\
-	panel_bg_border = autocvar_hud_bg_border;\
+	panel_bg_border = autocvar_hud_panel_bg_border;\
 } else {\
 	panel_bg_border = stof(panel_bg_border_str);\
 }
@@ -188,7 +187,7 @@ panel_size_y *= vid_conheight;
 // last line is a port of the old function, basically always make sure the panel contents are at least 5 pixels tall/wide, to disallow extreme padding values
 #define HUD_Panel_GetPadding()\
 if(panel_bg_padding_str == "") {\
-	panel_bg_padding = autocvar_hud_bg_padding;\
+	panel_bg_padding = autocvar_hud_panel_bg_padding;\
 } else {\
 	panel_bg_padding = stof(panel_bg_padding_str);\
 }\
diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 392bc305e..5508cb5e1 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -759,7 +759,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
 	tmp_y = 1.25 * hud_fontsize_y;
 
 	// rounded header
-	drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * hud_color_bg_team) + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+	drawpic(pos, "gfx/scoreboard/scoreboard_tableheader", tmp, (rgb * autocvar_hud_color_bg_team) + '0.5 0.5 0.5', scoreboard_alpha_bg, DRAWFLAG_NORMAL);
 
 	// table border
 	tmp_y += hud_border_thickness;
@@ -775,7 +775,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz
 
 	// table background
 	tmp_y = body_table_height;
-	drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+	drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
 
 	// anyway, apply some color
 	//drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL);
@@ -911,7 +911,7 @@ vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
 	tmp_x = sbwidth;
 	tmp_y = height * rows;
 
-	drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+	drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
 	drawborderlines(hud_accuracy_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
 
 	// column highlighting
@@ -1026,7 +1026,7 @@ vector HUD_DrawScoreboardRankings(vector pos, entity pl,  vector rgb, vector bg_
 	tmp_x = sbwidth;
 	tmp_y = hud_fontsize_y * RANKINGS_RECEIVED_CNT;
 
-	drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
+	drawpic_tiled(pos, "gfx/scoreboard/scoreboard_bg", bg_size, tmp, rgb * autocvar_hud_color_bg_team, scoreboard_alpha_bg, DRAWFLAG_NORMAL);
 	drawborderlines(hud_border_thickness, pos, tmp, '0 0 0', scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
 
 	// row highlighting
-- 
2.39.2