From 154208710bfdc56daff3d702fe03a20e7b05ccdd Mon Sep 17 00:00:00 2001
From: Techno <41777800+TechnoSL@users.noreply.github.com>
Date: Sun, 24 Mar 2024 20:58:04 +0000
Subject: [PATCH] 0.35 added engineer build/destroy remade sourcescheme
 reworked hudplayerhealth to support both aspect ratios new winpanel added
 background for 16:9 loading screen

---
 README.md                                     |  15 +-
 .../console/background_upward_widescreen.vtf  | Bin 0 -> 2796384 bytes
 resource/cs/th_srcscheme.res                  | 799 ------------------
 resource/gamemenu.res                         |   4 +-
 resource/sourcescheme.res                     | 391 ++++++++-
 resource/ui/build_menu/base_active.res        |  50 +-
 .../base_active_teleport_target.res           | 186 ++--
 resource/ui/build_menu/base_already_built.res |  70 +-
 resource/ui/build_menu/base_cant_afford.res   |  84 +-
 resource/ui/build_menu/base_selectable.res    |  51 +-
 resource/ui/build_menu/base_unavailable.res   |  68 +-
 .../base_unavailable_teleport_target.res      | 197 +++--
 resource/ui/build_menu/hudmenuengybuild.res   | 439 +++++-----
 .../ui/build_menu/hudmenueurekaeffect.res     | 235 +++---
 resource/ui/build_menu/pipboy/base_active.res |  46 +-
 .../pipboy/base_active_teleport_target.res    |  65 +-
 .../build_menu/pipboy/base_already_built.res  |  68 +-
 .../ui/build_menu/pipboy/base_cant_afford.res |  58 +-
 .../ui/build_menu/pipboy/base_selectable.res  |  47 +-
 .../ui/build_menu/pipboy/base_unavailable.res |  61 +-
 .../base_unavailable_teleport_target.res      |  71 +-
 .../ui/build_menu/pipboy/hudmenuengybuild.res | 227 +++--
 .../build_menu/pipboy/hudmenueurekaeffect.res | 131 ++-
 resource/ui/destroy_menu/base_active.res      |   1 +
 resource/ui/destroy_menu/base_inactive.res    |  31 +-
 resource/ui/destroy_menu/dispenser_active.res |  67 +-
 .../ui/destroy_menu/dispenser_inactive.res    |  68 +-
 .../ui/destroy_menu/hudmenuengydestroy.res    | 188 +++--
 .../ui/destroy_menu/pipboy/base_inactive.res  |  30 +-
 .../destroy_menu/pipboy/dispenser_active.res  |  69 +-
 .../pipboy/dispenser_inactive.res             |  69 +-
 .../pipboy/hudmenuengydestroy.res             | 159 ++--
 .../ui/destroy_menu/pipboy/sentry_active.res  |  69 +-
 .../destroy_menu/pipboy/sentry_inactive.res   |  69 +-
 .../pipboy/tele_entrance_active.res           |  69 +-
 .../pipboy/tele_entrance_inactive.res         |  69 +-
 .../destroy_menu/pipboy/tele_exit_active.res  |  69 +-
 .../pipboy/tele_exit_inactive.res             |  69 +-
 resource/ui/destroy_menu/sentry_active.res    |  67 +-
 resource/ui/destroy_menu/sentry_inactive.res  |  68 +-
 .../ui/destroy_menu/tele_entrance_active.res  |  67 +-
 .../destroy_menu/tele_entrance_inactive.res   |  68 +-
 resource/ui/destroy_menu/tele_exit_active.res |  67 +-
 .../ui/destroy_menu/tele_exit_inactive.res    |  68 +-
 .../ui/disguise_menu/hudmenuspydisguise.res   |   2 +-
 resource/ui/hudplayerhealth.res               | 198 ++---
 resource/ui/objectivestatusescort.res         |   8 +
 resource/ui/winpanel.res                      | 595 +++++++++----
 scripts/hudlayout.res                         |  42 +-
 49 files changed, 2876 insertions(+), 2833 deletions(-)
 create mode 100644 materials/console/background_upward_widescreen.vtf
 delete mode 100644 resource/cs/th_srcscheme.res

diff --git a/README.md b/README.md
index 166cde0..93fad59 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ an attempt at a hud made from scratch
 
 should work fine in both 16:9 (tested in 1920x1080) and 4:3 (i play 1280x960 fulltime), other aspect ratios might be a bit wonkier as they are untested.
 
-## credits / things used
+## credits / things used (this hud would not be remotely done if not for these people, massive props.)
 
 ### Hypnotize - m0rehud
 
@@ -19,3 +19,16 @@ Class Selection, MOTD, Map Info Menu. (modified by me) and PZKPFW Killfeed Setti
 ### playmoo - BotHud
 
 Source Scheme, tf_english chat modifications
+
+### Shredder - c-sharp
+
+WinPanel
+
+### Broesel - Broesel Hud
+
+Engineer Build/Destroy, Spy Disguise Select
+
+## Special Thanks
+
+HUDS.TF Discord - various troubleshooting and suggestions/feedback
+moki - linux playtesting
diff --git a/materials/console/background_upward_widescreen.vtf b/materials/console/background_upward_widescreen.vtf
new file mode 100644
index 0000000000000000000000000000000000000000..1f01345d0a07aa5c4c26917e2689a70dede20732
GIT binary patch
literal 2796384
zcmeI!I|{-;6a~;15lo@z7DSgJsEuGDScI$~h0AaauE5?!#utXc-ui^h<lltk-qUxN
zSVY7u$2~{1F+c4hnrT0m+xv5<qnvpj*SWJ?<+N$*ZRJwVkMpn{bNP20<Mp-AwLb6I
z`|v&ZALK#FRe2~6<)J*3hw^Z8wm#4Y`amD(1AU+m^dS%M01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
z01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm0
z5AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF
z@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+
t01xm05AXmF@Bk0+01xm05AXmF@Bk0+01xm05AXmF@Bk0+01x~;@C9nF-~#{v

literal 0
HcmV?d00001

diff --git a/resource/cs/th_srcscheme.res b/resource/cs/th_srcscheme.res
deleted file mode 100644
index fe2f0c4..0000000
--- a/resource/cs/th_srcscheme.res
+++ /dev/null
@@ -1,799 +0,0 @@
-#base "SourceSchemeBase.res"
-
-/// original SourceScheme.res by playmoo for BotHud https://github.com/playmoo/bothud
-///
-Scheme
-{
-    //////////////////////// COLORS ///////////////////////////
-	// color details
-	// this is a list of all the colors used by the scheme
-	Colors
-	{
-		"EllGrey"			  "40 40 40 255"
-		"EllDarkGrey"		  "20 20 20 255"
-		"EllLightGrey"		  "120 120 120 255"
-		"EllLighterGrey"	  "236 236 236 255"
-		"EllTransparentGrey"  "40 40 40 160"
-		"Blank"				"0 0 0 0"
-	}
-
-	BaseSettings
-	{
-		// scheme-specific colors
-		Border.Bright					"EllGrey"	// the lit side of a control
-		Border.Dark						"EllGrey"		// the dark/unlit side of a control
-		Border.Selection				"BorderSelection"			// the additional border color for displaying the default/selected button
-		Border.Frame					"EllDarkGrey"
-
-		Button.TextColor				"EllLighterGrey"
-		Button.BgColor					"EllGrey"
-		Button.ArmedTextColor			"EllLighterGrey"
-		Button.ArmedBgColor				"EllDarkGrey"
-		Button.DepressedTextColor		"EllLighterGrey"
-		Button.DepressedBgColor			"EllDarkGrey"
-		Button.FocusBorderColor			"EllDarkGrey"
-
-		CheckButton.TextColor			"EllLighterGrey"
-		CheckButton.SelectedTextColor		"EllLighterGrey"
-		CheckButton.BgColor				"EllDarkGrey"
-		CheckButton.HighlightFgColor		"EllDarkGrey"
-		CheckButton.ArmedBgColor		"Blank"
-		CheckButton.DepressedBgColor		"Blank"
-		CheckButton.Border1  			"Border.Dark" 		// the left checkbutton border
-		CheckButton.Border2  			"Border.Bright"		// the right checkbutton border
-		CheckButton.Check				"EllLighterGrey"	// color of the check itself
-		CheckButton.DisabledBgColor	    "EllDarkGrey"
-
-		ToggleButton.SelectedTextColor	"EllLighterGrey"
-
-		ComboBoxButton.ArrowColor		"EllLighterGrey"
-		ComboBoxButton.ArmedArrowColor	"EllLighterGrey"
-		ComboBoxButton.BgColor			"Blank"
-		ComboBoxButton.DisabledBgColor	"Blank"
-
-		RadioButton.TextColor		"EllLighterGrey"
-		RadioButton.SelectedTextColor	"EllLighterGrey"
-		RadioButton.ArmedTextColor	"EllLighterGrey"
-
-		Frame.BgColor					"EllGrey"
-		Frame.OutOfFocusBgColor			"EllTransparentGrey"
-		FrameGrip.Color1				"EllGrey"
-		FrameGrip.Color2				"EllGrey"
-		FrameTitleButton.FgColor		"EllLighterGrey"
-		FrameTitleBar.Font			"DefaultLarge"		[$WIN32]
-		FrameTitleBar.TextColor			"EllLighterGrey"
-		FrameTitleBar.DisabledTextColor	"EllDarkGrey"
-
-		Label.TextDullColor				"EllDarkGrey"
-		Label.TextColor					"EllLighterGrey"
-		Label.TextBrightColor			"EllLighterGrey"
-		Label.SelectedTextColor			"EllLighterGrey"
-		Label.BgColor					"Blank"
-		Label.DisabledFgColor1			"EllDarkGrey"
-		Label.DisabledFgColor2			"Blank"
-
-		ListPanel.TextColor					"EllLighterGrey"
-		ListPanel.BgColor					"EllDarkGrey"
-		ListPanel.SelectedBgColor			"EllLighterGrey"
-		ListPanel.SelectedOutOfFocusBgColor	"EllLighterGrey"
-
-		MainMenu.TextColor			"EllLighterGrey"			[$WIN32]
-		MainMenu.ArmedTextColor		"EllDarkGrey"	[$WIN32]
-		MainMenu.Inset				"32"
-		"MainMenu.Backdrop" 								"Blank"
-
-		Menu.TextInset					"6"
-		Menu.FgColor			"EllLighterGrey"
-		Menu.BgColor			"EllDarkGrey"
-		Menu.ArmedFgColor		"EllLighterGrey"
-		Menu.ArmedBgColor		"EllLighterGrey"
-		Menu.DividerColor		"BorderDark"
-
-		ScrollBarButton.FgColor				"EllLighterGrey"
-		ScrollBarButton.BgColor				"EllGrey"
-		ScrollBarButton.ArmedFgColor		"EllLighterGrey"
-		ScrollBarButton.ArmedBgColor		"EllDarkGrey"
-		ScrollBarButton.DepressedFgColor	"EllLighterGrey"
-		ScrollBarButton.DepressedBgColor	"EllDarkGrey"
-
-		ScrollBarSlider.BgColor				"EllDarkGrey"		// this isn't really used
-		ScrollBarSlider.FgColor				"EllGrey"		// handle with which the slider is grabbed
-
-		Slider.NobColor				"EllLighterGrey"
-		Slider.TextColor			"EllLighterGrey"
-		Slider.TrackColor			"EllDarkGrey"
-		Slider.DisabledTextColor1	"EllLighterGrey"
-        Slider.DisabledTextColor2	"Blank"
-
-		TextEntry.TextColor			        "EllLighterGrey"
-		TextEntry.DisabledTextColor	        "EllLighterGrey"
-		TextEntry.SelectedBgColor	        "EllLighterGrey"
-	}
-
-	Fonts
-	{
-		"MainMenuFont"
-		{
-			"1"	[$WIN32]
-			{
-				"name"		"TF2 Build"
-				"tall"		"18"
-				"weight"	"500"
-				"additive"	"0"
-				"antialias" "1"
-			}
-		}
-
-		"MenuLarge"
-		{
-			"1"	[$X360]
-			{
-				"tall_hidef"		"24"
-			}
-		}
-
-		"ServerBrowserTitle"
-		{
-			"1"
-			{
-				"name"		"TF2 Build"
-				"tall"		"35"
-				"tall_lodef"	"40"
-				"weight"	"500"
-				"additive"	"0"
-				"antialias" "1"
-			}
-		}
-
-		"Default" [$OSX]
-		{
-			"1"
-			{
-				"name"		"Verdana"
-				"tall"		"14"
-				"weight"	"500"
-			}
-		}
-
-		"ServerBrowserSmall"
-		{
-			"1"
-			{
-				"name"		"Tahoma"
-				"tall"		"16"
-				"weight"	"0"
-				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
-				"yres"	"480 599"
-			}
-
-			"2"
-			{
-				"name"		"Tahoma"
-				"tall"		"16"
-				"weight"	"0"
-				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
-				"yres"	"600 767"
-			}
-
-			"3"
-			{
-				"name"		"Tahoma"
-				"tall"		"16"
-				"weight"	"0"
-				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
-				"yres"	"768 1023"
-				"antialias"	"1"
-			}
-
-			"4"
-			{
-				"name"		"Tahoma"
-				"tall"		"19"
-				"weight"	"0"
-				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
-				"yres"	"1024 1199"
-				"antialias"	"1"
-			}
-
-			"5"
-			{
-				"name"		"Tahoma"
-				"tall"		"19"
-				"weight"	"0"
-				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
-				"yres"	"1200 6000"
-				"antialias"	"1"
-			}
-		}
-
-		AchievementItemTitle	[$WIN32]
-		{
-			"1"
-			{
-				"name"		"Arial" [!$OSX]
-				"name"		"Verdana Bold" [$OSX]
-				"weight"		"1500"
-				"tall"			"16" [!$OSX]
-				"tall"			"18" [$OSX]
-				"antialias"		"1"
-			}
-		}
-
-		AchievementItemTitleLarge	[$WIN32]
-		{
-			"1"
-			{
-				"name"		"Arial" [!$OSX]
-				"name"		"Verdana Bold" [$OSX]
-				"weight"		"1500"
-				"tall"			"18" [!$OSX]
-				"tall"			"19" [$OSX]
-				"antialias"		"1"
-			}
-		}
-
-		AchievementItemDescription	[$WIN32]
-		{
-			"1"
-			{
-				"name"		"Arial" [!$OSX]
-				"name"		"Verdana" [$OSX]
-				"weight"		"1000"
-				"tall"			"14" [!$OSX]
-				"tall"			"12" [$OSX]
-				"antialias"		"1" [!$OSX]
-			}
-		}
-	}
-
-	CustomFontFiles
-	{
-		"6"
-		{
-			"font" "resource/TF2Build.ttf"
-			"name" "TF2 Build"
-
-			"turkish"
-			{
-				"range" "0x0000 0x015F"
-			}
-
-			"swedish"
-			{
-				"range" "0x0000 0x00F6"
-			}
-
-			"spanish"
-			{
-				"range" "0x0000 0x00FC"
-			}
-
-			"romanian"
-			{
-				"range" "0x0000 0x021B"
-			}
-
-			"polish"
-			{
-				"range" "0x0000 0x017C"
-			}
-
-			"norwegian"
-			{
-				"range" "0x0000 0x00F8"
-			}
-
-			"danish"
-			{
-				"range" "0x0000 0x00F8"
-			}
-
-			"hungarian"
-			{
-				"range" "0x0000 0x0171"
-			}
-
-			"german"
-			{
-				"range" "0x0000 0x00FC"
-			}
-
-			"french"
-			{
-				"range" "0x0000 0x0178"
-			}
-
-			"finnish"
-			{
-				"range" "0x0000 0x017E"
-			}
-
-			"czech"
-			{
-				"range" "0x0000 0x017E"
-			}
-
-			"bulgarian"
-			{
-				"range" "0x0000 0x0451"
-			}
-
-			"russian"
-			{
-				"range" "0x0000 0x0451"
-			}
-		}
-	}
-
-	Borders
-	{
-		BaseBorder		SubtleBorder
-		ButtonBorder	RaisedBorder
-		ComboBoxBorder	DepressedBorder
-		MenuBorder		SubtleBorder
-		BrowserBorder	DepressedBorder
-		PropertySheetBorder	RaisedBorder
-
-		FrameBorder
-		{
-			// rounded corners for frames
-			"backgroundtype" "0"
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Frame"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Frame"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Frame"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Frame"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		SubtleBorder
-		{
-			"inset" "0 0 0 0"
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		DepressedBorder
-		{
-			"inset" "0 0 0 0"
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		RaisedBorder
-		{
-			"inset" "0 0 0 0"
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		TitleButtonBorder
-		{
-			"backgroundtype" "0"
-		}
-
-		TitleButtonDisabledBorder
-		{
-			"backgroundtype" "0"
-		}
-
-		TitleButtonDepressedBorder
-		{
-			"backgroundtype" "0"
-		}
-
-		ScrollBarButtonBorder
-		{
-			"inset" "0 0 0 0" [!$OSX]
-			"inset" "-3 2 0 0" [$OSX]
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		ScrollBarButtonDepressedBorder
-		{
-			"inset" "0 0 0 0" [!$OSX]
-			"inset" "-3 2 0 0" [$OSX]
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		TabBorder
-		{
-			"inset" "1 1 1 1"
-
-			render
-			{
-				"0" "fill( x0, y0, x1, y1, Black )"
-			}
-
-			render_bg
-			{
-				"0" "fill( x0, y0, x1, y1, Orange )"
-			}
-
-		}
-
-		TabActiveBorder
-		{
-			"inset" "1 1 1 1"
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-		}
-
-
-		ToolTipBorder
-		{
-			"inset" "0 0 1 0"
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		// this is the border used for default buttons (the button that gets pressed when you hit enter)
-		ButtonKeyFocusBorder
-		{
-			"inset" "0 0 0 0"
-
-			Left
-			{
-				"1"
-				{
-					"color" "EllDarkGrey"
-					"offset" "0 0"
-				}
-
-				"2"
-				{
-					"color" "EllDarkGrey"
-					"offset" "0 1"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "EllDarkGrey"
-					"offset" "0 0"
-				}
-
-				"2"
-				{
-					"color" "EllDarkGrey"
-					"offset" "1 0"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "EllDarkGrey"
-					"offset" "0 0"
-				}
-
-				"2"
-				{
-					"color" "EllDarkGrey"
-					"offset" "1 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "EllDarkGrey"
-					"offset" "0 0"
-				}
-
-				"2"
-				{
-					"color" "EllDarkGrey"
-					"offset" "0 0"
-				}
-			}
-		}
-
-		ButtonDepressedBorder
-		{
-			"inset" "0 0 0 0"
-
-			Left
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 1"
-				}
-			}
-
-			Right
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "1 0"
-				}
-			}
-
-			Top
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-
-			Bottom
-			{
-				"1"
-				{
-					"color" "Border.Dark"
-					"offset" "0 0"
-				}
-			}
-		}
-	}
-}
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
index bfd39e5..5924d0b 100644
--- a/resource/gamemenu.res
+++ b/resource/gamemenu.res
@@ -3,8 +3,8 @@
 
 	"Version"
 	{
-		"label"										"technohud 0.347"
-		"command"									"engine showconsole; clear; echo technohud v0.347; echo by techno, using some bits of other huds by various people. (check github for credits); echo github.com/TechnoSL/technohud"
+		"label"										"technohud 0.35"
+		"command"									"engine showconsole; clear; echo technohud v0.35; echo by techno, using some bits of other huds by various people. (check github for credits); echo github.com/TechnoSL/technohud"
 		"OnlyAtMenu"								"0"
 	}
 	"Servers"
diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res
index 42673d4..dcf9520 100644
--- a/resource/sourcescheme.res
+++ b/resource/sourcescheme.res
@@ -1,2 +1,391 @@
-#base "cs/th_srcscheme.res"
 #base "SourceSchemeBase.res"
+//created using the ToonHUD source scheme editor because i dont like messing with this file
+Scheme
+{
+	Colors
+	{
+	
+		"G_ActiveWindow"			"40 40 40 255" // Active window bg color
+		"G_InctiveWindow"			"40 40 40 245" // Inactive window bg color
+		"G_TitleBg"					"40 40 40 255" // Title bg color
+		"G_TitleText"				"236 236 236 255" // Title text color
+		"G_Highlight"				"120 120 120 255" // Highlight color
+		"G_ConsoleBg"				"20 20 20 255" // Console bg color
+		"G_ListBg"					"20 20 20 255" // List bg color
+		"G_Border"					"20 20 20 102" // Border color
+		"G_Text"					"236 236 236 255" // Text color
+		"G_HighlightText"			"236 236 236 255" // Highlight text color
+		"G_SelectedText"			"236 236 236 255" // Selected text color
+		"G_DisabledText"			"236 236 236 64" // Disabled text color
+		"G_ButtonBg"				"40 40 40 255" // Button bg color
+		"G_ButtonText"				"236 236 236 255" // Button text color
+		"G_ButtonHoverBg"			"120 120 120 255" // Button hover bg color
+		"G_ButtonHoverText"			"236 236 236 255" // Button hover text color
+		"G_InputBg"					"20 20 20 255" // Input bg color
+		"G_Light"					"255 255 255 50"
+		"G_Dark"					"0 0 0 50"
+	
+		// ------------------------------------------
+		
+	    "TFDarkBrown"               "60 56 53 255"
+	    "TFDarkBrownTransparent"    "60 56 53 190"
+	    "TFTanBright"               "236 227 203 150"
+	    "TFTanLight"                "201 188 162 150"
+	    "TFTanMedium"               "131 121 104 150"
+	    "TFTanLightBright"          "229 223 211 90"
+	    "TFTanLightDark"            "96 90 78 90"
+	    "TFOrangeBright"            "156 82 33 255"
+	    "TFTextBright"              "251 236 203 150"
+	    "TFTextLight"               "201 188 162 255"
+	    "TFTextMedium"              "131 121 104 255"
+	    "TFTextMediumDark"          "104 96 83 255"
+	    "TFTextBlack"               "42 39 37 255"
+	    "TFTextDull"                "131 121 104 255"
+	    "TFMediumBrown"				"69 64 58 255"
+
+	    "QuickListBGDeselected"		"0 0 0 0"
+	    "QuickListBGSelected"       "120 120 120 255" // Highlight color
+	    
+	    "Blank"				"0 0 0 0"
+	    
+	    // background colors
+		"ControlBG"			"76 88 68 255"		// background color of controls
+		"ControlDarkBG"		"90 106 80 255"		// darker background color; used for background of scrollbars
+		"WindowBG"			"62 70 55 255"		// background color of text edit panes (chat, text entries, etc.)
+		"SelectionBG"		"90 84 75 255"		// background color of any selected text or menu item
+		"SelectionBG2"		"69 64 57 255"		// selection background in window w/o focus
+		"ListBG"			"39 36 34 255"		// background of server browser, buddy list, etc.
+	}
+	BaseSettings
+	{
+		// scheme-specific colors
+		Border.Bright					"G_Border"	// the lit side of a control
+		Border.Dark						"G_Border"	// the dark/unlit side of a control
+		Border.Selection				"G_Border"	// the additional border color for displaying the default/selected button
+
+		// Buttons and tabs
+		Button.TextColor				"G_ButtonText"
+		Button.BgColor					"G_ButtonBg"
+		Button.ArmedTextColor			"G_ButtonHoverText"
+		Button.ArmedBgColor				"G_ButtonHoverBg"
+		Button.DepressedTextColor		"G_ButtonHoverText"
+		Button.DepressedBgColor			"G_ButtonHoverBg"	
+		Button.FocusBorderColor			"G_ButtonHoverBg"
+		
+		// Tab texts
+		PropertySheet.TextColor			"G_ButtonText"
+		PropertySheet.SelectedTextColor	"G_ButtonText"
+		
+		// Console background
+		RichText.BgColor				"G_ConsoleBg"
+		
+		// Progress bar
+		ProgressBar.FgColor				"G_Text"
+		ProgressBar.BgColor				"G_ListBg"
+		
+		// Checkboxes
+		CheckButton.TextColor			"G_Text"
+		CheckButton.SelectedTextColor	"G_SelectedText"
+		CheckButton.BgColor				"G_InputBg"
+		CheckButton.HighlightFgColor	"G_SelectedText"
+		CheckButton.ArmedBgColor		"Blank"
+		CheckButton.DepressedBgColor	"Blank"
+		CheckButton.Border1  			"Border.Dark" 	// the left checkbutton border
+		CheckButton.Border2  			"Border.Bright"	// the right checkbutton border
+		CheckButton.Check				"G_Highlight"	// color of the check itself
+		CheckButton.DisabledBgColor	    "G_InputBg"
+
+		ToggleButton.SelectedTextColor	"G_Text"
+		
+		// Dropdowns
+		ComboBoxButton.ArrowColor		"G_Text"
+		ComboBoxButton.ArmedArrowColor	"G_SelectedText"
+		ComboBoxButton.BgColor			"Blank"
+		ComboBoxButton.DisabledBgColor	"Blank"
+		
+		// Radio buttons
+		RadioButton.TextColor			"G_Text"
+		RadioButton.SelectedTextColor	"G_SelectedText"
+		RadioButton.ArmedTextColor		"G_SelectedText"
+		
+		// Frames
+		Frame.BgColor					"G_ActiveWindow"
+		Frame.OutOfFocusBgColor			"G_InctiveWindow"
+		FrameGrip.Color1				"G_Light"
+		FrameGrip.Color2				"G_Dark"
+		FrameTitleButton.FgColor		"G_TitleText"
+
+		// Frame titles
+		FrameTitleBar.Font				"G_DefaultSmall"
+		FrameTitleBar.TextColor			"G_TitleText"
+		FrameTitleBar.DisabledTextColor	"G_TitleText"
+		FrameTitleBar.BgColor			"G_TitleBg"
+		
+		// Labels
+		Label.TextDullColor				"TFTextDull"
+		Label.TextColor					"G_Text"
+		Label.TextBrightColor			"G_SelectedText"
+		Label.SelectedTextColor			"G_SelectedText"
+		Label.BgColor					"Blank"
+		Label.DisabledFgColor1			"G_DisabledText"	
+		Label.DisabledFgColor2			"Blank"
+		
+		// List panels
+		ListPanel.TextColor					"G_Text"
+		ListPanel.SelectedTextColor			"G_HighlightText"
+		ListPanel.BgColor					"G_ListBg"
+		ListPanel.SelectedBgColor			"G_Highlight"
+		ListPanel.SelectedOutOfFocusBgColor	"G_Highlight"
+		
+		MainMenu.TextColor			"G_Text"			[$WIN32]
+		MainMenu.ArmedTextColor		"G_SelectedText"	[$WIN32]
+		MainMenu.Inset				"32"
+		
+		Menu.TextInset			"6"
+		Menu.TextColor			"G_Text"
+		Menu.BgColor			"G_ListBg"
+		Menu.ArmedTextColor		"G_HighlightText"
+		Menu.ArmedBgColor		"G_Highlight"
+		Menu.DividerColor		"BorderDark"
+		
+		ScrollBarButton.FgColor				"G_ButtonText"
+		ScrollBarButton.BgColor				"G_ButtonBg"
+		ScrollBarButton.ArmedFgColor		"G_ButtonHoverText"
+		ScrollBarButton.ArmedBgColor		"G_ButtonHoverBg"
+		ScrollBarButton.DepressedFgColor	"G_ButtonHoverText"
+		ScrollBarButton.DepressedBgColor	"G_ButtonHoverBg"
+
+		ScrollBarSlider.BgColor				"G_Dark"		// this isn't really used
+		ScrollBarSlider.FgColor				"G_ButtonBg"	// handle with which the slider is grabbed
+		
+		Slider.NobColor				"G_ButtonBg"		
+		Slider.TextColor			"G_ButtonText"
+		Slider.TrackColor			"G_Dark"
+		Slider.DisabledTextColor1	"TFTextMediumDark"
+        Slider.DisabledTextColor2	"Blank"
+		
+		// Text fields
+		TextEntry.TextColor				"G_Text"
+		TextEntry.SelectedTextColor		"G_HighlightText"
+		TextEntry.DisabledTextColor		"G_DisabledText"
+		TextEntry.SelectedBgColor		"G_Highlight"
+		TextEntry.BgColor				"G_InputBg"
+		
+		// Selection list (options)
+		SectionedListPanel.TextColor			"G_Text"
+		SectionedListPanel.BrightTextColor		"G_Text"
+		SectionedListPanel.BgColor				"G_ListBg"
+		SectionedListPanel.SelectedTextColor	"G_HighlightText"
+		SectionedListPanel.SelectedBgColor		"G_Highlight"
+		SectionedListPanel.OutOfFocusSelectedTextColor	"G_HighlightText"
+		SectionedListPanel.OutOfFocusSelectedBgColor	"G_Highlight"
+	}
+	
+	Fonts
+	{
+		"MainMenuFont"
+		{
+			"1"	[$WIN32]
+			{
+				"name"		"TF2 Build"
+				"tall"		"18"
+				"weight"	"500"
+				"additive"	"0"
+				"antialias" "1"
+			}
+		}
+		"MenuLarge"
+		{
+			"1"	[$X360]
+			{
+				"tall_hidef"		"24"
+			}
+		}
+
+		"ServerBrowserTitle"
+		{
+			"1"
+			{
+				"name"		"TF2 Build"
+				"tall"		"35"
+				"tall_lodef"	"40"
+				"weight"	"500"
+				"additive"	"0"
+				"antialias" "1"
+			}
+		}
+
+		"Default" [$OSX]
+		{
+			"1"
+			{
+				"name"		"Verdana"
+				"tall"		"14"
+				"weight"	"500"
+			}
+		}
+		
+		"G_DefaultSmall"
+		{
+			"1"
+			{
+				"name"		"Verdana"
+				"tall"		"14"
+				"weight"	"500"
+			}
+		}
+
+		"ServerBrowserSmall"
+		{
+			"1"
+			{
+				"name"		"Tahoma"
+				"tall"		"16"
+				"weight"	"0"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+				"yres"	"480 599"
+			}
+			"2"
+			{
+				"name"		"Tahoma"
+				"tall"		"16"
+				"weight"	"0"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+				"yres"	"600 767"
+			}
+			"3"
+			{
+				"name"		"Tahoma"
+				"tall"		"16"
+				"weight"	"0"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+				"yres"	"768 1023"
+				"antialias"	"1"
+			}
+			"4"
+			{
+				"name"		"Tahoma"
+				"tall"		"19"
+				"weight"	"0"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+				"yres"	"1024 1199"
+				"antialias"	"1"
+			}
+			"5"
+			{
+				"name"		"Tahoma"
+				"tall"		"19"
+				"weight"	"0"
+				"range"		"0x0000 0x017F" //	Basic Latin, Latin-1 Supplement, Latin Extended-A
+				"yres"	"1200 6000"
+				"antialias"	"1"
+			}
+		}
+		
+				
+		AchievementItemTitle	[$WIN32]
+		{
+			"1"
+			{
+				"name"		"Arial" [!$OSX]
+				"name"		"Verdana Bold" [$OSX]
+				"weight"		"1500"
+				"tall"			"16" [!$OSX]
+				"tall"			"18" [$OSX]
+				"antialias"		"1"
+			}
+		}
+		
+		AchievementItemTitleLarge	[$WIN32]
+		{
+			"1"
+			{
+				"name"		"Arial" [!$OSX]
+				"name"		"Verdana Bold" [$OSX]
+				"weight"		"1500"
+				"tall"			"18" [!$OSX]
+				"tall"			"19" [$OSX]
+				"antialias"		"1"
+			}
+		}
+		
+		AchievementItemDescription	[$WIN32]
+		{
+			"1"
+			{
+				"name"		"Arial" [!$OSX]
+				"name"		"Verdana" [$OSX]
+				"weight"		"1000"
+				"tall"			"14" [!$OSX]
+				"tall"			"12" [$OSX]
+				"antialias"		"1" [!$OSX]
+			}
+		}
+
+	}
+	
+	CustomFontFiles
+	{
+		"6" 
+		{
+			"font" "resource/TF2Build.ttf"
+			"name" "TF2 Build"
+			"turkish"
+			{
+				"range" "0x0000 0x015F"
+			}
+			"swedish"
+			{
+				"range" "0x0000 0x00F6"
+			}
+			"spanish"
+			{
+				"range" "0x0000 0x00FC"
+			}
+			"romanian"
+			{
+				"range" "0x0000 0x021B"
+			}
+			"polish"
+			{
+				"range" "0x0000 0x017C"
+			}
+			"norwegian"
+			{
+				"range" "0x0000 0x00F8"
+			}
+			"danish"
+			{
+				"range" "0x0000 0x00F8"
+			}
+			"hungarian"
+			{
+				"range" "0x0000 0x0171"
+			}
+			"german"
+			{
+				"range" "0x0000 0x00FC"
+			}
+			"french"
+			{
+				"range" "0x0000 0x0178"
+			}
+			"finnish"
+			{
+				"range" "0x0000 0x017E"
+			}
+			"czech"
+			{
+				"range" "0x0000 0x017E"
+			}
+			"bulgarian"
+			{
+				"range" "0x0000 0x0451"
+			}
+			"russian"
+			{
+				"range" "0x0000 0x0451"
+			}	
+		}
+	}
+}
diff --git a/resource/ui/build_menu/base_active.res b/resource/ui/build_menu/base_active.res
index cb5f352..8f35fb5 100644
--- a/resource/ui/build_menu/base_active.res
+++ b/resource/ui/build_menu/base_active.res
@@ -4,21 +4,21 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
 
 	"ItemBackground"
@@ -30,7 +30,7 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg"
@@ -41,11 +41,11 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"22"
-		"ypos"			"33"
+		"xpos"			"19"
+		"ypos"			"20"
 		"zpos"			"2"
-		"wide"			"56"
-		"tall"			"56"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
@@ -57,38 +57,38 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
-		"iconColor"		"TanDarker"
+		"iconColor"		"White" //"TanDarker"
 	}
 
 	"CostLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
-		"fgcolor"		"TanDarker"
-		"xpos"			"23"
-		"ypos"			"17"
+		"font"			"HudFont13"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
+		"fgcolor"		"255 255 255 255"
 	}
 
-	"ModeLabel"
+	"ModeLabel" // new in 29th april 2010 patch
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
@@ -116,7 +116,7 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -136,7 +136,7 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
diff --git a/resource/ui/build_menu/base_active_teleport_target.res b/resource/ui/build_menu/base_active_teleport_target.res
index fb0c919..1fd106b 100644
--- a/resource/ui/build_menu/base_active_teleport_target.res
+++ b/resource/ui/build_menu/base_active_teleport_target.res
@@ -1,111 +1,105 @@
-"Resource/UI/build_menu/base.res"
+"Resource/UI/build_menu/base_active_teleport_target.res"
 {
 	"ItemNameLabel"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"84"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
-		"dulltext"		"0"
-		"brighttext"	"0"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemNameLabel"
+		"font"				"HudFont12"
+		"xpos"				"3"
+		"ypos"				"2"
+		"zpos"				"1"
+		"wide"				"60"
+		"tall"				"15"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"#TF_Object_Sentry"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"fgcolor"			"255 255 255 255"
 	}
 
 	"ItemBackground"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"ItemBackground"
-		"xpos"			"4"
-		"ypos"			"14"
-		"zpos"			"0"
-		"wide"			"98"
-		"tall"			"105"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"icon"			"hud_menu_item_bg"
-		"iconColor"		"ProgressOffWhite"
+		"ControlName"		"CIconPanel"
+		"fieldName"			"ItemBackground"
+		"xpos"				"4"
+		"ypos"				"14"
+		"zpos"				"0"
+		"wide"				"98"
+		"tall"				"105"
+		"visible"			"0"
+		"enabled"			"1"
+		"scaleImage"		"1"
+		"icon"				"hud_menu_item_bg"
+		"iconColor"			"ProgressOffWhite"
 	}
-	
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"BuildingIcon"
-		"xpos"			"22"
-		"ypos"			"28"
-		"zpos"			"2"
-		"wide"			"56"
-		"tall"			"56"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"icon"			"hud_menu_sentry_build"
-		"iconColor"		"255 255 255 255"
+		"ControlName"		"CIconPanel"
+		"fieldName"			"BuildingIcon"
+		"xpos"				"19"
+		"ypos"				"20"
+		"zpos"				"2"
+		"wide"				"28"
+		"tall"				"28"
+		"visible"			"1"
+		"enabled"			"1"
+		"scaleImage"		"1"
+		"icon"				"hud_menu_sentry_build"
+		"iconColor"			"255 255 255 255"
 	}
-	
+
 	"ModeLabel"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"ModeLabel"
-		"font"			"DefaultSmall"
-		"fgcolor"		"TanDarker"
-		"xpos"			"33"
-		"ypos"			"17"
-		"zpos"			"1"
-		"wide"			"44"
-		"tall"			"13"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		""
-		"textAlignment"	"East"	
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"ModeLabel"
+		"font"				"DefaultSmall"
+		"fgcolor"			"TanDarker"
+		"xpos"				"33"
+		"ypos"				"17"
+		"zpos"				"1"
+		"wide"				"44"
+		"tall"				"13"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			""
+		"textAlignment"		"East"
 	}
-	
-	"NumberBg"	
+
+	"NumberBg"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
-		"zpos"			"0"
-		"wide"			"18"
-		"tall"			"18"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"ControlName"		"CIconPanel"
+		"fieldName"			"NumberBg"
+		"wide"				"0"
+		"tall"				"0"
+		"visible"			"0"
+		"enabled"			"0"
 	}
-	
+
 	"NumberLabel"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel"
-		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"18"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"1"
-		"textAlignment"	"Center"
-		"dulltext"		"1"
-		"brighttext"	"0"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"NumberLabel"
+		"font"				"HudFont13"
+		"fgcolor"			"255 255 255 255"
+		"xpos"				"3"
+		"ypos"				"49"
+		"zpos"				"1"
+		"wide"				"60"
+		"tall"				"15"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"1"
+		"textAlignment"		"Center"
+		"dulltext"			"1"
+		"brighttext"		"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/build_menu/base_already_built.res b/resource/ui/build_menu/base_already_built.res
index 7b44355..6720451 100644
--- a/resource/ui/build_menu/base_already_built.res
+++ b/resource/ui/build_menu/base_already_built.res
@@ -1,24 +1,24 @@
-"Resource/UI/build_menu/base_already_built.res"
+	"Resource/UI/build_menu/base.res"
 {
 	"ItemNameLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
 
 	"ItemBackground"
@@ -30,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"icon"			"hud_menu_item_bg_outline"
-		"iconColor"		"ProgressOffWhiteTransparent"
+		"icon"			"hud_menu_item_bg"
+		"iconColor"		"ProgressOffWhite"
 	}
 
 	"CantBuildReason"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -55,49 +55,49 @@
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 0 0 200"
 	}
-
 	"MetalIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
-		"iconColor"		"TanDark"
+		"iconColor"		"White" //"TanDarker"
 	}
 
 	"CostLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
-		"fgcolor"		"TanDark"
-		"xpos"			"23"
-		"ypos"			"17"
+		"font"			"HudFont13"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
+		"fgcolor"		"255 255 255 255"
 	}
 
-	"ModeLabel"
+	"ModeLabel" // new in 29th april 2010 patch
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
 		"font"			"DefaultSmall"
-		"fgcolor"		"TanDark"
+		"fgcolor"		"TanDarker"
 		"xpos"			"33"
 		"ypos"			"17"
 		"zpos"			"1"
@@ -115,12 +115,12 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
+		"xpos"			"25"
+		"ypos"			"63"
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -133,14 +133,14 @@
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
 		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"xpos"			"6"
+		"ypos"			"62"
 		"zpos"			"1"
-		"wide"			"100"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
diff --git a/resource/ui/build_menu/base_cant_afford.res b/resource/ui/build_menu/base_cant_afford.res
index b3aa360..28048d3 100644
--- a/resource/ui/build_menu/base_cant_afford.res
+++ b/resource/ui/build_menu/base_cant_afford.res
@@ -1,24 +1,24 @@
-"Resource/UI/build_menu/base_cant_afford.res"
+	"Resource/UI/build_menu/base.res"
 {
 	"ItemNameLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
 
 	"ItemBackground"
@@ -30,23 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"icon"			"hud_menu_item_bg_outline"
-		"iconColor"		"ProgressOffWhiteTransparent"
+		"icon"			"hud_menu_item_bg"
+		"iconColor"		"ProgressOffWhite"
 	}
 
 	"CantBuildReason"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"fgcolor"		"RedSolid"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"4"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -54,32 +53,50 @@
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Build_Cant_Afford"
 		"textAlignment"	"Center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"fgcolor"		"255 0 0 200"
+	}
+
+	"BuildingIcon"
+	{
+		"ControlName"	"CIconPanel"
+		"fieldName"		"BuildingIcon"
+		"xpos"			"20"
+		"ypos"			"20"
+		"zpos"			"2"
+		"wide"			"28"
+		"tall"			"28"
+		"visible"		"0"
+		"enabled"		"0"
+		"scaleImage"	"1"
+		"icon"			"hud_menu_sentry_build"
+		"iconColor"		"255 255 255 255"
 	}
 
 	"MetalIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
-		"iconColor"		"RedSolid"
+		"iconColor"		"White" //"TanDarker"
 	}
 
 	"CostLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
-		"fgcolor"		"RedSolid"
-		"xpos"			"23"
-		"ypos"			"17"
+		"font"			"HudFont13"
+		"xpos"			"25"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"84"
 		"tall"			"13"
@@ -91,12 +108,12 @@
 		"textAlignment"	"Left"
 	}
 
-	"ModeLabel"
+	"ModeLabel" // new in 29th april 2010 patch
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
 		"font"			"DefaultSmall"
-		"fgcolor"		"RedSolid"
+		"fgcolor"		"TanDarker"
 		"xpos"			"33"
 		"ypos"			"17"
 		"zpos"			"1"
@@ -114,12 +131,12 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
+		"xpos"			"25"
+		"ypos"			"63"
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -132,14 +149,14 @@
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
 		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"xpos"			"6"
+		"ypos"			"62"
 		"zpos"			"1"
-		"wide"			"100"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
@@ -147,3 +164,4 @@
 		"brighttext"	"0"
 	}
 }
+
diff --git a/resource/ui/build_menu/base_selectable.res b/resource/ui/build_menu/base_selectable.res
index e5bb579..f78e562 100644
--- a/resource/ui/build_menu/base_selectable.res
+++ b/resource/ui/build_menu/base_selectable.res
@@ -20,22 +20,21 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"10"
+		"font"			"HudFont12"
+		"xpos"			"3"
 		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"#TF_Empty_Slot"
-		"labelText_lodef"		"#TF_Empty_Slot"
-		"textAlignment"	"Left"
+		"labelText"		"#TF_Object_Sentry"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"fgcolor"		"black"
+		"fgcolor"		"255 255 255 255"
 	}
 
 	"ItemBackground"
@@ -43,11 +42,11 @@
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
 		"xpos"			"4"
-		"ypos"			"0"
+		"ypos"			"14"
 		"zpos"			"0"
 		"wide"			"98"
-		"tall"			"135"
-		"visible"		"1"
+		"tall"			"105"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg"
@@ -58,12 +57,12 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"22"
-		"ypos"			"19"
+		"xpos"			"19"
+		"ypos"			"20"
 		"zpos"			"2"
-		"wide"			"56"
-		"tall"			"56"
-		"visible"		"0"
+		"wide"			"28"
+		"tall"			"28"
+		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"hud_menu_sentry_build"
@@ -74,34 +73,34 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"79"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
-		"iconColor"		"TanDarker"
+		"iconColor"		"White" //"TanDarker"
 	}
 
 	"CostLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
-		"fgcolor"		"TanDarker"
-		"xpos"			"23"
-		"ypos"			"78"
+		"font"			"HudFont13"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"0"
+		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
+		"fgcolor"		"255 255 255 255"
 	}
 }
diff --git a/resource/ui/build_menu/base_unavailable.res b/resource/ui/build_menu/base_unavailable.res
index b5a0f8b..ad051b3 100644
--- a/resource/ui/build_menu/base_unavailable.res
+++ b/resource/ui/build_menu/base_unavailable.res
@@ -4,21 +4,21 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
 
 	"ItemBackground"
@@ -30,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"icon"			"hud_menu_item_bg_outline"
-		"iconColor"		"ProgressOffWhiteTransparent"
+		"icon"			"hud_menu_item_bg"
+		"iconColor"		"ProgressOffWhite"
 	}
 
 	"CantBuildReason"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -55,49 +55,49 @@
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 0 0 200"
 	}
-
 	"MetalIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
-		"iconColor"		"TanDark"
+		"iconColor"		"White" //"TanDarker"
 	}
 
 	"CostLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
-		"fgcolor"		"TanDark"
-		"xpos"			"23"
-		"ypos"			"17"
+		"font"			"HudFont13"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
+		"fgcolor"		"255 255 255 255"
 	}
 
-	"ModeLabel"
+	"ModeLabel" // new in 29th april 2010 patch
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
 		"font"			"DefaultSmall"
-		"fgcolor"		"TanDark"
+		"fgcolor"		"TanDarker"
 		"xpos"			"33"
 		"ypos"			"17"
 		"zpos"			"1"
@@ -115,12 +115,12 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
+		"xpos"			"25"
+		"ypos"			"63"
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -133,14 +133,14 @@
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
 		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"xpos"			"6"
+		"ypos"			"62"
 		"zpos"			"1"
-		"wide"			"100"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
diff --git a/resource/ui/build_menu/base_unavailable_teleport_target.res b/resource/ui/build_menu/base_unavailable_teleport_target.res
index bbe541b..4ae6ffa 100644
--- a/resource/ui/build_menu/base_unavailable_teleport_target.res
+++ b/resource/ui/build_menu/base_unavailable_teleport_target.res
@@ -1,115 +1,110 @@
-"Resource/UI/build_menu/base_unavailable.res"
+"Resource/UI/build_menu/base_unavailable_teleport_target.res"
 {
 	"ItemNameLabel"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"84"
-		"tall"			"15"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
-		"dulltext"		"0"
-		"brighttext"	"0"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"ItemNameLabel"
+		"font"				"HudFont12"
+		"xpos"				"3"
+		"ypos"				"2"
+		"zpos"				"1"
+		"wide"				"60"
+		"tall"				"15"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"#TF_Object_Sentry"
+		"textAlignment"		"center"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"fgcolor"			"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"ItemBackground"
-		"xpos"			"4"
-		"ypos"			"14"
-		"zpos"			"0"
-		"wide"			"98"
-		"tall"			"105"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"icon"			"hud_menu_item_bg_outline"
-		"iconColor"		"ProgressOffWhiteTransparent"
+		"ControlName"		"CIconPanel"
+		"fieldName"			"ItemBackground"
+		"xpos"				"4"
+		"ypos"				"14"
+		"zpos"				"0"
+		"wide"				"98"
+		"tall"				"105"
+		"visible"			"0"
+		"enabled"			"1"
+		"scaleImage"		"1"
+		"icon"				"hud_menu_item_bg_outline"
+		"iconColor"			"ProgressOffWhiteTransparent"
 	}
-	
+
 	"CantBuildReason"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
-		"zpos"			"2"
-		"wide"			"80"
-		"tall"			"18"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Hud_Menu_Build_Unavailable"
-		"textAlignment"	"Center"
-		"dulltext"		"0"
-		"brighttext"	"0"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"CantBuildReason"
+		"font"				"HudFont9"
+		"xpos"				"3"
+		"ypos"				"24"
+		"zpos"				"2"
+		"wide"				"60"
+		"tall"				"18"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"#Hud_Menu_Build_Unavailable"
+		"textAlignment"		"Center"
+		"dulltext"			"0"
+		"brighttext"		"0"
+		"fgcolor"			"255 0 0 200"
 	}
 
 	"ModeLabel"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"ModeLabel"
-		"font"			"DefaultSmall"
-		"fgcolor"		"TanDark"
-		"xpos"			"33"
-		"ypos"			"17"
-		"zpos"			"1"
-		"wide"			"44"
-		"tall"			"13"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		""
-		"textAlignment"	"East"	
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"ModeLabel"
+		"font"				"DefaultSmall"
+		"fgcolor"			"TanDarker"
+		"xpos"				"33"
+		"ypos"				"17"
+		"zpos"				"1"
+		"wide"				"44"
+		"tall"				"13"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			""
+		"textAlignment"		"East"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
-		"zpos"			"0"
-		"wide"			"18"
-		"tall"			"18"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"	
-		"icon"			"ico_key_blank"
-		"iconColor"		"255 255 255 255"
+		"ControlName"		"CIconPanel"
+		"fieldName"			"NumberBg"
+		"wide"				"0"
+		"tall"				"0"
+		"visible"			"0"
+		"enabled"			"0"
 	}
-	
+
 	"NumberLabel"
-	{	
-		"ControlName"	"CExLabel"
-		"fieldName"		"NumberLabel"
-		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"18"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"1"
-		"textAlignment"	"Center"
-		"dulltext"		"1"
-		"brighttext"	"0"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"			"NumberLabel"
+		"font"				"HudFont13"
+		"fgcolor"			"255 255 255 255"
+		"xpos"				"3"
+		"ypos"				"49"
+		"zpos"				"1"
+		"wide"				"60"
+		"tall"				"15"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			"1"
+		"textAlignment"		"Center"
+		"dulltext"			"1"
+		"brighttext"		"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/build_menu/hudmenuengybuild.res b/resource/ui/build_menu/hudmenuengybuild.res
index 5ab6cbc..cd5c33a 100644
--- a/resource/ui/build_menu/hudmenuengybuild.res
+++ b/resource/ui/build_menu/hudmenuengybuild.res
@@ -2,314 +2,303 @@
 {
 	"MainBackground"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"MainBackground"
-		"xpos"			"0"
-		"ypos"			"10"
-		"zpos"			"0"
-		"wide"			"450"
-		"tall"			"170"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"hud_menu_bg"
-		"iconColor"		"255 255 255 255"
-	}
-
-	"Divider"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"Divider"
-		"xpos"			"8"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"436"
-		"tall"			"2"
-		"fillcolor"		"255 222 208 255"
+		"ControlName"			"CIconPanel"
+		"fieldName"				"MainBackground"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"BuildIcon"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"BuildIcon"
-		"xpos"			"15"
-		"ypos"			"-8"
-		"zpos"			"1"
-		"wide"			"48"
-		"tall"			"48"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"ico_build"
-		"iconColor"		"255 255 255 255"
+		"ControlName"			"CIconPanel"
+		"fieldName"				"BuildIcon"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"BuildIconShadow"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"BuildIconShadow"
-		"xpos"			"16"
-		"ypos"			"-7"
-		"zpos"			"0"
-		"wide"			"48"
-		"tall"			"48"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"ico_build"
-		"iconColor"		"0 0 0 255"
+		"ControlName"			"CIconPanel"
+		"fieldName"				"BuildIconShadow"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"TitleLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabel"
-		"font"			"HudFont24Bold"
-		"xpos"			"68"			// align me to the left edge of the first selection
-		"ypos"			"0"
-		"zpos"			"2"
-		"wide"			"300"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Hud_menu_build_title"
-		"textAlignment"	"Left"
-		"dulltext"		"0"
-		"brighttext"	"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabel"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"TitleLabelDropshadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabelDropshadow"
-		"font"			"HudFont24Bold"
-		"fgcolor"		"Black"
-		"xpos"			"69"			// align me to the left edge of the first selection
-		"ypos"			"1"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Hud_menu_build_title"
-		"textAlignment"	"Left"
-		"dulltext"		"1"
-		"brighttext"	"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabelDropshadow"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"CancelLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CancelLabel"
-		"font"			"SpectatorKeyHints"
-		"xpos"			"218"
-		"ypos"			"35"
-		"zpos"			"1"
-		"wide"			"200"
-		"tall"			"13"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Hud_Menu_Build_Cancel"
-		"textAlignment"	"East"
-		"dulltext"		"0"
-		"brighttext"	"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"CancelLabel"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
+	}
+
+	"BuildTitle"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"BuildTitle"
+		"font"					"HudFont14"
+		"labelText"				"#Hud_menu_build_title"
+		"textAlignment"			"center"
+		"xpos"					"0"
+		"ypos"					"11"
+		"zpos"					"3"
+		"wide"					"250"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fgcolor"				"255 255 255 255"
+	}
+
+	"BuildTitleBG"
+	{
+		"ControlName"			"ImagePanel"
+		"fieldName"				"BuildTitleBG"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
+	}
+
+	"BuildBG"
+	{
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"BuildBG"
+		"xpos"					"1"
+		"ypos"					"9"
+		"zpos"					"0"
+		"wide"					"248"
+		"tall"					"84"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"image"					"../hud/color_panel_brown"
+		"src_corner_height"		"23"
+		"src_corner_width"		"23"
+		"draw_corner_width"		"3"
+		"draw_corner_height" 	"3"
+		"scaleImage"			"1"
 	}
 
 	"active_item_1"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"active_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"active_item_1"
+		"xpos"					"0"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"1"
 	}
 
 	"active_item_2"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"active_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"active_item_2"
+		"xpos"					"62"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"1"
 	}
 
 	"active_item_3"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"active_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"active_item_3"
+		"xpos"					"124"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"1"
 	}
 
 	"active_item_4"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"active_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"active_item_4"
+		"xpos"					"186"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"1"
 	}
 
 	"already_built_item_1"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"already_built_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"already_built_item_1"
+		"xpos"					"0"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"already_built_item_2"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"already_built_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"already_built_item_2"
+		"xpos"					"62"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"already_built_item_3"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"already_built_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"already_built_item_3"
+		"xpos"					"124"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"already_built_item_4"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"already_built_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"already_built_item_4"
+		"xpos"					"186"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"cant_afford_item_1"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"cant_afford_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"cant_afford_item_1"
+		"xpos"					"0"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"cant_afford_item_2"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"cant_afford_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"cant_afford_item_2"
+		"xpos"					"62"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"cant_afford_item_3"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"cant_afford_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"cant_afford_item_3"
+		"xpos"					"124"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"cant_afford_item_4"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"cant_afford_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"cant_afford_item_4"
+		"xpos"					"186"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"unavailable_item_1"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"unavailable_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"unavailable_item_1"
+		"xpos"					"0"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"unavailable_item_2"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"unavailable_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"unavailable_item_2"
+		"xpos"					"62"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"unavailable_item_3"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"unavailable_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"unavailable_item_3"
+		"xpos"					"124"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"unavailable_item_4"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"unavailable_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"unavailable_item_4"
+		"xpos"					"186"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 }
diff --git a/resource/ui/build_menu/hudmenueurekaeffect.res b/resource/ui/build_menu/hudmenueurekaeffect.res
index c8b8b93..c8df655 100644
--- a/resource/ui/build_menu/hudmenueurekaeffect.res
+++ b/resource/ui/build_menu/hudmenueurekaeffect.res
@@ -2,158 +2,159 @@
 {
 	"MainBackground"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"MainBackground"
-		"xpos"			"0"
-		"ypos"			"10"
-		"zpos"			"0"
-		"wide"			"250"
-		"tall"			"170"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"hud_menu_bg"
-		"iconColor"		"255 255 255 255"
+		"ControlName"			"CIconPanel"
+		"fieldName"				"MainBackground"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"BuildIcon"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"BuildIcon"
-		"xpos"			"15"
-		"ypos"			"-8"
-		"zpos"			"1"
-		"wide"			"48"
-		"tall"			"48"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"ico_build"
-		"iconColor"		"255 255 255 255"
+		"ControlName"			"CIconPanel"
+		"fieldName"				"BuildIcon"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"BuildIconShadow"
 	{
-		"ControlName"	"CIconPanel"
-		"fieldName"		"BuildIconShadow"
-		"xpos"			"16"
-		"ypos"			"-7"
-		"zpos"			"0"
-		"wide"			"48"
-		"tall"			"48"
-		"visible"		"1"
-		"enabled"		"1"
-		"scaleImage"	"1"
-		"icon"			"ico_build"
-		"iconColor"		"0 0 0 255"
+		"ControlName"			"CIconPanel"
+		"fieldName"				"BuildIconShadow"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"TitleLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabel"
-		"font"			"HudFont24"
-		"xpos"			"68"			// align me to the left edge of the first selection
-		"ypos"			"8"
-		"zpos"			"2"
-		"wide"			"300"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Hud_Menu_Teleport_Title"
-		"textAlignment"	"Left"
-		"dulltext"		"0"
-		"brighttext"	"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabel"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"TitleLabelDropshadow"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabelDropshadow"
-		"font"			"HudFont24"
-		"fgcolor"		"Black"
-		"xpos"			"70"			// align me to the left edge of the first selection
-		"ypos"			"10"
-		"zpos"			"1"
-		"wide"			"300"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Hud_Menu_Teleport_Title"
-		"textAlignment"	"Left"
-		"dulltext"		"1"
-		"brighttext"	"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabelDropshadow"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
 	}
 
 	"CancelLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"CancelLabel"
-		"font"			"SpectatorKeyHints"
-		"xpos"			"35"
-		"ypos"			"35"
-		"zpos"			"1"
-		"wide"			"200"
-		"tall"			"13"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"#Hud_Menu_Build_Cancel"
-		"textAlignment"	"East"
-		"dulltext"		"0"
-		"brighttext"	"0"
+		"ControlName"			"CExLabel"
+		"fieldName"				"CancelLabel"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
+	}
+
+	"BuildTitle"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"BuildTitle"
+		"font"					"HudFont15"
+		"labelText"				"#Hud_Menu_Teleport_Title"
+		"textAlignment"			"center"
+		"xpos"					"0"
+		"ypos"					"11"
+		"zpos"					"3"
+		"wide"					"250"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fgcolor"				"255 255 255 255"
+	}
+
+	"BuildTitleBG"
+	{
+		"ControlName"			"ImagePanel"
+		"fieldName"				"BuildTitleBG"
+		"wide"					"0"
+		"tall"					"0"
+		"visible"				"0"
+		"enabled"				"0"
+	}
+
+	"BuildBG"
+	{
+		"ControlName"			"ScalableImagePanel"
+		"fieldName"				"BuildBG"
+		"xpos"					"63"
+		"ypos"					"9"
+		"zpos"					"0"
+		"wide"					"124"
+		"tall"					"84"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"image"					"../hud/color_panel_brown"
+		"src_corner_height"		"23"
+		"src_corner_width"		"23"
+		"draw_corner_width"		"3"
+		"draw_corner_height"	"3"
+		"scaleImage"			"1"
 	}
 
 	"available_target_1"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"available_target_1"
-		"xpos"			"25"
-		"ypos"			"47"
-		"zpos"			"10"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"available_target_1"
+		"xpos"					"62"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"1"
 	}
 
 	"available_target_2"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"available_target_2"
-		"xpos"			"125"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"1"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"available_target_2"
+		"xpos"					"124"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"1"
 	}
 
 	"unavailable_target_1"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"unavailable_target_1"
-		"xpos"			"25"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"unavailable_target_1"
+		"xpos"					"62"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 
 	"unavailable_target_2"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"unavailable_target_2"
-		"xpos"			"125"
-		"ypos"			"47"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"unavailable_target_2"
+		"xpos"					"124"
+		"ypos"					"25"
+		"zpos"					"1"
+		"wide"					"72"
+		"tall"					"96"
+		"visible"				"0"
 	}
 }
diff --git a/resource/ui/build_menu/pipboy/base_active.res b/resource/ui/build_menu/pipboy/base_active.res
index 91298e4..5e1a61e 100644
--- a/resource/ui/build_menu/pipboy/base_active.res
+++ b/resource/ui/build_menu/pipboy/base_active.res
@@ -4,19 +4,18 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
@@ -31,7 +30,7 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg"
@@ -42,11 +41,11 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"22"
-		"ypos"			"33"
+		"xpos"			"19"
+		"ypos"			"20"
 		"zpos"			"2"
-		"wide"			"56"
-		"tall"			"56"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
@@ -58,13 +57,13 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
 		"iconColor"		"0 255 0 255"
@@ -74,19 +73,19 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
+		"font"			"HudFont15"
 		"fgcolor"		"0 255 0 255"
-		"xpos"			"23"
-		"ypos"			"17"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 	}
 
 	"ModeLabel"
@@ -117,7 +116,7 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -129,7 +128,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -137,12 +136,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
 }
diff --git a/resource/ui/build_menu/pipboy/base_active_teleport_target.res b/resource/ui/build_menu/pipboy/base_active_teleport_target.res
index 1932478..2bdef2b 100644
--- a/resource/ui/build_menu/pipboy/base_active_teleport_target.res
+++ b/resource/ui/build_menu/pipboy/base_active_teleport_target.res
@@ -1,22 +1,21 @@
-"Resource/UI/build_menu/base.res"
+"Resource/UI/build_menu/base_active_teleport_target.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
@@ -31,31 +30,31 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg"
 		"iconColor"		"0 0 0 255"
 	}
-	
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"22"
-		"ypos"			"28"
+		"xpos"			"19"
+		"ypos"			"20"
 		"zpos"			"2"
-		"wide"			"56"
-		"tall"			"56"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_sentry_build"
 		"iconColor"		"0 255 0 255"
 	}
-	
+
 	"ModeLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
 		"font"			"DefaultSmall"
@@ -70,10 +69,10 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		""
-		"textAlignment"	"East"	
+		"textAlignment"	"East"
 	}
-	
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -82,24 +81,24 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
-		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"font"			"HudFont13"
+		"fgcolor"		"0 255 0 255"
+		"xpos"			"3"
+		"ypos"			"49"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"18"
+		"wide"			"60"
+		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -109,4 +108,4 @@
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/build_menu/pipboy/base_already_built.res b/resource/ui/build_menu/pipboy/base_already_built.res
index 3afcf89..934bf18 100644
--- a/resource/ui/build_menu/pipboy/base_already_built.res
+++ b/resource/ui/build_menu/pipboy/base_already_built.res
@@ -1,22 +1,21 @@
-"Resource/UI/build_menu/base_already_built.res"
+	"Resource/UI/build_menu/base.res"
 {
 	"ItemNameLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont10"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"labelText"		"Sentry"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
@@ -31,10 +30,10 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"icon"			"hud_menu_item_bg_outline"
+		"icon"			"hud_menu_item_bg"
 		"iconColor"		"0 0 0 255"
 	}
 
@@ -42,11 +41,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -58,18 +57,17 @@
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-
 	"MetalIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
 		"iconColor"		"0 255 0 255"
@@ -79,19 +77,19 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
-		"xpos"			"23"
-		"ypos"			"17"
+		"font"			"HudFont15"
+		"fgcolor"		"0 255 0 255"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
-		"fgcolor"		"0 255 0 255"
+		"textAlignment"	"center"
 	}
 
 	"ModeLabel"
@@ -99,7 +97,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
 		"font"			"DefaultSmall"
-		"fgcolor"		"TanDark"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"33"
 		"ypos"			"17"
 		"zpos"			"1"
@@ -111,19 +109,18 @@
 		"enabled"		"1"
 		"labelText"		""
 		"textAlignment"	"East"
-		"fgcolor"		"0 255 0 255"
 	}
 
 	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
+		"xpos"			"25"
+		"ypos"			"63"
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -135,20 +132,19 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"fgcolor"		"0 255 0 255"
+		"xpos"			"6"
+		"ypos"			"62"
 		"zpos"			"1"
-		"wide"			"100"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
 }
diff --git a/resource/ui/build_menu/pipboy/base_cant_afford.res b/resource/ui/build_menu/pipboy/base_cant_afford.res
index 1373456..7ae5679 100644
--- a/resource/ui/build_menu/pipboy/base_cant_afford.res
+++ b/resource/ui/build_menu/pipboy/base_cant_afford.res
@@ -1,22 +1,21 @@
-"Resource/UI/build_menu/base_cant_afford.res"
+	"Resource/UI/build_menu/base.res"
 {
 	"ItemNameLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
@@ -31,10 +30,10 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"icon"			"hud_menu_item_bg_outline"
+		"icon"			"hud_menu_item_bg"
 		"iconColor"		"0 0 0 255"
 	}
 
@@ -42,12 +41,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"fgcolor"		"RedSolid"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"4"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -55,19 +53,22 @@
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Build_Cant_Afford"
 		"textAlignment"	"Center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"fgcolor"		"RedSolid"
 	}
 
 	"MetalIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
 		"iconColor"		"RedSolid"
@@ -77,10 +78,10 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
+		"font"			"HudFont15"
 		"fgcolor"		"RedSolid"
-		"xpos"			"23"
-		"ypos"			"17"
+		"xpos"			"25"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"84"
 		"tall"			"13"
@@ -115,12 +116,12 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
+		"xpos"			"25"
+		"ypos"			"63"
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -133,14 +134,14 @@
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
 		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"xpos"			"6"
+		"ypos"			"62"
 		"zpos"			"1"
-		"wide"			"100"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
@@ -148,3 +149,4 @@
 		"brighttext"	"0"
 	}
 }
+
diff --git a/resource/ui/build_menu/pipboy/base_selectable.res b/resource/ui/build_menu/pipboy/base_selectable.res
index a3b9361..338005c 100644
--- a/resource/ui/build_menu/pipboy/base_selectable.res
+++ b/resource/ui/build_menu/pipboy/base_selectable.res
@@ -20,22 +20,21 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"10"
+		"font"			"HudFont12"
+		"xpos"			"3"
 		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"#TF_Empty_Slot"
-		"labelText_lodef"		"#TF_Empty_Slot"
-		"textAlignment"	"Left"
+		"labelText"		"#TF_Object_Sentry"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"fgcolor"		"black"
+		"fgcolor"		"Black"
 	}
 
 	"ItemBackground"
@@ -43,11 +42,11 @@
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
 		"xpos"			"4"
-		"ypos"			"0"
+		"ypos"			"14"
 		"zpos"			"0"
 		"wide"			"98"
-		"tall"			"135"
-		"visible"		"1"
+		"tall"			"105"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg"
@@ -58,12 +57,12 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"22"
-		"ypos"			"19"
+		"xpos"			"19"
+		"ypos"			"20"
 		"zpos"			"2"
-		"wide"			"56"
-		"tall"			"56"
-		"visible"		"0"
+		"wide"			"28"
+		"tall"			"28"
+		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"hud_menu_sentry_build"
@@ -74,13 +73,13 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"79"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
 		"iconColor"		"TanDarker"
@@ -90,18 +89,18 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
+		"font"			"HudFont15"
 		"fgcolor"		"0 255 0 255"
-		"xpos"			"23"
-		"ypos"			"78"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"0"
+		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 	}
 }
diff --git a/resource/ui/build_menu/pipboy/base_unavailable.res b/resource/ui/build_menu/pipboy/base_unavailable.res
index 95d8a0e..4437c45 100644
--- a/resource/ui/build_menu/pipboy/base_unavailable.res
+++ b/resource/ui/build_menu/pipboy/base_unavailable.res
@@ -4,19 +4,18 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
@@ -31,10 +30,10 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
-		"icon"			"hud_menu_item_bg_outline"
+		"icon"			"hud_menu_item_bg"
 		"iconColor"		"0 0 0 255"
 	}
 
@@ -42,11 +41,11 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -57,18 +56,17 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
-
 	"MetalIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MetalIcon"
-		"xpos"			"10"
-		"ypos"			"18"
+		"xpos"			"19"
+		"ypos"			"50"
 		"zpos"			"1"
 		"wide"			"10"
 		"tall"			"10"
-		"visible"		"1"
-		"enabled"		"1"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"icon"			"ico_metal"
 		"iconColor"		"0 255 0 255"
@@ -78,19 +76,19 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CostLabel"
-		"font"			"HudFont14"
+		"font"			"HudFont15"
 		"fgcolor"		"0 255 0 255"
-		"xpos"			"23"
-		"ypos"			"17"
+		"xpos"			"3"
+		"ypos"			"50"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%metal%"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 	}
 
 	"ModeLabel"
@@ -98,7 +96,7 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
 		"font"			"DefaultSmall"
-		"fgcolor"		"TanDark"
+		"fgcolor"		"TanDarker"
 		"xpos"			"33"
 		"ypos"			"17"
 		"zpos"			"1"
@@ -116,12 +114,12 @@
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
-		"xpos"			"41"
-		"ypos"			"99"
+		"xpos"			"25"
+		"ypos"			"63"
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
@@ -133,20 +131,19 @@
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"fgcolor"		"0 255 0 255"
+		"xpos"			"6"
+		"ypos"			"62"
 		"zpos"			"1"
-		"wide"			"100"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
 }
diff --git a/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res b/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res
index bd939c9..96f7020 100644
--- a/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res
+++ b/resource/ui/build_menu/pipboy/base_unavailable_teleport_target.res
@@ -1,28 +1,27 @@
-"Resource/UI/build_menu/base_unavailable.res"
+"Resource/UI/build_menu/base_unavailable_teleport_target.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -31,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
-		"iconColor"		"0 0 0 255"
+		"iconColor"		"ProgressOffWhiteTransparent"
 	}
-	
+
 	"CantBuildReason"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"CantBuildReason"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -56,15 +55,15 @@
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
+		"fgcolor"		"RedSolid"
 	}
 
 	"ModeLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ModeLabel"
 		"font"			"DefaultSmall"
-		"fgcolor"		"TanDark"
+		"fgcolor"		"TanDarker"
 		"xpos"			"33"
 		"ypos"			"17"
 		"zpos"			"1"
@@ -75,10 +74,10 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		""
-		"textAlignment"	"East"	
+		"textAlignment"	"East"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -87,24 +86,24 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
-		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
-		"xpos"			"0"
-		"ypos"			"98"
+		"font"			"HudFont13"
+		"fgcolor"		"0 255 0 255"
+		"xpos"			"3"
+		"ypos"			"49"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"18"
+		"wide"			"60"
+		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -114,4 +113,4 @@
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/build_menu/pipboy/hudmenuengybuild.res b/resource/ui/build_menu/pipboy/hudmenuengybuild.res
index 732a9a3..77d8b7c 100644
--- a/resource/ui/build_menu/pipboy/hudmenuengybuild.res
+++ b/resource/ui/build_menu/pipboy/hudmenuengybuild.res
@@ -5,42 +5,48 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"MainBackground"
 		"xpos"			"0"
-		"ypos"			"0"
+		"ypos"			"10"
 		"zpos"			"0"
 		"wide"			"450"
-		"tall"			"180"
+		"tall"			"170"
 		"visible"		"1"
 		"enabled"		"1"
-		"paintbackground" "0"
+		"paintbackground"	"0"
 	}
 
 	"ItemBackground"
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"ItemBackground"
-		"xpos"			"0"
-		"ypos"			"0"
+		"xpos"			"1"
+		"ypos"			"9"
 		"zpos"			"-2"
-		"wide"			"450"
-		"tall"			"180"
+		"wide"			"248"
+		"tall"			"84"
+		"autoResize"	"0"
+		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"pipboy_overlay"
 		"tileImage"		"1"
+		"src_corner_height"	"23"				// pixels inside the image
+		"src_corner_width"	"23"
+		"draw_corner_width"	"5"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"5"
 		"drawcolor"		"192 192 192 255"
 	}
 	"BackgroundEngineer"
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"BackgroundEngineer"
-		"xpos"			"405"
+		"xpos"			"605"
 		"ypos"			"140"
 		"zpos"			"-1"
-		"wide"			"40"
-		"tall"			"40"
-		"visible"		"1"
-		"enabled"		"1"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"image"			"pipboy_engineer"
 		"tileImage"		"0"
@@ -52,30 +58,46 @@
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildIcon"
 		"xpos"			"15"
-		"ypos"			"0"
+		"ypos"			"-8"
 		"zpos"			"1"
 		"wide"			"48"
 		"tall"			"48"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_build"
 		"iconColor"		"0 255 0 255"
 	}
 
+	"BuildIconShadow"
+	{
+		"ControlName"	"CIconPanel"
+		"fieldName"		"BuildIconShadow"
+		"xpos"			"16"
+		"ypos"			"-7"
+		"zpos"			"0"
+		"wide"			"48"
+		"tall"			"48"
+		"visible"		"0"
+		"enabled"		"1"
+		"scaleImage"	"1"
+		"icon"			"ico_build"
+		"iconColor"		"0 0 0 255"
+	}
+
 	"TitleLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TitleLabel"
-		"font"			"HudFont24Bold"
+		"font"			"HudFontGiantBold"
 		"xpos"			"68"			// align me to the left edge of the first selection
-		"ypos"			"8"
+		"ypos"			"0"
 		"zpos"			"2"
 		"wide"			"300"
 		"tall"			"38"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_menu_build_title"
 		"textAlignment"	"Left"
@@ -84,6 +106,27 @@
 		"fgcolor"		"0 255 0 255"
 	}
 
+	"TitleLabelDropshadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"TitleLabelDropshadow"
+		"font"			"HudFontGiantBold"
+		"fgcolor"		"Black"
+		"xpos"			"69"			// align me to the left edge of the first selection
+		"ypos"			"1"
+		"zpos"			"1"
+		"wide"			"300"
+		"tall"			"38"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"#Hud_menu_build_title"
+		"textAlignment"	"Left"
+		"dulltext"		"1"
+		"brighttext"	"0"
+	}
+
 	"CancelLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -96,7 +139,7 @@
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Build_Cancel"
 		"textAlignment"	"East"
@@ -105,15 +148,34 @@
 		"fgcolor"		"0 255 0 255"
 	}
 
+	"BuildTitle"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"BuildTitle"
+		"font"			"HudFont15"
+		"labelText"		"#Hud_menu_build_title"
+		"textAlignment"	"center"
+		"xpos"			"0"
+		"ypos"			"11"
+		"zpos"			"3"
+		"wide"			"250"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"0 255 0 255"
+	}
+
 	"active_item_1"
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"active_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -121,11 +183,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"active_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -133,11 +195,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"active_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -145,11 +207,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"active_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -157,11 +219,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"already_built_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -169,11 +231,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"already_built_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -181,11 +243,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"already_built_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -193,11 +255,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"already_built_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -205,11 +267,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"cant_afford_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -217,11 +279,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"cant_afford_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -229,11 +291,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"cant_afford_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -241,23 +303,24 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"cant_afford_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
+
 	"unavailable_item_1"
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"unavailable_item_1"
-		"xpos"			"25"
-		"ypos"			"47"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -265,11 +328,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"unavailable_item_2"
-		"xpos"			"125"
-		"ypos"			"47"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -277,11 +340,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"unavailable_item_3"
-		"xpos"			"225"
-		"ypos"			"47"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -289,11 +352,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"unavailable_item_4"
-		"xpos"			"325"
-		"ypos"			"47"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 }
diff --git a/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res b/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
index dcacbb9..422e263 100644
--- a/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
+++ b/resource/ui/build_menu/pipboy/hudmenueurekaeffect.res
@@ -2,46 +2,51 @@
 {
 	"MainBackground"
 	{
-		"ControlName"	"CIconPanel"
+		"ControlName"	"EditablePanel"
 		"fieldName"		"MainBackground"
-		"xpos"			"0"
+		"xpos"			"62"
 		"ypos"			"10"
 		"zpos"			"0"
-		"wide"			"250"
+		"wide"			"125"
 		"tall"			"170"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"
-		"paintbackground" "0"
+		"paintbackground"	"0"
 	}
 
 	"ItemBackground"
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"ItemBackground"
-		"xpos"			"0"
-		"ypos"			"0"
+		"xpos"			"63"
+		"ypos"			"9"
 		"zpos"			"-2"
-		"wide"			"250"
-		"tall"			"180"
+		"wide"			"124"
+		"tall"			"84"
+		"autoResize"	"0"
+		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"pipboy_overlay"
 		"tileImage"		"1"
+		"src_corner_height"	"23"				// pixels inside the image
+		"src_corner_width"	"23"
+		"draw_corner_width"	"5"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"5"
 		"drawcolor"		"192 192 192 255"
 	}
 	"BackgroundEngineer"
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"BackgroundEngineer"
-		"xpos"			"205"
+		"xpos"			"605"
 		"ypos"			"140"
 		"zpos"			"-1"
-		"wide"			"40"
-		"tall"			"40"
-		"visible"		"1"
-		"enabled"		"1"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"image"			"pipboy_engineer"
 		"tileImage"		"0"
@@ -57,18 +62,34 @@
 		"zpos"			"1"
 		"wide"			"48"
 		"tall"			"48"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_build"
 		"iconColor"		"0 255 0 255"
 	}
 
+	"BuildIconShadow"
+	{
+		"ControlName"	"CIconPanel"
+		"fieldName"		"BuildIconShadow"
+		"xpos"			"16"
+		"ypos"			"-7"
+		"zpos"			"0"
+		"wide"			"48"
+		"tall"			"48"
+		"visible"		"0"
+		"enabled"		"1"
+		"scaleImage"	"1"
+		"icon"			"ico_build"
+		"iconColor"		"0 0 0 255"
+	}
+
 	"TitleLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TitleLabel"
-		"font"			"HudFont24"
+		"font"			"HudFontGiant"
 		"xpos"			"68"			// align me to the left edge of the first selection
 		"ypos"			"8"
 		"zpos"			"2"
@@ -76,7 +97,7 @@
 		"tall"			"38"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Teleport_Title"
 		"textAlignment"	"Left"
@@ -85,6 +106,27 @@
 		"fgcolor"		"0 255 0 255"
 	}
 
+	"TitleLabelDropshadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"TitleLabelDropshadow"
+		"font"			"HudFontGiant"
+		"fgcolor"		"Black"
+		"xpos"			"70"			// align me to the left edge of the first selection
+		"ypos"			"10"
+		"zpos"			"1"
+		"wide"			"300"
+		"tall"			"38"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+		"labelText"		"#Hud_Menu_Teleport_Title"
+		"textAlignment"	"Left"
+		"dulltext"		"1"
+		"brighttext"	"0"
+	}
+
 	"CancelLabel"
 	{
 		"ControlName"	"CExLabel"
@@ -97,7 +139,7 @@
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Build_Cancel"
 		"textAlignment"	"East"
@@ -106,15 +148,34 @@
 		"fgcolor"		"0 255 0 255"
 	}
 
+	"BuildTitle"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"BuildTitle"
+		"font"			"HudFont15"
+		"labelText"		"#Hud_Menu_Teleport_Title"
+		"textAlignment"	"center"
+		"xpos"			"0"
+		"ypos"			"11"
+		"zpos"			"3"
+		"wide"			"250"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"0 255 0 255"
+	}
+
 	"available_target_1"
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"available_target_1"
-		"xpos"			"25"
-		"ypos"			"47"
-		"zpos"			"10"
-		"wide"			"100"
-		"tall"			"124"
+		"xpos"			"62"
+		"ypos"			"25"
+		"zpos"			"1"
+		"wide"			"72"
+		"tall"			"96"
 		"visible"		"1"
 	}
 
@@ -122,11 +183,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"available_target_2"
-		"xpos"			"125"
-		"ypos"			"47"
+		"xpos"			"124"
+		"ypos"			"25"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72"
+		"tall"			"96"
 		"visible"		"1"
 	}
 
@@ -134,11 +195,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"unavailable_target_1"
-		"xpos"			"25"
-		"ypos"			"47"
+		"xpos"			"62"
+		"ypos"			"25"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72"
+		"tall"			"96"
 		"visible"		"0"
 	}
 
@@ -146,11 +207,11 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"unavailable_target_2"
-		"xpos"			"125"
-		"ypos"			"47"
+		"xpos"			"124"
+		"ypos"			"25"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72"
+		"tall"			"96"
 		"visible"		"0"
 	}
 }
diff --git a/resource/ui/destroy_menu/base_active.res b/resource/ui/destroy_menu/base_active.res
index 70f2412..95aaee4 100644
--- a/resource/ui/destroy_menu/base_active.res
+++ b/resource/ui/destroy_menu/base_active.res
@@ -18,6 +18,7 @@
 		"textAlignment"	"Left"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
 	
 	"ItemBackground"	
diff --git a/resource/ui/destroy_menu/base_inactive.res b/resource/ui/destroy_menu/base_inactive.res
index 1338e5a..8533457 100644
--- a/resource/ui/destroy_menu/base_inactive.res
+++ b/resource/ui/destroy_menu/base_inactive.res
@@ -1,10 +1,10 @@
 "Resource/UI/build_menu/base_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
+		"font"			"HudFont20"
 		"xpos"			"6"
 		"ypos"			"0"
 		"zpos"			"1"
@@ -18,9 +18,10 @@
 		"textAlignment"	"Left"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -31,13 +32,13 @@
 		"tall"			"105"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhiteTransparent"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
 		"font"			"Default"
@@ -50,13 +51,13 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"#TF_NotBuilt"
+		"labelText"		"lol"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
-			
-	"NumberBg"	
+	}
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -67,13 +68,13 @@
 		"tall"			"18"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -92,4 +93,4 @@
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/dispenser_active.res b/resource/ui/destroy_menu/dispenser_active.res
index f72c358..d3a1831 100644
--- a/resource/ui/destroy_menu/dispenser_active.res
+++ b/resource/ui/destroy_menu/dispenser_active.res
@@ -1,26 +1,27 @@
 "Resource/UI/destroy_menu/dispenser_active.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Dispenser"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -29,46 +30,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhite"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"26"
+		"ypos"			"20"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"255 255 255 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"10"
-		"ypos"			"16"
+		"xpos"			"20"
+		"ypos"			"19"
 		"zpos"			"2"
-		"wide"			"80"
-		"tall"			"80"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_dispenser"
 		"iconColor"		"255 255 255 128"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -77,15 +78,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -97,11 +98,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"2"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/dispenser_inactive.res b/resource/ui/destroy_menu/dispenser_inactive.res
index 2f8075e..bba668c 100644
--- a/resource/ui/destroy_menu/dispenser_inactive.res
+++ b/resource/ui/destroy_menu/dispenser_inactive.res
@@ -1,26 +1,27 @@
 "Resource/UI/build_menu/dispenser_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_dispenser"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -29,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhiteTransparent"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -54,29 +55,32 @@
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
+		"fgcolor"		"255 0 0 200"
+
+	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}		
-			
-	"NumberBg"	
+	}
+
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -85,15 +89,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -105,11 +109,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"2"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/hudmenuengydestroy.res b/resource/ui/destroy_menu/hudmenuengydestroy.res
index 0088201..08fee52 100644
--- a/resource/ui/destroy_menu/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/hudmenuengydestroy.res
@@ -5,39 +5,27 @@
 		"ControlName"	"CIconPanel"
 		"fieldName"		"MainBackground"
 		"xpos"			"0"
-		"ypos"			"14"
+		"ypos"			"10"
 		"zpos"			"0"
 		"wide"			"450"
 		"tall"			"170"
-		"visible"		"1"
+		"visible"		"0" //"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"hud_menu_bg"
 		"iconColor"		"255 255 255 255"
 	}
 
-	"Divider"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"Divider"
-		"xpos"			"8"
-		"ypos"			"51"
-		"zpos"			"0"
-		"wide"			"436"
-		"tall"			"2"
-		"fillcolor"		"255 222 208 255"
-	}
-
 	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
 		"xpos"			"0"
 		"ypos"			"-2"
-		"zpos"			"1"
+		"zpos"			"0"
 		"wide"			"64"
 		"tall"			"64"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_demolish"
@@ -48,16 +36,16 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TitleLabelDropshadow"
-		"font"			"HudFont24Bold"
+		"font"			"HudFontGiantBold"
 		"fgcolor"		"Black"
 		"xpos"			"32"			// align me to the left edge of the first selection
 		"ypos"			"7"
-		"zpos"			"2"
+		"zpos"			"1"
 		"wide"			"300"
 		"tall"			"35"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_menu_demolish_title"
 		"textAlignment"	"Left"
@@ -69,15 +57,15 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TitleLabel"
-		"font"			"HudFont24Bold"
+		"font"			"HudFontGiantBold"
 		"xpos"			"31"			// align me to the left edge of the first selection
 		"ypos"			"4"
-		"zpos"			"3"
+		"zpos"			"2"
 		"wide"			"300"
 		"tall"			"38"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_menu_demolish_title"
 		"textAlignment"	"Left"
@@ -97,7 +85,7 @@
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Build_Cancel"
 		"textAlignment"	"East"
@@ -105,15 +93,73 @@
 		"brighttext"	"0"
 	}
 
+	"DestroyTitle"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"BuildTitle"
+		"font"			"HudFont15"
+		"labelText"		"#Hud_menu_demolish_title"
+		"textAlignment"	"center"
+		"xpos"			"0"
+		"ypos"			"11"
+		"zpos"			"3"
+		"wide"			"250"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"255 255 255 255"
+	}
+
+	"DestroyTitleBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"BuildTitleBG"
+		"xpos"			"1"
+		"ypos"			"9"
+		"zpos"			"1"
+		"wide"			"0"
+		"tall"			"16" //"68"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fillcolor"		"255 159 45 128"
+		"PaintBackgroundType"	"0"
+	}
+
+
+	"DestroyBG"
+	{
+		"ControlName"		"ScalableImagePanel"
+		"fieldName"		"DestroyBG"
+		"xpos"			"1"
+		"ypos"			"9"
+		"zpos"			"0"
+		"wide"			"248"
+		"tall"			"69"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/color_panel_brown"
+		"src_corner_height"	"23"				// pixels inside the image
+		"src_corner_width"	"23"
+		"draw_corner_width"	"3"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"3"
+		"scaleImage"		"1"
+	}
+
 	"active_item_1"
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_1"
-		"xpos"			"25"
-		"ypos"			"51"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -121,11 +167,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_2"
-		"xpos"			"125"
-		"ypos"			"51"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -133,11 +179,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_3"
-		"xpos"			"225"
-		"ypos"			"51"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -145,11 +191,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_4"
-		"xpos"			"325"
-		"ypos"			"51"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -157,11 +203,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_1"
-		"xpos"			"25"
-		"ypos"			"51"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -169,11 +215,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_2"
-		"xpos"			"125"
-		"ypos"			"51"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -181,11 +227,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_3"
-		"xpos"			"225"
-		"ypos"			"51"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -193,11 +239,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_4"
-		"xpos"			"325"
-		"ypos"			"51"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -205,11 +251,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_1"
-		"xpos"			"25"
-		"ypos"			"51"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -217,11 +263,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_2"
-		"xpos"			"125"
-		"ypos"			"51"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -229,11 +275,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_3"
-		"xpos"			"225"
-		"ypos"			"51"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -241,11 +287,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_4"
-		"xpos"			"325"
-		"ypos"			"51"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 }
diff --git a/resource/ui/destroy_menu/pipboy/base_inactive.res b/resource/ui/destroy_menu/pipboy/base_inactive.res
index 1338e5a..c78fa69 100644
--- a/resource/ui/destroy_menu/pipboy/base_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/base_inactive.res
@@ -1,10 +1,10 @@
 "Resource/UI/build_menu/base_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
+		"font"			"HudFont20"
 		"xpos"			"6"
 		"ypos"			"0"
 		"zpos"			"1"
@@ -19,8 +19,8 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -31,13 +31,13 @@
 		"tall"			"105"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhiteTransparent"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
 		"font"			"Default"
@@ -50,13 +50,13 @@
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
-		"labelText"		"#TF_NotBuilt"
+		"labelText"		"lol"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
-			
-	"NumberBg"	
+	}
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -67,13 +67,13 @@
 		"tall"			"18"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -92,4 +92,4 @@
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/dispenser_active.res b/resource/ui/destroy_menu/pipboy/dispenser_active.res
index b559e5f..b4ec5c1 100644
--- a/resource/ui/destroy_menu/pipboy/dispenser_active.res
+++ b/resource/ui/destroy_menu/pipboy/dispenser_active.res
@@ -1,27 +1,27 @@
 "Resource/UI/destroy_menu/dispenser_active.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Dispenser"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,46 +30,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"26"
+		"ypos"			"20"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"0 255 0 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"10"
-		"ypos"			"16"
+		"xpos"			"20"
+		"ypos"			"19"
 		"zpos"			"2"
-		"wide"			"80"
-		"tall"			"80"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_dispenser"
 		"iconColor"		"0 255 0 255"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -78,19 +78,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -98,12 +98,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"2"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
index 11fd0c7..52f8a21 100644
--- a/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/dispenser_inactive.res
@@ -1,27 +1,27 @@
 "Resource/UI/build_menu/dispenser_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_dispenser"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -56,29 +56,31 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
-	}	
+
+	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}		
-			
-	"NumberBg"	
+	}
+
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -87,19 +89,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -107,12 +109,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"2"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
index ae00103..6e97d91 100644
--- a/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
+++ b/resource/ui/destroy_menu/pipboy/hudmenuengydestroy.res
@@ -2,45 +2,51 @@
 {
 	"MainBackground"
 	{
-		"ControlName"	"EditablePanel"
+		"ControlName"	"CIconPanel"
 		"fieldName"		"MainBackground"
 		"xpos"			"0"
-		"ypos"			"0"
+		"ypos"			"10"
 		"zpos"			"0"
 		"wide"			"450"
-		"tall"			"180"
+		"tall"			"170"
 		"visible"		"1"
 		"enabled"		"1"
-		"paintbackground" "0"
+		"paintbackground"	"0"
 	}
 
 	"ItemBackground"
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"ItemBackground"
-		"xpos"			"0"
-		"ypos"			"0"
+		"xpos"			"1"
+		"ypos"			"9"
 		"zpos"			"-2"
-		"wide"			"450"
-		"tall"			"180"
+		"wide"			"248"
+		"tall"			"69"
+		"autoResize"	"0"
+		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"image"			"pipboy_overlay"
 		"tileImage"		"1"
+		"src_corner_height"	"23"				// pixels inside the image
+		"src_corner_width"	"23"
+		"draw_corner_width"	"5"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"5"
 		"drawcolor"		"192 192 192 255"
 	}
 	"BackgroundEngineer"
 	{
 		"ControlName"	"CTFImagePanel"
 		"fieldName"		"BackgroundEngineer"
-		"xpos"			"405"
+		"xpos"			"605"
 		"ypos"			"140"
 		"zpos"			"-1"
-		"wide"			"40"
-		"tall"			"40"
-		"visible"		"1"
-		"enabled"		"1"
+		"wide"			"0"
+		"tall"			"0"
+		"visible"		"0"
+		"enabled"		"0"
 		"scaleImage"	"1"
 		"image"			"pipboy_engineer"
 		"tileImage"		"0"
@@ -52,11 +58,11 @@
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
 		"xpos"			"0"
-		"ypos"			"0"
+		"ypos"			"-2"
 		"zpos"			"0"
 		"wide"			"64"
 		"tall"			"64"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"icon"			"ico_demolish"
@@ -67,15 +73,15 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"TitleLabel"
-		"font"			"HudFont24Bold"
+		"font"			"HudFontGiantBold"
 		"xpos"			"31"			// align me to the left edge of the first selection
-		"ypos"			"8"
+		"ypos"			"4"
 		"zpos"			"2"
 		"wide"			"300"
 		"tall"			"38"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_menu_demolish_title"
 		"textAlignment"	"Left"
@@ -96,7 +102,7 @@
 		"tall"			"13"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"#Hud_Menu_Build_Cancel"
 		"textAlignment"	"East"
@@ -105,15 +111,34 @@
 		"fgcolor"		"0 255 0 255"
 	}
 
+	"DestroyTitle"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"BuildTitle"
+		"font"			"HudFont15"
+		"labelText"		"#Hud_menu_demolish_title"
+		"textAlignment"	"center"
+		"xpos"			"0"
+		"ypos"			"11"
+		"zpos"			"3"
+		"wide"			"250"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"fgcolor"		"0 255 0 255"
+	}
+
 	"active_item_1"
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_1"
-		"xpos"			"25"
-		"ypos"			"51"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -121,11 +146,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_2"
-		"xpos"			"125"
-		"ypos"			"51"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -133,11 +158,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_3"
-		"xpos"			"225"
-		"ypos"			"51"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -145,11 +170,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"active_item_4"
-		"xpos"			"325"
-		"ypos"			"51"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"0"
 	}
 
@@ -157,11 +182,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_1"
-		"xpos"			"25"
-		"ypos"			"51"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -169,11 +194,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_2"
-		"xpos"			"125"
-		"ypos"			"51"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -181,11 +206,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_3"
-		"xpos"			"225"
-		"ypos"			"51"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -193,11 +218,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"inactive_item_4"
-		"xpos"			"325"
-		"ypos"			"51"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -205,11 +230,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_1"
-		"xpos"			"25"
-		"ypos"			"51"
+		"xpos"			"0" //"25"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -217,11 +242,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_2"
-		"xpos"			"125"
-		"ypos"			"51"
+		"xpos"			"62" //"125"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -229,11 +254,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_3"
-		"xpos"			"225"
-		"ypos"			"51"
+		"xpos"			"124" //"225"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 
@@ -241,11 +266,11 @@
 	{
 		"ControlName"	"CEngyDestroyMenuItem"
 		"fieldName"		"unavailable_item_4"
-		"xpos"			"325"
-		"ypos"			"51"
+		"xpos"			"186" //"325"
+		"ypos"			"25" //"47"
 		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"124"
+		"wide"			"72" //"100"
+		"tall"			"96" //"124"
 		"visible"		"1"
 	}
 }
diff --git a/resource/ui/destroy_menu/pipboy/sentry_active.res b/resource/ui/destroy_menu/pipboy/sentry_active.res
index 1c8bf1c..4b297de 100644
--- a/resource/ui/destroy_menu/pipboy/sentry_active.res
+++ b/resource/ui/destroy_menu/pipboy/sentry_active.res
@@ -1,28 +1,26 @@
 "Resource/UI/destroy_menu/sentry_active.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -31,46 +29,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"24"
+		"ypos"			"20"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"0 255 0 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"10"
-		"ypos"			"8"
+		"xpos"			"20"
+		"ypos"			"16"
 		"zpos"			"2"
-		"wide"			"80"
-		"tall"			"80"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_sentrygun_1"
 		"iconColor"		"0 255 0 255"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -79,19 +77,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -99,12 +97,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/sentry_inactive.res b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
index 07ec966..addccb5 100644
--- a/resource/ui/destroy_menu/pipboy/sentry_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/sentry_inactive.res
@@ -1,28 +1,27 @@
 "Resource/UI/destroy_menu/sentry_inactive.res"
 {
-	"ItemNameLabel"
-	{	
+"ItemNameLabel"
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -31,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -57,29 +56,30 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
+
 	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}		
-			
-	"NumberBg"	
+	}
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -88,19 +88,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -108,12 +108,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/tele_entrance_active.res b/resource/ui/destroy_menu/pipboy/tele_entrance_active.res
index 2b6d6cf..6400014 100644
--- a/resource/ui/destroy_menu/pipboy/tele_entrance_active.res
+++ b/resource/ui/destroy_menu/pipboy/tele_entrance_active.res
@@ -1,27 +1,27 @@
 "Resource/UI/destroy_menu/tele_entrance_active.res"
 {
-	"ItemNameLabel"
-	{	
+"ItemNameLabel"
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Tele_Entrance_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,46 +30,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"26"
+		"ypos"			"30"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"0 255 0 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
 		"xpos"			"20"
-		"ypos"			"30"
+		"ypos"			"19"
 		"zpos"			"2"
-		"wide"			"60"
-		"tall"			"60"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_tele_entrance"
 		"iconColor"		"0 255 0 128"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -78,19 +78,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -98,12 +98,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"3"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res b/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
index 45418b4..94f2cac 100644
--- a/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_entrance_inactive.res
@@ -1,27 +1,27 @@
 "Resource/UI/build_menu/tele_entrance_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_tele_entrance_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -56,29 +56,31 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
-	}	
+
+	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
-			
-	"NumberBg"	
+	}
+
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -87,19 +89,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -107,12 +109,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"3"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/tele_exit_active.res b/resource/ui/destroy_menu/pipboy/tele_exit_active.res
index 0f1e1f0..422ecfd 100644
--- a/resource/ui/destroy_menu/pipboy/tele_exit_active.res
+++ b/resource/ui/destroy_menu/pipboy/tele_exit_active.res
@@ -1,27 +1,27 @@
 "Resource/UI/destroy_menu/tele_exit_active.res"
 {
-	"ItemNameLabel"
-	{	
+"ItemNameLabel"
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Tele_Exit_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,46 +30,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"26"
+		"ypos"			"30"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"0 255 0 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
 		"xpos"			"20"
-		"ypos"			"30"
+		"ypos"			"19"
 		"zpos"			"2"
-		"wide"			"60"
-		"tall"			"60"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_tele_exit"
 		"iconColor"		"0 255 0 128"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -78,19 +78,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -98,12 +98,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"4"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res b/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
index 10f3a58..4bf2490 100644
--- a/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
+++ b/resource/ui/destroy_menu/pipboy/tele_exit_inactive.res
@@ -1,27 +1,27 @@
 "Resource/UI/build_menu/tele_exit_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_tele_exit_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"0 0 0 255"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -56,30 +56,32 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
-	}	
+
+	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"fgcolor"		"0 255 0 255"
-	}	
-			
-	"NumberBg"	
+	}
+
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -88,19 +90,19 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"0 255 0 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
-		"fgcolor"		"Black"
+		"fgcolor"		"0 255 0 255"
 		"xpos"			"0"
 		"ypos"			"98"
 		"zpos"			"1"
@@ -108,12 +110,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"4"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
-		"fgcolor"		"0 255 0 255"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/sentry_active.res b/resource/ui/destroy_menu/sentry_active.res
index 6cb88a6..05e2b28 100644
--- a/resource/ui/destroy_menu/sentry_active.res
+++ b/resource/ui/destroy_menu/sentry_active.res
@@ -1,27 +1,26 @@
 "Resource/UI/destroy_menu/sentry_active.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,46 +29,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhite"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"24"
+		"ypos"			"20"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"255 255 255 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
-		"xpos"			"10"
-		"ypos"			"8"
+		"xpos"			"20"
+		"ypos"			"16"
 		"zpos"			"2"
-		"wide"			"80"
-		"tall"			"80"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_sentrygun_1"
 		"iconColor"		"255 255 255 128"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -78,15 +77,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -98,11 +97,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/sentry_inactive.res b/resource/ui/destroy_menu/sentry_inactive.res
index 7b0caf0..a64fd6d 100644
--- a/resource/ui/destroy_menu/sentry_inactive.res
+++ b/resource/ui/destroy_menu/sentry_inactive.res
@@ -1,27 +1,27 @@
 "Resource/UI/destroy_menu/sentry_inactive.res"
 {
-	"ItemNameLabel"
-	{	
+"ItemNameLabel"
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Sentry"
-		"labelText_lodef"		"#TF_Object_Sentry_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -30,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhiteTransparent"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -55,29 +55,31 @@
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 0 0 200"
+
 	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}		
-			
-	"NumberBg"	
+	}
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -86,15 +88,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -106,11 +108,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"1"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/tele_entrance_active.res b/resource/ui/destroy_menu/tele_entrance_active.res
index acdbfe4..48a7ca4 100644
--- a/resource/ui/destroy_menu/tele_entrance_active.res
+++ b/resource/ui/destroy_menu/tele_entrance_active.res
@@ -1,26 +1,27 @@
 "Resource/UI/destroy_menu/tele_entrance_active.res"
 {
-	"ItemNameLabel"
-	{	
+"ItemNameLabel"
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Tele_Entrance_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -29,46 +30,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhite"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"26"
+		"ypos"			"30"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"255 255 255 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
 		"xpos"			"20"
-		"ypos"			"30"
+		"ypos"			"19"
 		"zpos"			"2"
-		"wide"			"60"
-		"tall"			"60"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_tele_entrance"
 		"iconColor"		"255 255 255 128"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -77,15 +78,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -97,11 +98,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"3"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/tele_entrance_inactive.res b/resource/ui/destroy_menu/tele_entrance_inactive.res
index 0bc06d8..6a14f70 100644
--- a/resource/ui/destroy_menu/tele_entrance_inactive.res
+++ b/resource/ui/destroy_menu/tele_entrance_inactive.res
@@ -1,26 +1,27 @@
 "Resource/UI/build_menu/tele_entrance_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_tele_entrance_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -29,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhiteTransparent"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -54,29 +55,32 @@
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
+		"fgcolor"		"255 0 0 200"
+
+	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
-			
-	"NumberBg"	
+	}
+
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -85,15 +89,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -105,11 +109,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"3"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/tele_exit_active.res b/resource/ui/destroy_menu/tele_exit_active.res
index d2b65a9..725112b 100644
--- a/resource/ui/destroy_menu/tele_exit_active.res
+++ b/resource/ui/destroy_menu/tele_exit_active.res
@@ -1,26 +1,27 @@
 "Resource/UI/destroy_menu/tele_exit_active.res"
 {
-	"ItemNameLabel"
-	{	
+"ItemNameLabel"
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_Tele_Exit_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -29,46 +30,46 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhite"
 	}
-	
-	"DestroyIcon"	
+
+	"DestroyIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"DestroyIcon"
-		"xpos"			"13"
-		"ypos"			"18"
-		"zpos"			"1"
-		"wide"			"70"
-		"tall"			"70"
+		"xpos"			"26"
+		"ypos"			"30"
+		"zpos"			"3"
+		"wide"			"16"
+		"tall"			"16"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_demolish"
 		"iconColor"		"255 255 255 255"
 	}
-		
-	"BuildingIcon"	
+
+	"BuildingIcon"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"BuildingIcon"
 		"xpos"			"20"
-		"ypos"			"30"
+		"ypos"			"19"
 		"zpos"			"2"
-		"wide"			"60"
-		"tall"			"60"
+		"wide"			"28"
+		"tall"			"28"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"obj_status_tele_exit"
 		"iconColor"		"255 255 255 128"
 	}
-		
-	"NumberBg"	
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -77,15 +78,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 255"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -97,11 +98,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"4"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/destroy_menu/tele_exit_inactive.res b/resource/ui/destroy_menu/tele_exit_inactive.res
index 87ea297..9328ede 100644
--- a/resource/ui/destroy_menu/tele_exit_inactive.res
+++ b/resource/ui/destroy_menu/tele_exit_inactive.res
@@ -1,26 +1,27 @@
 "Resource/UI/build_menu/tele_exit_inactive.res"
 {
 	"ItemNameLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ItemNameLabel"
-		"font"			"Default"
-		"xpos"			"6"
-		"ypos"			"0"
+		"font"			"HudFont12"
+		"xpos"			"3"
+		"ypos"			"2"
 		"zpos"			"1"
-		"wide"			"84"
+		"wide"			"60"
 		"tall"			"15"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"#TF_Object_tele_exit_360"
-		"textAlignment"	"Left"
+		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
+		"fgcolor"		"255 255 255 255"
 	}
-	
-	"ItemBackground"	
+
+	"ItemBackground"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"ItemBackground"
@@ -29,22 +30,22 @@
 		"zpos"			"0"
 		"wide"			"98"
 		"tall"			"105"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"hud_menu_item_bg_outline"
 		"iconColor"		"ProgressOffWhiteTransparent"
 	}
-	
+
 	"NotBuiltLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NotBuiltLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"HudFont9"
+		"xpos"			"3"
+		"ypos"			"24"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"60"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -54,29 +55,32 @@
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
+		"fgcolor"		"255 0 0 200"
+
+	}
 
 	"UnavailableLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"UnavailableLabel"
-		"font"			"Default"
-		"xpos"			"10"
-		"ypos"			"48"
+		"font"			"DefaultSmall"
+		"xpos"			"6"
+		"ypos"			"36"
 		"zpos"			"2"
-		"wide"			"80"
+		"wide"			"56"
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
-		"enabled"		"1"
+		"enabled"		"0"
 		"labelText"		"#Hud_Menu_Build_Unavailable"
 		"textAlignment"	"Center"
 		"dulltext"		"0"
 		"brighttext"	"0"
-	}	
-			
-	"NumberBg"	
+	}
+
+
+	"NumberBg"
 	{
 		"ControlName"	"CIconPanel"
 		"fieldName"		"NumberBg"
@@ -85,15 +89,15 @@
 		"zpos"			"0"
 		"wide"			"18"
 		"tall"			"18"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"icon"			"ico_key_blank"
 		"iconColor"		"255 255 255 128"
 	}
-	
+
 	"NumberLabel"
-	{	
+	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"NumberLabel"
 		"font"			"HudMenuNumberFont"
@@ -105,11 +109,11 @@
 		"tall"			"18"
 		"autoResize"	"0"
 		"pinCorner"		"0"
-		"visible"		"1"
+		"visible"		"0"
 		"enabled"		"1"
 		"labelText"		"4"
 		"textAlignment"	"Center"
 		"dulltext"		"1"
 		"brighttext"	"0"
 	}
-}
\ No newline at end of file
+}
diff --git a/resource/ui/disguise_menu/hudmenuspydisguise.res b/resource/ui/disguise_menu/hudmenuspydisguise.res
index 8f0762e..a4deb67 100644
--- a/resource/ui/disguise_menu/hudmenuspydisguise.res
+++ b/resource/ui/disguise_menu/hudmenuspydisguise.res
@@ -100,7 +100,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"DisguiseTitle"
-		"font"			"surface15shadow"
+		"font"			"HudFont15shadow"
 		"labelText"		"#Hud_Menu_Disguise_Title"
 		"textAlignment"	"center"
 		"xpos"			"0"
diff --git a/resource/ui/hudplayerhealth.res b/resource/ui/hudplayerhealth.res
index f29c730..0b66e3d 100644
--- a/resource/ui/hudplayerhealth.res
+++ b/resource/ui/hudplayerhealth.res
@@ -5,52 +5,23 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"HudPlayerHealth"
-		"xpos"			"c-255"
-		"ypos"			"c75"
+		"xpos"			"0"
+		"ypos"			"0"
 		"zpos"			"2"
 		"wide"			"f0"
-		"tall"			"480"
+		"tall"			"f0"
 		"visible"		"1"
 		"enabled"		"1"
 		"HealthBonusPosAdj"	"35"
 		"HealthDeathWarning"	"0.49"
 		"HealthDeathWarningColor"	"HUDDeathWarning"
 	}
-	"PlayerStatusHealthImage"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthImage"
-		"xpos"			"75"
-		"xpos_minmode"	"60"
-		"ypos"			"35"
-		"zpos"			"4"
-		"wide"			"51"
-		"tall"			"51"
-		"visible"		"0"
-		"enabled"		"0"
-		"scaleImage"	"1"
-	}
-	"PlayerStatusHealthImageBG"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthImageBG"
-		"xpos"			"73"
-		"xpos_minmode"	"58"
-		"ypos"			"33"
-		"zpos"			"3"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"image"			"../hud/health_bg"
-		"scaleImage"	"1"
-	}
 	"PlayerStatusHealthBonusImage"
 	{
 		"ControlName"	"ImagePanel"
 		"fieldName"		"PlayerStatusHealthBonusImage"
-		"xpos"			"88"	[$WIN32]
-		"ypos"			"30"	[$WIN32]
+		"xpos"			"c-165"	[$WIN32]
+		"ypos"			"c106"	[$WIN32]
 		"zpos"			"2"
 		"wide"			"55"	[$WIN32]
 		"tall"			"55"	[$WIN32]
@@ -63,8 +34,8 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"PlayerStatusHealthValue"
-		"xpos"			"66"
-		"ypos"			"40"	[$WIN32]
+		"xpos"			"c-188"
+		"ypos"			"c115"	[$WIN32]
 		"zpos"			"5"
 		"wide"			"100"
 		"tall"			"36"
@@ -134,12 +105,14 @@
 	{
 		"ControlName"								"EditablePanel"
 		"fieldName"									"PlayerStatusAnchor"
-		"xpos"										"c-130"
-		"ypos"										"-23"
-		"wide"										"10"
+		"xpos"										"-35"
+		"ypos"										"-30"
+		"wide"										"0"
 		"tall"										"80"
 		"visible"									"1"
 		"enabled"									"1"
+
+		"pin_to_sibling"							"PlayerStatusHealthValue"
 		"pin_corner_to_sibling"						"PIN_CENTER_RIGHT"
 		"pin_to_sibling_corner"						"PIN_CENTER_LEFT"
 	}
@@ -154,8 +127,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -172,8 +145,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -190,8 +163,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -208,8 +181,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -226,8 +199,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -244,8 +217,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -262,8 +235,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -280,8 +253,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -298,8 +271,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -316,8 +289,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -334,8 +307,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -352,8 +325,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -370,8 +343,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -388,8 +361,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -406,8 +379,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -424,8 +397,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -442,8 +415,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"0"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -460,8 +433,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -478,8 +451,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -496,8 +469,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -514,8 +487,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -532,8 +505,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -550,8 +523,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -568,8 +541,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -586,8 +559,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -604,8 +577,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -622,8 +595,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -640,8 +613,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -658,8 +631,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -676,8 +649,8 @@
 		"xpos"										"0"
 		"ypos"										"0"
 		"zpos"										"7"
-		"wide"										"32"
-		"tall"										"32"
+		"wide"										"30"
+		"tall"										"30"
 		"visible"									"1"
 		"enabled"									"1"
 		"scaleImage"								"1"
@@ -687,4 +660,31 @@
 		"pin_corner_to_sibling"						"PIN_CENTER_RIGHT"
 		"pin_to_sibling_corner"						"PIN_CENTER_LEFT"
 	}
+
+
+
+	//==================================================================================================================================================
+	// REMOVED ELEMENTS
+	//==================================================================================================================================================
+
+	"PlayerStatusHealthImage"
+	{
+		"ControlName"								"ImagePanel"
+		"fieldName"									"PlayerStatusHealthImage"
+		"wide"										"0"
+		"tall"										"0"
+		"visible"									"0"
+		"enabled"									"0"
+	}
+	"PlayerStatusHealthImageBG"
+	{
+		"ControlName"								"ImagePanel"
+		"fieldName"									"PlayerStatusHealthImageBG"
+		"xpos"										"9999"
+		"ypos"										"9999"
+		"wide"										"0"
+		"tall"										"0"
+		"visible"									"0"
+		"enabled"									"0"
+	}
 }
diff --git a/resource/ui/objectivestatusescort.res b/resource/ui/objectivestatusescort.res
index dc2e112..5e6738e 100644
--- a/resource/ui/objectivestatusescort.res
+++ b/resource/ui/objectivestatusescort.res
@@ -19,6 +19,14 @@
 			"ypos"									"rs1"
 		}
 	}
+	"EscortHilightSwoop" // removes swoop since it's broken anyways
+	{
+		"ControlName" "CControlPointIconSwoop"
+		"fieldName" "EscortHilightSwoop"
+		"xpos" "9999"
+		"alpha" "0"
+	}
+
 	"Cart_Tracks"
 	{
 		"ControlName"								"ImagePanel"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index cd58f85..57e366d 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -1,97 +1,77 @@
 "Resource/UI/winpanel.res"
+//Original File by Shredder for c-sharp hud
 {
 	"TeamScoresPanel"
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"		"TeamScoresPanel"
-		"xpos"			"-44"
-		"ypos"			"13"
+		"xpos"			"0"
+		"ypos"			"320"
 		"wide"			"480"
 		"tall"			"60"
 		"visible"		"1"
 
 		"BlueScoreBG"
 		{
-			"ControlName"	"EditablePanel"
+			"ControlName"		"EditablePanel"
 			"fieldName"		"BlueScoreBG"
-			"wide"			"0"
-			"tall"			"0"
+			"xpos"			"50"
+			"ypos"			"15"
+			"wide"			"135"
+			"tall"			"40"
+			"autoResize"	"0"
+			"pinCorner"		"0"
 			"visible"		"0"
 			"enabled"		"0"
+
+			"border"		"TFFatLineBorderBlueBGMoreOpaque"
 		}
 		"RedScoreBG"
 		{
 			"ControlName"	"EditablePanel"
 			"fieldName"		"RedScoreBG"
-			"wide"			"0"
-			"tall"			"0"
-			"visible"		"0"
-			"enabled"		"0"
-		}
-		"BlueScoreBG2"
-		{
-			"ControlName"		"ImagePanel"
-			"fieldName"		"BlueScoreBG2"
-			"xpos"			"0"
-			"ypos"			"10"
-			"wide"			"240"
-			"tall"			"50"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"0"
-			"enabled"		"0"
-			"image"			"../hud/winpanel_blue_bg_team"
-			"image_lodef"	"../hud/winpanel_blue_bg_team_lodef"
-			"scaleImage"		"1"
-		}
-		"RedScoreBG2"
-		{
-			"ControlName"		"ImagePanel"
-			"fieldName"		"RedScoreBG2"
-			"xpos"			"140"
-			"ypos"			"10"
-			"wide"			"240"
-			"tall"			"50"
+			"xpos"			"197"
+			"ypos"			"15"
+			"wide"			"135"
+			"tall"			"40"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"0"
 			"enabled"		"0"
-			"image"			"../hud/winpanel_red_bg_team"
-			"image_lodef"	"../hud/winpanel_red_bg_team_lodef"
-			"scaleImage"		"1"
+
+			"border"		"TFFatLineBorderRedBGMoreOpaque"
 		}
 		"BlueTeamLabel"
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"BlueTeamLabel"
-			"font"			"HudFont12Shadow"
+			"font"			"HudFontBold14"
 			"labelText"		"%blueteamname%"
-			"textAlignment"		"west"
-			"xpos"			"76"
-			"ypos"			"25"
+			"textAlignment"		"north-west"
+			"xpos"			"5"
+			"ypos"			"-1"
+			"zpos"			"10"
 			"wide"			"100"
 			"tall"			"20"
-			"tall_lodef"	"24"
-			"tall_hidef"	"24"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"fgcolor"		"THBlue"
+			"allcaps"		"1"
 		}
 		"BlueTeamScore"
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"BlueTeamScore"
-			"font"			"HudFont52"
+			"font"			"HudFont18Shadow"
 			"labelText"		"%blueteamscore%"
-			"textAlignment"		"east"
-			"xpos"			"95"
-			"ypos"			"0"
+			"textAlignment"		"north-east"
+			"xpos"			"8"
+			"ypos"			"-3"
 			"zpos"			"3"
-			"wide"			"80"
+			"wide"			"100"
 			"tall"			"50"
-			"tall_lodef"	"80"
-			"tall_hidef"	"75"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -101,54 +81,79 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"BlueTeamScoreDropshadow"
-			"font"			"HudFont52"
+			"font"			"ScoreboardTeamScore"
 			"fgcolor"		"Black"
 			"labelText"		"%blueteamscore%"
 			"textAlignment"		"east"
-			"xpos"			"96"
+			"xpos"			"81"
 			"ypos"			"1"
 			"zpos"			"3"
-			"wide"			"80"
+			"wide"			"100"
 			"tall"			"50"
-			"tall_lodef"	"80"
-			"tall_hidef"	"75"
 			"autoResize"	"0"
 			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"0"
+		}
+		"BlueLeaderAvatar"
+		{
+			"ControlName"		"CAvatarImagePanel"
+			"fieldName"		"BlueLeaderAvatar"
+			"xpos"			"r0"
+			"ypos"			"r0"
+			"zpos"			"5"
+			"wide"			"0"
+			"tall"			"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"image"			""
+			"scaleImage"	"1"
+			"color_outline"	"52 48 45 255"
+		}
+		"BlueLeaderAvatarBG"
+		{
+			"ControlName"	"EditablePanel"
+			"fieldName"		"BlueLeaderAvatarBG"
+			"xpos"			"r0"
+			"ypos"			"r0"
+			"zpos"			"4"
+			"wide"			"0"
+			"tall"			"0"
+			"visible"		"1"
+			"PaintBackgroundType"	"2"
+			"bgcolor_override"	"117 107 94 255"
 		}
 		"RedTeamLabel"
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"RedTeamLabel"
-			"font"			"HudFont12Shadow"
+			"font"			"HudFontBold14"
 			"labelText"		"%redteamname%"
-			"textAlignment"		"east"
-			"xpos"			"204"
-			"ypos"			"25"
+			"textAlignment"		"north-east"
+			"xpos"			"122"
+			"ypos"			"-1"
+			"zpos"			"10"
 			"wide"			"100"
 			"tall"			"20"
-			"tall_lodef"	"24"
-			"tall_hidef"	"24"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"fgcolor"		"THRed"
+			"allcaps"		"1"
 		}
 		"RedTeamScore"
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"RedTeamScore"
-			"font"			"HudFont52"
+			"font"			"HudFont18Shadow"
 			"labelText"		"%redteamscore%"
-			"textAlignment"		"west"
-			"xpos"			"207"
-			"ypos"			"0"
+			"textAlignment"		"north-west"
+			"xpos"			"119"
+			"ypos"			"-3"
 			"zpos"			"3"
-			"wide"			"80"
+			"wide"			"100"
 			"tall"			"50"
-			"tall_lodef"	"80"
-			"tall_hidef"	"75"
 			"autoResize"	"0"
 			"pinCorner"		"0"
 			"visible"		"1"
@@ -158,55 +163,98 @@
 		{
 			"ControlName"		"CExLabel"
 			"fieldName"		"RedTeamScoreDropshadow"
-			"font"			"HudFont52"
+			"font"			"ScoreboardTeamScore"
 			"fgcolor"		"Black"
 			"labelText"		"%redteamscore%"
 			"textAlignment"		"west"
-			"xpos"			"208"
+			"xpos"			"203"
 			"ypos"			"1"
 			"zpos"			"3"
-			"wide"			"80"
+			"wide"			"100"
 			"tall"			"50"
-			"tall_lodef"	"80"
-			"tall_hidef"	"75"
 			"autoResize"	"0"
 			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"0"
+		}
+		"RedLeaderAvatar"
+		{
+			"ControlName"		"CAvatarImagePanel"
+			"fieldName"		"RedLeaderAvatar"
+			"xpos"			"r0"
+			"ypos"			"r0"
+			"zpos"			"5"
+			"wide"			"0"
+			"tall"			"0"
 			"visible"		"1"
 			"enabled"		"1"
+			"image"			""
+			"scaleImage"	"1"
+			"color_outline"	"52 48 45 255"
+		}
+		"RedLeaderAvatarBG"
+		{
+			"ControlName"	"EditablePanel"
+			"fieldName"		"RedLeaderAvatarBG"
+			"xpos"			"r0"
+			"ypos"			"r0"
+			"zpos"			"4"
+			"wide"			"0"
+			"tall"			"0"
+			"visible"		"1"
+			"PaintBackgroundType"	"2"
+			"bgcolor_override"	"117 107 94 255"
 		}
 
+		//== custom ==
+
+		"BlueScoreBG2"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"BlueScoreBG2"
+			"wide"			"113"
+			"tall"			"13"
+			"visible"		"1"
+			"fillcolor"		"TransparentBlack"
+			"border"		"WinPanelBlueScore"
+		}
+		"RedScoreBG2"
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"RedScoreBG2"
+			"xpos"			"113"
+			"wide"			"113"
+			"tall"			"13"
+			"visible"		"1"
+			"fillcolor"		"TransparentBlack"
+			"border"		"WinPanelRedScore"
+		}
 	}
-	"WinPanelBG"
-	{
-		"ControlName"		"ImagePanel"
-		"fieldName"		"WinPanelBG"
-		"xpos"			"-102"
-		"ypos"			"50"
-		"zpos"			"0"
-		"wide"			"496"
-		"tall"			"174"
-		"visible"		"0"
-		"enabled"		"0"
-		"scaleImage"		"1"
-	}
+
 	"WinPanelBGBorder"
 	{
-		"ControlName"	"EditablePanel"
+		"ControlName"		"EditablePanel"
 		"fieldName"		"WinPanelBGBorder"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"		"0"
-		"enabled"		"0"
+		"xpos"			"0"
+		"ypos"			"332"
+		"zpos"			"-1"
+		"wide"			"226"
+		"tall"			"2"
+		"visible"		"1"
+		"enabled"		"1"
+		"scaleImage"		"1"
+		"border"		"TFFatLineBorderBlueBG"
+		"proportionaltoparent"	"1"
 	}
 	"WinningTeamLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"WinningTeamLabel"
-		"font"			"HudFont12Shadow"
-		"xpos"			"0"
-		"ypos"			"72"
+		"font"			"TF2Build18"
+		"xpos"			"-20"
+		"ypos"			"0"
 		"zpos"			"1"
-		"wide"			"292"
+		"wide"			"268"
 		"tall"			"24"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -221,12 +269,12 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"WinningTeamLabelDropshadow"
-		"font"			"HudFont12Shadow"
-		"fgcolor"		"black"
-		"xpos"			"1"
-		"ypos"			"73"
+		"font"			"TF2Build18"
+		"fgcolor"		"0 0 0 248"
+		"xpos"			"-19"
+		"ypos"			"1"
 		"zpos"			"1"
-		"wide"			"292"
+		"wide"			"268"
 		"tall"			"24"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -241,12 +289,12 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"AdvancingTeamLabel"
-		"font"			"ScoreboardMedium"
-		"xpos"			"0"
-		"ypos"			"72"
+		"font"			"TF2Build18"
+		"xpos"			"-20"
+		"ypos"			"0"
 		"zpos"			"1"
-		"wide"			"292"
-		"tall"			"20"
+		"wide"			"268"
+		"tall"			"24"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -260,13 +308,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"AdvancingTeamLabelDropshadow"
-		"font"			"ScoreboardMedium"
-		"fgcolor"		"black"
-		"xpos"			"1"
-		"ypos"			"73"
+		"font"			"TF2Build18"
+		"fgcolor"		"0 0 0 248"
+		"xpos"			"-19"
+		"ypos"			"1"
 		"zpos"			"1"
-		"wide"			"292"
-		"tall"			"20"
+		"wide"			"268"
+		"tall"			"24"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
@@ -280,65 +328,65 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"WinReasonLabel"
-		"font"			"ScoreboardVerySmall"
-		"xpos"			"0"
-		"ypos"			"89"
+		"font"			"HudFont10"
+		"xpos"			"-20"
+		"ypos"			"17"
 		"zpos"			"1"
-		"wide"			"292"
-		"tall"			"20"
+		"wide"			"268"
+		"tall"			"30"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%WinReasonLabel%"
-		"textAlignment"		"Center"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"centerwrap"	"1"
 	}
 	"DetailsLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"DetailsLabel"
-		"font"			"ScoreboardVerySmall"
-		"xpos"			"12"
-		"ypos"			"101"
+		"font"			"HudFont10"
+		"xpos"			"-20"
+		"ypos"			"37"
 		"zpos"			"1"
-		"wide"			"268"
-		"tall"			"20"
+		"wide"			"269"
+		"tall"			"48"
 		"autoResize"		"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%DetailsLabel%"
-		"textAlignment"		"Center"
+		"textAlignment"		"North"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"centerwrap"	"1"
 	}
 	"ShadedBar"
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"ShadedBar"
-		"xpos"			"12"
-		"ypos"			"116"
+		"xpos"			"0"
+		"ypos"			"334"
 		"zpos"			"2"
-		"wide"			"268"
-		"tall"			"84"
+		"wide"			"226"
+		"tall"			"72"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
 		"fillcolor"		"0 0 0 150"
-		"fillcolor_lodef"		"0 0 0 200"
 		"PaintBackgroundType"	"0"
 	}
 	"TopPlayersLabel"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"TopPlayerLabel"
-		"font"			"ScoreboardVerySmall"
-		"xpos"			"15"
-		"ypos"			"114"
+		"font"			"HudFont8"
+		"xpos"			"6"
+		"ypos"			"328"
 		"zpos"			"3"
 		"wide"			"200"
 		"tall"			"20"
@@ -355,9 +403,9 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"PointsThisRoundLabel"
-		"font"			"ScoreboardVerySmall"
-		"xpos"			"136"
-		"ypos"			"114"
+		"font"			"HudFont8"
+		"xpos"			"82"
+		"ypos"			"328"
 		"zpos"			"3"
 		"wide"			"140"
 		"tall"			"20"
@@ -374,10 +422,10 @@
 	{
 		"ControlName"		"ImagePanel"
 		"fieldName"		"HorizontalLine"
-		"xpos"			"15"
-		"ypos"			"129"
+		"xpos"			"5"
+		"ypos"			"342"
 		"zpos"			"3"
-		"wide"			"260"
+		"wide"			"216"
 		"tall"			"1"
 		"autoResize"	"0"
 		"pinCorner"		"0"
@@ -387,15 +435,29 @@
 		"fillcolor"		"250 234 201 255"
 		"PaintBackgroundType"	"0"
 	}
-	"Player1Avatar"		[$WIN32]
+	"Player1Badge"
 	{
-		"ControlName"		"CAvatarImagePanel"
-		"fieldName"		"Player1Avatar"
-		"xpos"			"22"
-		"ypos"			"135"
+		"ControlName"	"CTFBadgePanel"
+		"fieldName"		"Player1Badge"
+		"xpos"			"5"
+		"ypos"			"343"
 		"zpos"			"3"
 		"wide"			"14"
 		"tall"			"14"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+	}
+	"Player1Avatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"Player1Avatar"
+		"xpos"			"23"
+		"ypos"			"344"
+		"zpos"			"3"
+		"wide"			"12"
+		"tall"			"12"
 		"visible"		"1"
 		"enabled"		"1"
 		"image"			""
@@ -406,12 +468,10 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player1Name"
-		"xpos"			"50"	[$WIN32]
-		"xpos"			"14"	[$X360]
-		"ypos"			"132"
+		"xpos"			"38"
+		"ypos"			"340"
 		"zpos"			"3"
-		"wide"			"128"	[$WIN32]
-		"wide"			"150"	[$X360]
+		"wide"			"94"
 		"tall"			"20"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -421,13 +481,14 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
 	"Player1Class"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player1Class"
-		"xpos"			"180"
-		"ypos"			"132"
+		"xpos"			"134"
+		"ypos"			"340"
 		"zpos"			"3"
 		"wide"			"200"
 		"tall"			"20"
@@ -439,13 +500,14 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
 	"Player1Score"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player1Score"
-		"xpos"			"240"
-		"ypos"			"132"
+		"xpos"			"191"
+		"ypos"			"340"
 		"zpos"			"3"
 		"wide"			"30"
 		"tall"			"20"
@@ -457,16 +519,31 @@
 		"textAlignment"		"east"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
-	"Player2Avatar"		[$WIN32]
+	"Player2Badge"
 	{
-		"ControlName"		"CAvatarImagePanel"
-		"fieldName"		"Player2Avatar"
-		"xpos"			"22"
-		"ypos"			"157"
+		"ControlName"	"CTFBadgePanel"
+		"fieldName"		"Player2Badge"
+		"xpos"			"5"
+		"ypos"			"356"
 		"zpos"			"3"
 		"wide"			"14"
 		"tall"			"14"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+	}
+	"Player2Avatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"Player2Avatar"
+		"xpos"			"23"
+		"ypos"			"357"
+		"zpos"			"3"
+		"wide"			"12"
+		"tall"			"12"
 		"visible"		"1"
 		"enabled"		"1"
 		"image"			""
@@ -477,12 +554,10 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player2Name"
-		"xpos"			"50"	[$WIN32]
-		"xpos"			"14"	[$X360]
-		"ypos"			"154"
+		"xpos"			"38"
+		"ypos"			"353"
 		"zpos"			"3"
-		"wide"			"128"	[$WIN32]
-		"wide"			"150"	[$X360]
+		"wide"			"94"
 		"tall"			"20"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -492,13 +567,14 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
 	"Player2Class"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player2Class"
-		"xpos"			"180"
-		"ypos"			"154"
+		"xpos"			"134"
+		"ypos"			"353"
 		"zpos"			"3"
 		"wide"			"200"
 		"tall"			"20"
@@ -510,13 +586,14 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
 	"Player2Score"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player2Score"
-		"xpos"			"240"
-		"ypos"			"154"
+		"xpos"			"191"
+		"ypos"			"353"
 		"zpos"			"3"
 		"wide"			"30"
 		"tall"			"20"
@@ -528,16 +605,31 @@
 		"textAlignment"		"east"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
-	"Player3Avatar"		[$WIN32]
+	"Player3Badge"
 	{
-		"ControlName"		"CAvatarImagePanel"
-		"fieldName"		"Player3Avatar"
-		"xpos"			"22"
-		"ypos"			"179"
+		"ControlName"	"CTFBadgePanel"
+		"fieldName"		"Player3Badge"
+		"xpos"			"5"
+		"ypos"			"369"
 		"zpos"			"3"
 		"wide"			"14"
 		"tall"			"14"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+	}
+	"Player3Avatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"Player3Avatar"
+		"xpos"			"23"
+		"ypos"			"370"
+		"zpos"			"3"
+		"wide"			"12"
+		"tall"			"12"
 		"visible"		"1"
 		"enabled"		"1"
 		"image"			""
@@ -548,12 +640,10 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player3Name"
-		"xpos"			"50"	[$WIN32]
-		"xpos"			"14"	[$X360]
-		"ypos"			"176"
+		"xpos"			"38"
+		"ypos"			"366"
 		"zpos"			"3"
-		"wide"			"128"	[$WIN32]
-		"wide"			"150"	[$X360]
+		"wide"			"94"
 		"tall"			"20"
 		"autoResize"		"0"
 		"pinCorner"		"0"
@@ -563,13 +653,14 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
 	"Player3Class"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player3Class"
-		"xpos"			"180"
-		"ypos"			"176"
+		"xpos"			"134"
+		"ypos"			"366"
 		"zpos"			"3"
 		"wide"			"200"
 		"tall"			"20"
@@ -581,13 +672,158 @@
 		"textAlignment"		"west"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
 	"Player3Score"
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"		"Player3Score"
-		"xpos"			"240"
-		"ypos"			"176"
+		"xpos"			"191"
+		"ypos"			"366"
+		"zpos"			"3"
+		"wide"			"30"
+		"tall"			"20"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		""
+		"textAlignment"		"east"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"font"			"HudFont10"
+	}
+
+	// KillStreak
+	"KillStreakLeaderLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"KillStreakLeaderLabel"
+		"font"			"HudFont8"
+		"xpos"			"6"
+		"ypos"			"377"
+		"zpos"			"3"
+		"wide"			"200"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"#Winpanel_KillStreakLeader"
+		"textAlignment"	"west"
+		"dulltext"		"0"
+		"brighttext"	"0"
+	}
+	"KillStreakMaxCountLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"KillStreakMaxCountLabel"
+		"font"			"HudFont8"
+		"xpos"			"82"
+		"ypos"			"377"
+		"zpos"			"3"
+		"wide"			"140"
+		"tall"			"20"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"#Winpanel_KillStreakMaxCount"
+		"textAlignment"	"east"
+		"dulltext"		"0"
+		"brighttext"	"0"
+	}
+	"HorizontalLine2"
+	{
+		"ControlName"		"ImagePanel"
+		"fieldName"		"HorizontalLine2"
+		"xpos"			"5"
+		"ypos"			"391"
+		"zpos"			"3"
+		"wide"			"216"
+		"tall"			"1"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"tabPosition"	"0"
+		"fillcolor"		"250 234 201 255"
+		"PaintBackgroundType"	"0"
+	}
+	"KillStreakPlayer1Badge"
+	{
+		"ControlName"	"CTFBadgePanel"
+		"fieldName"		"KillStreakPlayer1Badge"
+		"xpos"			"5"
+		"ypos"			"392"
+		"zpos"			"3"
+		"wide"			"14"
+		"tall"			"14"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"0"
+		"enabled"		"1"
+	}
+	"KillStreakPlayer1Avatar"
+	{
+		"ControlName"		"CAvatarImagePanel"
+		"fieldName"		"KillStreakPlayer1Avatar"
+		"xpos"			"23"
+		"ypos"			"393"
+		"zpos"			"3"
+		"wide"			"12"
+		"tall"			"12"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			""
+		"scaleImage"		"1"
+		"color_outline"		"52 48 45 255"
+	}
+
+	"KillStreakPlayer1Name"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"KillStreakPlayer1Name"
+		"xpos"			"38"
+		"ypos"			"388"
+		"zpos"			"3"
+		"wide"			"94"
+		"tall"			"20"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		""
+		"textAlignment"		"west"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"font"			"HudFont10"
+	}
+	"KillStreakPlayer1Class"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"KillStreakPlayer1Class"
+		"xpos"			"134"
+		"ypos"			"388"
+		"zpos"			"3"
+		"wide"			"200"
+		"tall"			"20"
+		"autoResize"		"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		""
+		"textAlignment"		"west"
+		"dulltext"		"0"
+		"brighttext"		"0"
+		"font"			"HudFont10"
+	}
+	"KillStreakPlayer1Score"
+	{
+		"ControlName"		"CExLabel"
+		"fieldName"		"KillStreakPlayer1Score"
+		"xpos"			"191"
+		"ypos"			"388"
 		"zpos"			"3"
 		"wide"			"30"
 		"tall"			"20"
@@ -599,5 +835,6 @@
 		"textAlignment"		"east"
 		"dulltext"		"0"
 		"brighttext"		"0"
+		"font"			"HudFont10"
 	}
 }
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index 7d6c91c..e113fc4 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -860,10 +860,10 @@
 		"fieldName"				"WinPanel"
 		"visible"				"1"
 		"enabled"				"1"
-		"xpos"					"cs-0.5"
-		"ypos"					"275"
+		"xpos"					"c-113"
+		"ypos"					"74"
 		"wide"					"300"
-		"tall"					"300"
+		"tall"					"406"
 		"zpos"					"4"
 		"proportionaltoparent"	"1"
 	}
@@ -979,28 +979,28 @@
 		"PaintBackgroundType"	"2"
 	}
 
-	"HudMenuEngyBuild"
+	HudMenuEngyBuild
 	{
-		"fieldName" 	"HudMenuEngyBuild"
-		"visible" 		"1"
-		"enabled" 		"1"
-		"xpos"			"c-225"
-		"ypos"			"c-55"
-		"wide"			"450"
-		"tall"			"195"
-		"PaintBackgroundType"	"0"
+		"fieldName"					"HudMenuEngyBuild"
+		"visible"					"1"
+		"enabled"					"1"
+		"xpos"						"c-125"
+		"ypos"						"c-55"
+		"wide"						"250"
+		"tall"						"195"
+		"PaintBackgroundType"		"0"
 	}
 
-	"HudMenuEngyDestroy"
+	HudMenuEngyDestroy
 	{
-		"fieldName" 	"HudMenuEngyDestroy"
-		"visible" 		"1"
-		"enabled" 		"1"
-		"xpos"			"c-225"
-		"ypos"			"c-59"
-		"wide"			"450"
-		"tall"			"200"
-		"PaintBackgroundType"	"0"
+		"fieldName"					"HudMenuEngyDestroy"
+		"visible"					"1"
+		"enabled"					"1"
+		"xpos"						"c-125"
+		"ypos"						"c-50"
+		"wide"						"250"
+		"tall"						"195"
+		"PaintBackgroundType"		"0"
 	}
 
 	"HudEurekaEffectTeleportMenu"