58 changed files with 1579 additions and 1866 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,33 +0,0 @@
-root = true
-
-# Global
-[*]
-indent_style = unset
-indent_size = 4
-tab_width = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = unset
-
-# Unreal Engine 3 / Source
-[*.uc]
-indent_style = tab
-
-[*.{uci,upkg}]
-
-# Unreal Engine 3 / i18n
-[*.{chn,cht,cze,dan,deu,dut,esl,esn,fra,frc,hun,int,ita,jpn,kor,pol,por,ptb,rus,tur,ukr}]
-charset = utf-16le
-
-# Other
-[*.md]
-indent_style = space
-trim_trailing_whitespace = false
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.{txt,cfg,conf}]
-indent_style = tab
--- a/.github/workflows/mega-linter.yml
+++ b/.github/workflows/mega-linter.yml
@ -1,114 +0,0 @@
---
-name: MegaLinter
-
-permissions: read-all
-
-on:
-  push:
-  pull_request:
-    branches:
-      - master
-
-env:
-  APPLY_FIXES: none
-  APPLY_FIXES_EVENT: pull_request
-  APPLY_FIXES_MODE: commit
-  FILTER_REGEX_EXCLUDE: (mega-linter.yml)
-  DISABLE: SPELL
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  megalinter:
-    name: MegaLinter
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-        with:
-          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-
-      - name: MegaLinter
-        uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
-        id: ml
-        env:
-          VALIDATE_ALL_CODEBASE: true
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Archive production artifacts
-        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
-        if: success() || failure()
-        with:
-          name: MegaLinter reports
-          path: |
-            megalinter-reports
-            mega-linter.log
-
-      - name: Set APPLY_FIXES_IF var
-        run: |
-          printf 'APPLY_FIXES_IF=%s\n' "${{
-            steps.ml.outputs.has_updated_sources == 1 &&
-            (
-              env.APPLY_FIXES_EVENT == 'all' ||
-              env.APPLY_FIXES_EVENT == github.event_name
-            ) &&
-            (
-              github.event_name == 'push' ||
-              github.event.pull_request.head.repo.full_name == github.repository
-            )
-          }}" >> "${GITHUB_ENV}"
-
-      - name: Set APPLY_FIXES_IF_* vars
-        run: |
-          printf 'APPLY_FIXES_IF_PR=%s\n' "${{
-            env.APPLY_FIXES_IF == 'true' &&
-            env.APPLY_FIXES_MODE == 'pull_request'
-          }}" >> "${GITHUB_ENV}"
-          printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
-            env.APPLY_FIXES_IF == 'true' &&
-            env.APPLY_FIXES_MODE == 'commit' &&
-            (!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
-          }}" >> "${GITHUB_ENV}"
-
-      - name: Create Pull Request with applied fixes
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
-        id: cpr
-        if: env.APPLY_FIXES_IF_PR == 'true'
-        with:
-          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-          commit-message: "[MegaLinter] Apply linters automatic fixes"
-          title: "[MegaLinter] Apply linters automatic fixes"
-          labels: bot
-
-      - name: Create PR output
-        if: env.APPLY_FIXES_IF_PR == 'true'
-        run: |
-          echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
-          echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
-
-      - name: Prepare commit
-        if: env.APPLY_FIXES_IF_COMMIT == 'true'
-        run: sudo chown -Rc $UID .git/
-
-      - name: Commit and push applied linter fixes
-        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
-        if: env.APPLY_FIXES_IF_COMMIT == 'true'
-        with:
-          branch: >-
-            ${{
-              github.event.pull_request.head.ref ||
-              github.head_ref ||
-              github.ref
-            }}
-          commit_message: "[MegaLinter] Apply linters fixes"
-          commit_user_name: "github-actions"
-          commit_user_email: "github-actions[bot]@users.noreply.github.com"
--- a/Localization/CHN/YAS.CHN
+++ b/Localization/CHN/YAS.CHN
--- a/Localization/CHT/YAS.CHT
+++ b/Localization/CHT/YAS.CHT
--- a/Localization/CZE/YAS.CZE
+++ b/Localization/CZE/YAS.CZE
--- a/Localization/DAN/YAS.DAN
+++ b/Localization/DAN/YAS.DAN
--- a/Localization/DEU/YAS.DEU
+++ b/Localization/DEU/YAS.DEU
--- a/Localization/ESN/YAS.ESN
+++ b/Localization/ESN/YAS.ESN
--- a/Localization/FRA/YAS.FRA
+++ b/Localization/FRA/YAS.FRA
--- a/Localization/HUN/YAS.HUN
+++ b/Localization/HUN/YAS.HUN
--- a/Localization/INT/YAS.INT
+++ b/Localization/INT/YAS.INT
--- a/Localization/ITA/YAS.ITA
+++ b/Localization/ITA/YAS.ITA
--- a/Localization/JPN/YAS.JPN
+++ b/Localization/JPN/YAS.JPN
--- a/Localization/KOR/YAS.KOR
+++ b/Localization/KOR/YAS.KOR
--- a/Localization/POL/YAS.POL
+++ b/Localization/POL/YAS.POL
--- a/Localization/POR/YAS.POR
+++ b/Localization/POR/YAS.POR
--- a/Localization/PTB/YAS.PTB
+++ b/Localization/PTB/YAS.PTB
--- a/Localization/RUS/YAS.RUS
+++ b/Localization/RUS/YAS.RUS
--- a/Localization/TUR/YAS.TUR
+++ b/Localization/TUR/YAS.TUR
--- a/Localization/UKR/YAS.UKR
+++ b/Localization/UKR/YAS.UKR
--- a/PublicationContent/description.txt
+++ b/PublicationContent/description.txt
@ -15,7 +15,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
 [*]Subscribe to this mutator;
 [*]Start KF2; 
 [*]Open console (`) and input:
-[b]open KF-BioticsLab?Mutator=YAS.Mut?[/b]
+[b]open KF-BioticsLab?Mutator=YAS.YASMut?[/b]
 (replace the map and add the parameters you need)
 [*]<Enter>.
 [/olist]
@ -30,7 +30,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
 [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
 [b]ServerSubscribedWorkshopItems=2521826524[/b]
 [*]Start the server and wait until the mutator is downloading;
-[*]Add mutator to server start parameters: [b]?Mutator=YAS.Mut[/b] and restart the server.
+[*]Add mutator to server start parameters: [b]?Mutator=YAS.YASMut[/b] and restart the server.
 [/olist]

 [h1]Important setup information[/h1]
@ -110,10 +110,7 @@ If you need a SteamID64 for a steam group, open the group in a browser and add t
 [img]https://raw.githubusercontent.com/GenZmeY/KF2-YetAnotherScoreboard/master/PublicationContent/ID4.png[/img]

 [h1]Notes[/h1]
-📌 VersusSurvival mode not supported.
-
-[h1]Translators:[/h1]
-[url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
+📌 VersusSurvival mode not supported (yet).

 [h1]Sources[/h1]
 [url=https://github.com/GenZmeY/KF2-YetAnotherScoreboard]https://github.com/GenZmeY/KF2-YetAnotherScoreboard[/url] [b](GNU GPLv3)[/b]
--- a/README.md
+++ b/README.md
@ -3,22 +3,22 @@
 [![Steam Workshop](https://img.shields.io/static/v1?message=workshop&logo=steam&labelColor=gray&color=blue&logoColor=white&label=steam%20)](https://steamcommunity.com/sharedfiles/filedetails/?id=2521826524)
 [![Steam Downloads](https://img.shields.io/steam/downloads/2521826524)](https://steamcommunity.com/sharedfiles/filedetails/?id=2521826524)
 [![Steam Favorites](https://img.shields.io/steam/favorites/2521826524)](https://steamcommunity.com/sharedfiles/filedetails/?id=2521826524)
-[![MegaLinter](https://github.com/GenZmeY/KF2-YetAnotherScoreboard/actions/workflows/mega-linter.yml/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-YetAnotherScoreboard/actions/workflows/mega-linter.yml)
+[![Steam Update Date](https://img.shields.io/steam/update-date/2521826524)](https://steamcommunity.com/sharedfiles/filedetails/?id=2521826524)
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-YetAnotherScoreboard)](https://github.com/GenZmeY/KF2-YetAnotherScoreboard/tags)
 [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-YetAnotherScoreboard)](LICENSE)

-## Description
+# Description
 Yet another scoreboard...
 Based on the scoreboard from [ClassicHUD](https://steamcommunity.com/sharedfiles/filedetails/?id=1963099942) and heavily modified.

-## Usage
+# Usage
 [See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2521826524)

 ***

 **Note:** If you want to build/test/brew/publish a mutator without git-bash and/or scripts, follow [these instructions](https://tripwireinteractive.atlassian.net/wiki/spaces/KF2SW/pages/26247172/KF2+Code+Modding+How-to) instead of what is described here.

-## Build
+# Build
 1. Install [Killing Floor 2](https://store.steampowered.com/app/232090/Killing_Floor_2/), Killing Floor 2 - SDK and [git for windows](https://git-scm.com/download/win);
 2. open git-bash and go to any folder where you want to store sources:  
 `cd <ANY_FOLDER_YOU_WANT>`  
@ -31,7 +31,14 @@ Based on the scoreboard from [ClassicHUD](https://steamcommunity.com/sharedfiles
 5. The compiled files will be here:  
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`

-## Bug reports
+# Testing
+Open git-bash in the source folder and run command:  
+`./tools/builder -t`  
+(or `./tools/builder -ct` if you haven't compiled the mutator yet)  
+
+A local single-user test will be launched with parameters from `test.cfg` (edit this file if you want to test mutator with different parameters).
+
+# Bug reports
 If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-YetAnotherScoreboard/issues) and check if there is a description of your bug. If not, create a new issue.  
 Describe what the bug looks like and how reproduce it.  
 Attach screenshots if you think it might help.
@ -40,6 +47,5 @@ If it's a crash issue, be sure to include the `Launch.log` files. You can find t
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Logs\`  
 Please note that these files are overwritten every time you start the game/server. Therefore, you must take these files immediately after the game crashes in order not to lose information.

-## License
-[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)
-
+# License
+[GNU GPLv3](LICENSE)
--- a/TODO.md
+++ b/TODO.md
@ -0,0 +1,12 @@
+# TODO List:
+
+ ability to display HP on the left
+- ability to hide rank
+- ability to turn off the panel on the client 
+ colors for perks 
+ dynamic colors for dosh
+ dynamic colors for assists
+- abbreviated dosh display (10K, 15K, etc.)
+- images for HP (cross, skull with bones if dead) 
+ show armor
+ use rank id as priority
--- a/YAS/Classes/BoxPainter.uc
+++ b/YAS/Classes/BoxPainter.uc
@ -1,595 +0,0 @@
-class BoxPainter extends BoxPainterBase;
-
-public final function DrawBox(float X, float Y, float Width, float Height, float Edge, optional byte Shape = 0)
-{
-	Edge = FMin(FMin(Edge, Width * 0.5), Height * 0.5);
-
-	switch (Shape)
-	{
-		case 100:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 110:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 111:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 120:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\____/|
-			ECS_VerticalCorner,   // TopLeft        //  |      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | ____ |
-			ECS_VerticalCorner    // BottomRight    //  |/    \|
-		);
-		break;
-
-		case 121:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  _______
-			ECS_HorisontalCorner, // TopLeft        //  \     /
-			ECS_HorisontalCorner, // TopRight       //  |     |
-			ECS_HorisontalCorner, // BottomLeft     //  |     |
-			ECS_HorisontalCorner  // BottomRight    //  /_____\
-		);
-		break;
-
-		case 130:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 131:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 132:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 133:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 140:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 141:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 142:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 143:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 150:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | ____ |
-			ECS_VerticalCorner    // BottomRight    //  |/    \|
-		);
-		break;
-
-		case 151:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _______
-			ECS_BeveledCorner,    // TopLeft        //  /      /
-			ECS_HorisontalCorner, // TopRight       //  |     |
-			ECS_BeveledCorner,    // BottomLeft     //  \______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 152:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\____/|
-			ECS_VerticalCorner,   // TopLeft        //  |      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 153:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _______
-			ECS_HorisontalCorner, // TopLeft        //   \      \
-			ECS_BeveledCorner,    // TopRight       //   |      |
-			ECS_HorisontalCorner, // BottomLeft     //   /______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 160:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /     /
-			ECS_HorisontalCorner, // TopRight       //  |     |
-			ECS_BeveledCorner,    // BottomLeft     //  \_____/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 161:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\_____
-			ECS_VerticalCorner,   // TopLeft        //  |      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 162:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_HorisontalCorner, // BottomLeft     //  /______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 163:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \_____ |
-			ECS_VerticalCorner    // BottomRight    //        \|
-		);
-		break;
-
-		case 170:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 171:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _____/|
-			ECS_BeveledCorner,    // TopLeft        //  /      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 172:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  _______
-			ECS_HorisontalCorner, // TopLeft        //  \      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 173:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | _____/
-			ECS_BeveledCorner     // BottomRight    //  |/
-		);
-		break;
-
-		case 180:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _______
-			ECS_Corner,           // TopLeft        //  |      /
-			ECS_HorisontalCorner, // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 181:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\_____
-			ECS_VerticalCorner,   // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 182:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_HorisontalCorner, // BottomLeft     //  /______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 183:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |_____ |
-			ECS_VerticalCorner    // BottomRight    //        \|
-		);
-		break;
-
-		case 190:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 191:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _____/|
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 192:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  _______
-			ECS_HorisontalCorner, // TopLeft        //  \      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 193:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | _____|
-			ECS_Corner            // BottomRight    //  |/
-		);
-		break;
-
-		case 200:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | ____ |
-			ECS_VerticalCorner    // BottomRight    //  |/    \|
-		);
-		break;
-
-		case 201:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _______
-			ECS_Corner,           // TopLeft        //  |      /
-			ECS_HorisontalCorner, // TopRight       //  |     |
-			ECS_Corner,           // BottomLeft     //  |______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 202:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\____/|
-			ECS_VerticalCorner,   // TopLeft        //  |      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 203:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  _______
-			ECS_HorisontalCorner, // TopLeft        //  \      |
-			ECS_Corner,           // TopRight       //   |     |
-			ECS_HorisontalCorner, // BottomLeft     //  /______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 210:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  ________
-			ECS_HorisontalCorner, // TopLeft        //  \      /
-			ECS_HorisontalCorner, // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 211:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\_____
-			ECS_VerticalCorner,   // TopLeft        //  |      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | _____/
-			ECS_BeveledCorner     // BottomRight    //  |/
-		);
-		break;
-
-		case 212:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_HorisontalCorner, // BottomLeft     //  /______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 213:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _____/|
-			ECS_BeveledCorner,    // TopLeft        //  /      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \_____ |
-			ECS_VerticalCorner    // BottomRight    //        \|
-		);
-		break;
-
-		case 220:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  ________
-			ECS_HorisontalCorner, // TopLeft        //  \      /
-			ECS_HorisontalCorner, // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 221:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\_____
-			ECS_VerticalCorner,   // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | _____|
-			ECS_Corner            // BottomRight    //  |/
-		);
-		break;
-
-		case 222:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_HorisontalCorner, // BottomLeft     //  /______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 223:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _____/|
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |_____ |
-			ECS_VerticalCorner    // BottomRight    //        \|
-		);
-		break;
-
-		case 230:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _______
-			ECS_BeveledCorner,    // TopLeft        //  /      /
-			ECS_HorisontalCorner, // TopRight       //  |      |
-			ECS_HorisontalCorner, // BottomLeft     //  /______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 231:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\_____
-			ECS_VerticalCorner,   // TopLeft        //  |      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \_____ |
-			ECS_VerticalCorner    // BottomRight    //        \|
-		);
-		break;
-
-		case 232:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  _______
-			ECS_HorisontalCorner, // TopLeft        //  \      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 233:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _____/|
-			ECS_BeveledCorner,    // TopLeft        //  /      |
-			ECS_VerticalCorner,   // TopRight       //  |      |
-			ECS_VerticalCorner,   // BottomLeft     //  | _____/
-			ECS_BeveledCorner     // BottomRight    //  |/
-		);
-		break;
-
-		case 240:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _______
-			ECS_Corner,           // TopLeft        //  |      /
-			ECS_HorisontalCorner, // TopRight       //  |      |
-			ECS_HorisontalCorner, // BottomLeft     //  /______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 241:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  |\_____
-			ECS_VerticalCorner,   // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |_____ |
-			ECS_VerticalCorner    // BottomRight    //        \|
-		);
-		break;
-
-		case 242:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //  _______
-			ECS_HorisontalCorner, // TopLeft        //  \      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______\
-			ECS_HorisontalCorner  // BottomRight    //
-		);
-		break;
-
-		case 243:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   _____/|
-			ECS_Corner,            // TopLeft       //  |      |
-			ECS_VerticalCorner,    // TopRight      //  |      |
-			ECS_VerticalCorner,    // BottomLeft    //  | _____|
-			ECS_Corner             // BottomRight   //  |/
-		);
-		break;
-
-		case 250:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 251:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_BeveledCorner,    // TopLeft        //  /      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______|
-			ECS_Corner            // BottomRight    //
-		);
-		break;
-
-		case 252:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      |
-			ECS_Corner,           // TopRight       //  |      |
-			ECS_BeveledCorner,    // BottomLeft     //  \______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 253:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //   ______
-			ECS_Corner,           // TopLeft        //  |      \
-			ECS_BeveledCorner,    // TopRight       //  |      |
-			ECS_Corner,           // BottomLeft     //  |______/
-			ECS_BeveledCorner     // BottomRight    //
-		);
-		break;
-
-		case 0:
-		default:
-		DrawShapedBox(
-			X, Y, Width, Height, Edge,              //
-			ECS_BeveledCorner,    // TopLeft        //   ______
-			ECS_BeveledCorner,    // TopRight       //  /      \
-			ECS_BeveledCorner,    // BottomLeft     //  |      |
-			ECS_BeveledCorner     // BottomRight    //  \______/
-		);
-		break;
-	}
-}
-
-defaultproperties
-{
-
-}
--- a/YAS/Classes/BoxPainterBase.uc
+++ b/YAS/Classes/BoxPainterBase.uc
@ -1,185 +0,0 @@
-class BoxPainterBase extends Object;
-
-const Texture = Texture2D'UI_LevelChevrons_TEX.UI_LevelChevron_Icon_02';
-
-enum EPosition
-{
-	ECP_TopLeft,
-	ECP_TopRight,
-	ECP_BottomLeft,
-	ECP_BottomRight
-};
-
-enum EShape
-{
-	ECS_Corner,
-	ECS_BeveledCorner,
-	ECS_VerticalCorner,
-	ECS_HorisontalCorner
-};
-
-var public Canvas Canvas;
-
-private final function DrawBoxTexture(float X, float Y)
-{
-	Canvas.DrawTile(Texture, X, Y, 19, 45, 1, 1);
-}
-
-private final function DrawCornerTexture(float Size, byte Position)
-{
-	switch (Position)
-	{
-		case ECP_TopLeft:     Canvas.DrawTile(Texture, Size, Size, 77, 15, -66,  58); return;
-		case ECP_TopRight:    Canvas.DrawTile(Texture, Size, Size, 11, 15,  66,  58); return;
-		case ECP_BottomLeft:  Canvas.DrawTile(Texture, Size, Size, 77, 73, -66, -58); return;
-		case ECP_BottomRight: Canvas.DrawTile(Texture, Size, Size, 11, 73,  66, -58); return;
-	}
-}
-
-private final function DrawCorner(float X, float Y, float Edge, byte Position, byte Shape)
-{
-	switch (Position)
-	{
-		case ECP_TopLeft: switch (Shape)
-		{
-			case ECS_Corner:
-			return;
-
-			case ECS_BeveledCorner:
-			Canvas.SetPos(X, Y);
-			DrawCornerTexture(Edge, ECP_TopLeft);
-			return;
-
-			case ECS_VerticalCorner:
-			Canvas.SetPos(X, Y - Edge);
-			DrawCornerTexture(Edge, ECP_TopRight);
-			return;
-
-			case ECS_HorisontalCorner:
-			Canvas.SetPos(X - Edge, Y);
-			DrawCornerTexture(Edge, ECP_BottomLeft);
-			return;
-		}
-
-		case ECP_TopRight: switch (Shape)
-		{
-			case ECS_Corner:
-			return;
-
-			case ECS_BeveledCorner:
-			Canvas.SetPos(X - Edge, Y);
-			DrawCornerTexture(Edge, ECP_TopRight);
-			return;
-
-			case ECS_VerticalCorner:
-			Canvas.SetPos(X - Edge, Y - Edge);
-			DrawCornerTexture(Edge, ECP_TopLeft);
-			return;
-
-			case ECS_HorisontalCorner:
-			Canvas.SetPos(X, Y);
-			DrawCornerTexture(Edge, ECP_BottomRight);
-			return;
-		}
-
-		case ECP_BottomLeft: switch (Shape)
-		{
-			case ECS_Corner:
-			return;
-
-			case ECS_BeveledCorner:
-			Canvas.SetPos(X, Y - Edge);
-			DrawCornerTexture(Edge, ECP_BottomLeft);
-			return;
-
-			case ECS_VerticalCorner:
-			Canvas.SetPos(X, Y);
-			DrawCornerTexture(Edge, ECP_BottomRight);
-			return;
-
-			case ECS_HorisontalCorner:
-			Canvas.SetPos(X - Edge, Y - Edge);
-			DrawCornerTexture(Edge, ECP_TopLeft);
-			return;
-		}
-
-		case ECP_BottomRight: switch (Shape)
-		{
-			case ECS_Corner:
-			return;
-
-			case ECS_BeveledCorner:
-			Canvas.SetPos(X - Edge, Y - Edge);
-			DrawCornerTexture(Edge, ECP_BottomRight);
-			return;
-
-			case ECS_VerticalCorner:
-			Canvas.SetPos(X - Edge, Y);
-			DrawCornerTexture(Edge, ECP_BottomLeft);
-			return;
-
-			case ECS_HorisontalCorner:
-			Canvas.SetPos(X, Y - Edge);
-			DrawCornerTexture(Edge, ECP_TopRight);
-			return;
-		}
-	}
-}
-
-public final function DrawShapedBox(float X, float Y, float W, float H, float Edge, byte TopLeftShape, byte TopRightShape, byte BottomLeftShape, byte BottomRightShape)
-{
-	local float BoxX, BoxW;
-
-	Canvas.PreOptimizeDrawTiles((
-		3 // x3 DrawBoxTexture(...) + x1..x4 DrawCornerTexture(...)
-		+ (TopLeftShape     == ECS_Corner ? 0 : 1)
-		+ (TopRightShape    == ECS_Corner ? 0 : 1)
-		+ (BottomLeftShape  == ECS_Corner ? 0 : 1)
-		+ (BottomRightShape == ECS_Corner ? 0 : 1)
-	), Texture);
-
-	// Top Line
-	DrawCorner(X, Y, Edge, ECP_TopLeft, TopLeftShape);
-
-	BoxX = X; BoxW = W;
-	if (TopLeftShape == ECS_BeveledCorner)
-	{
-		BoxX += Edge;
-		BoxW -= Edge;
-	}
-	if (TopRightShape == ECS_BeveledCorner)
-	{
-		BoxW -= Edge;
-	}
-	Canvas.SetPos(BoxX, Y);
-	DrawBoxTexture(BoxW, Edge);
-
-	DrawCorner(X + W, Y, Edge, ECP_TopRight, TopRightShape);
-
-	// Mid Line
-	Canvas.SetPos(X, Y + Edge);
-	DrawBoxTexture(W, H - Edge * 2);
-
-	// Bottom Line
-	DrawCorner(X, Y + H, Edge, ECP_BottomLeft, BottomLeftShape);
-
-	BoxX = X; BoxW = W;
-	if (BottomLeftShape == ECS_BeveledCorner)
-	{
-		BoxX += Edge;
-		BoxW -= Edge;
-	}
-	if (BottomRightShape == ECS_BeveledCorner)
-	{
-		BoxW -= Edge;
-	}
-	Canvas.SetPos(BoxX, Y + H - Edge);
-	DrawBoxTexture(BoxW, Edge);
-
-	DrawCorner(X + W, Y + H, Edge, ECP_BottomRight, BottomRightShape);
-}
-
-defaultproperties
-{
-
-}
--- a/YAS/Classes/ClassicStyle.uc
+++ b/YAS/Classes/ClassicStyle.uc
@ -422,5 +422,4 @@ function RenderButton(KFGUI_Button B)

 defaultproperties
 {
-
 }
--- a/YAS/Classes/GUIStyleBase.uc
+++ b/YAS/Classes/GUIStyleBase.uc
@ -16,8 +16,6 @@ var transient YAS_HUD HUDOwner;
 var Font MainFont, NumberFont, InfiniteFont;
 var Color BlurColor, BlurColor2;

-var BoxPainter BoxPainter;
-
 enum ECornerPosition
 {
 	ECP_TopLeft,
@ -56,8 +54,6 @@ function InitStyle()
 	if (ItemTex == None)
 		ItemTex=Texture2D'EngineMaterials.DefaultWhiteGrid';

-	BoxPainter = new class'BoxPainter';
-
 	NumberFont = Font(DynamicLoadObject("UI_Canvas_Fonts.Font_General", class'Font'));

 	BlurColor = MakeColor(60, 60, 60, 220);
@ -560,10 +556,693 @@ final function DrawWhiteBox(float XS, float YS, optional bool bClip)
 	Canvas.DrawTile(ItemTex, XS, YS, 19, 45, 1,1, ,bClip);
 }

+final function DrawCornerSmart(float X, float Y, float Edge, int CornerPosition, int CornerShape)
+{
+	switch (CornerPosition)
+	{
+	case ECP_TopLeft:
+		switch (CornerShape)
+		{
+		case ECS_Corner:
+		return;
+		case ECS_BeveledCorner:
+		Canvas.SetPos(X, Y);
+		DrawCornerTex(Edge, 0);
+		return;
+		case ECS_VerticalCorner:
+		Canvas.SetPos(X, Y - Edge);
+		DrawCornerTex(Edge, 1);
+		return;
+		case ECS_HorisontalCorner:
+		Canvas.SetPos(X - Edge, Y);
+		DrawCornerTex(Edge, 2);
+		return;
+		}
+	case ECP_TopRight:
+		switch (CornerShape)
+		{
+		case ECS_Corner:
+		return;
+		case ECS_BeveledCorner:
+		Canvas.SetPos(X - Edge, Y);
+		DrawCornerTex(Edge, 1);
+		return;
+		case ECS_VerticalCorner:
+		Canvas.SetPos(X - Edge, Y - Edge);
+		DrawCornerTex(Edge, 0);
+		return;
+		case ECS_HorisontalCorner:
+		Canvas.SetPos(X, Y);
+		DrawCornerTex(Edge, 3);
+		return;
+		}
+	case ECP_BottomLeft:
+		switch (CornerShape)
+		{
+		case ECS_Corner:
+		return;
+		case ECS_BeveledCorner:
+		Canvas.SetPos(X, Y - Edge);
+		DrawCornerTex(Edge, 2);
+		return;
+		case ECS_VerticalCorner:
+		Canvas.SetPos(X, Y);
+		DrawCornerTex(Edge, 3);
+		return;
+		case ECS_HorisontalCorner:
+		Canvas.SetPos(X - Edge, Y - Edge);
+		DrawCornerTex(Edge, 0);
+		return;
+		}
+	case ECP_BottomRight:
+		switch (CornerShape)
+		{
+		case ECS_Corner:
+		return;
+		case ECS_BeveledCorner:
+		Canvas.SetPos(X - Edge, Y - Edge);
+		DrawCornerTex(Edge, 3);
+		return;
+		case ECS_VerticalCorner:
+		Canvas.SetPos(X - Edge, Y);
+		DrawCornerTex(Edge, 2);
+		return;
+		case ECS_HorisontalCorner:
+		Canvas.SetPos(X, Y - Edge);
+		DrawCornerTex(Edge, 1);
+		return;
+		}
+	}
+}
+
+final function DrawRectBoxSmart(float X, float Y, float W, float H, float Edge, int TopLeftShape, int TopRightShape, int BottomLeftShape, int BottomRightShape)
+{
+	local float BoxX, BoxW;
+	
+	// Top Line
+	DrawCornerSmart(X, Y, Edge, ECP_TopLeft, TopLeftShape);
+	
+	BoxX = X; BoxW = W;
+	if (TopLeftShape == ECS_BeveledCorner)
+	{
+		BoxX += Edge;
+		BoxW -= Edge;
+	}
+	if (TopRightShape == ECS_BeveledCorner)
+	{
+		BoxW -= Edge;
+	}
+	Canvas.SetPos(BoxX, Y);
+	DrawWhiteBox(BoxW, Edge);
+	
+	DrawCornerSmart(X + W, Y, Edge, ECP_TopRight, TopRightShape);
+	
+	// Mid Line
+	Canvas.SetPos(X, Y + Edge);
+	DrawWhiteBox(W, H - Edge * 2);
+	
+	// Bottom Line
+	DrawCornerSmart(X, Y + H, Edge, ECP_BottomLeft, BottomLeftShape);
+	
+	BoxX = X; BoxW = W;
+	if (BottomLeftShape == ECS_BeveledCorner)
+	{
+		BoxX += Edge;
+		BoxW -= Edge;
+	}
+	if (BottomRightShape == ECS_BeveledCorner)
+	{
+		BoxW -= Edge;
+	}
+	Canvas.SetPos(BoxX, Y + H - Edge);
+	DrawWhiteBox(BoxW, Edge);
+	
+	DrawCornerSmart(X + W, Y + H, Edge, ECP_BottomRight, BottomRightShape);
+}
+
 final function DrawRectBox(float X, float Y, float Width, float Height, float Edge, optional byte Extrav)
 {
-	if (BoxPainter.Canvas == None) BoxPainter.Canvas = Canvas;
-	if (BoxPainter.Canvas != None) BoxPainter.DrawBox(X, Y, Width, Height, Edge, Extrav);
+	if (Extrav == 2)
+		Edge=Min(FMin(Edge, (Width)*0.5), Height);// Verify size.
+	else
+		Edge=Min(FMin(Edge, (Width)*0.5), (Height)*0.5);// Verify size.
+
+	Canvas.PreOptimizeDrawTiles(Extrav == 0 ? 7 : 6, ItemTex);
+	
+	switch (Extrav)
+	{
+		case 100:
+		//   ______
+		//  |      |
+		//  |      |
+		//  |______|
+		
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 110:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 111:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 120:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 121:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 130:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 131:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 132:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 133:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 140:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 141:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 142: 
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 143:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 150:
+		//   ______
+		//  /      \
+		//  | ____ |
+		//  |/    \|
+		
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 151:
+		//   _______
+		//  /      /
+		//  |     |
+		//  \______\
+		
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 152:
+		// 
+		//  |\____/|
+		//  |      |
+		//  \______/
+		
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 153:
+		//   _______
+		//   \      \
+		//   |      |
+		//   /______/
+		
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 160:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 161:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 162:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 163:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 170:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 171:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 172:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 173:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 180:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 181:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 182:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 183:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 190:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 191:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 192:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 193:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 200:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 201:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 202:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 203:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 210:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 211:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 212:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 213:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 220:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 221:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 222:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 223:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 230:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 231:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 232:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 233:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 240:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_HorisontalCorner, // TopRight
+			ECS_HorisontalCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 241:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_VerticalCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_VerticalCorner // BottomRight
+		);
+		break;
+		
+		case 242:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_HorisontalCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_HorisontalCorner // BottomRight
+		);
+		break;
+		
+		case 243:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_VerticalCorner, // TopRight
+			ECS_VerticalCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 250:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 251:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_Corner // BottomRight
+		);
+		break;
+		
+		case 252:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_Corner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		case 253:
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_Corner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_Corner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+		
+		default: // 0
+		//   ______
+		//  /      \
+		//  |      |
+		//  \______/
+		
+		DrawRectBoxSmart(X, Y, Width, Height, Edge, 
+			ECS_BeveledCorner, // TopLeft
+			ECS_BeveledCorner, // TopRight
+			ECS_BeveledCorner, // BottomLeft
+			ECS_BeveledCorner // BottomRight
+		);
+		break;
+	}
 }

 final function DrawBoxHollow(float X, float Y, float Width, float Height, float Thickness)
--- a/YAS/Classes/KF2GUIInput.uc
+++ b/YAS/Classes/KF2GUIInput.uc
@ -59,5 +59,4 @@ function PreClientTravel(string PendingURL, ETravelType TravelType, bool bIsSeam

 defaultproperties
 {
-
 }
--- a/YAS/Classes/KFGUI_CategoryButton.uc
+++ b/YAS/Classes/KFGUI_CategoryButton.uc
@ -77,5 +77,4 @@ function DrawMenu()

 defaultproperties
 {
-
 }
--- a/YAS/Classes/KFGUI_CategoryList.uc
+++ b/YAS/Classes/KFGUI_CategoryList.uc
@ -86,5 +86,4 @@ function EmptyList()

 defaultproperties
 {
-
 }
--- a/YAS/Classes/KFGUI_MultiComponent.uc
+++ b/YAS/Classes/KFGUI_MultiComponent.uc
@ -13,7 +13,6 @@ function InitMenu()
 		Components[i].InitMenu();
 	}
 }
-
 function ShowMenu()
 {
 	local int i;
@ -21,7 +20,6 @@ function ShowMenu()
 	for (i=0; i < Components.Length; ++i)
 		Components[i].ShowMenu();
 }
-
 function PreDraw()
 {
 	local int i;
@ -43,7 +41,6 @@ function PreDraw()
 		Components[i].PreDraw();
 	}
 }
-
 function InventoryChanged(optional KFWeapon Wep, optional bool bRemove)
 {
 	local int i;
@ -51,7 +48,6 @@ function InventoryChanged(optional KFWeapon Wep, optional bool bRemove)
 	for (i=0; i < Components.Length; ++i)
 		Components[i].InventoryChanged(Wep, bRemove);
 }
-
 function MenuTick(float DeltaTime)
 {
 	local int i;
@ -76,7 +72,6 @@ function CloseMenu()
 	for (i=0; i < Components.Length; ++i)
 		Components[i].CloseMenu();
 }
-
 function bool CaptureMouse()
 {
 	local int i;
@ -92,7 +87,6 @@ function bool CaptureMouse()
 	MouseArea = None;
 	return Super.CaptureMouse(); // check with frame itself.
 }
-
 function bool ReceievedControllerInput(int ControllerId, name Key, EInputEvent Event)
 {
 	local int i;
@ -107,7 +101,6 @@ function bool ReceievedControllerInput(int ControllerId, name Key, EInputEvent E

 	return Super.ReceievedControllerInput(ControllerId, Key, Event);
 }
-
 function KFGUI_Base FindComponentID(name InID)
 {
 	local int i;
@ -122,7 +115,6 @@ function KFGUI_Base FindComponentID(name InID)
 	}
 	return Result;
 }
-
 function FindAllComponentID(name InID, out array < KFGUI_Base> Res)
 {
 	local int i;
@ -132,7 +124,6 @@ function FindAllComponentID(name InID, out array < KFGUI_Base> Res)
 	for (i=0; i < Components.Length; ++i)
 		Components[i].FindAllComponentID(InID, Res);
 }
-
 function RemoveComponent(KFGUI_Base B)
 {
 	local int i;
@ -147,7 +138,6 @@ function RemoveComponent(KFGUI_Base B)
 	for (i=0; i < Components.Length; ++i)
 		Components[i].RemoveComponent(B);
 }
-
 function NotifyLevelChange()
 {
 	local int i;
--- a/YAS/Classes/Mut.uc
+++ b/YAS/Classes/Mut.uc
@ -1,60 +0,0 @@
-class Mut extends KFMutator;
-
-var private YAS YAS;
-
-public simulated function bool SafeDestroy()
-{
-	return (bPendingDelete || bDeleteMe || Destroy());
-}
-
-public event PreBeginPlay()
-{
-	Super.PreBeginPlay();
-
-	if (WorldInfo.NetMode == NM_Client) return;
-
-	foreach WorldInfo.DynamicActors(class'YAS', YAS)
-	{
-		break;
-	}
-
-	if (YAS == None)
-	{
-		YAS = WorldInfo.Spawn(class'YAS');
-	}
-
-	if (YAS == None)
-	{
-		`Log_Base("FATAL: Can't Spawn 'YAS'");
-		SafeDestroy();
-	}
-}
-
-public function AddMutator(Mutator M)
-{
-	if (M == Self) return;
-
-	if (M.Class == Class)
-		Mut(M).SafeDestroy();
-	else
-		Super.AddMutator(M);
-}
-
-public function NotifyLogin(Controller C)
-{
-	YAS.NotifyLogin(C);
-
-	Super.NotifyLogin(C);
-}
-
-public function NotifyLogout(Controller C)
-{
-	YAS.NotifyLogout(C);
-
-	Super.NotifyLogout(C);
-}
-
-DefaultProperties
-{
-	GroupNames.Add("Scoreboard")
-}
--- a/YAS/Classes/YAS.uc
+++ b/YAS/Classes/YAS.uc
@ -355,7 +355,6 @@ public function YAS_RepInfoOwner CreateRepInfo(Controller C)
 	{
 		RepInfos.AddItem(OwnerRepInfo);
 		
-		PlayerRepInfo.Rank           = class'YAS_Types'.static.FromSystemRank(CfgRanks.default.Player);
 		OwnerRepInfo.PlayerRepInfo   = PlayerRepInfo;
 		OwnerRepInfo.YAS             = Self;
 		OwnerRepInfo.LogLevel        = LogLevel;
--- a/YAS/Classes/YASMut.uc
+++ b/YAS/Classes/YASMut.uc
@ -1 +1,60 @@
-class YASMut extends Mut; // backward compatibility
+class YASMut extends KFMutator;
+	
+var private YAS YAS;
+
+public simulated function bool SafeDestroy()
+{
+	return (bPendingDelete || bDeleteMe || Destroy());
+}
+
+public event PreBeginPlay()
+{
+	Super.PreBeginPlay();
+	
+	if (WorldInfo.NetMode == NM_Client) return;
+	
+	foreach WorldInfo.DynamicActors(class'YAS', YAS)
+	{
+		break;
+	}
+	
+	if (YAS == None)
+	{
+		YAS = WorldInfo.Spawn(class'YAS');
+	}
+	
+	if (YAS == None)
+	{
+		`Log_Base("FATAL: Can't Spawn 'YAS'");
+		SafeDestroy();
+	}
+}
+
+public function AddMutator(Mutator Mut)
+{
+	if (Mut == Self) return;
+	
+	if (Mut.Class == Class)
+		Mut.Destroy();
+	else
+		Super.AddMutator(Mut);
+}
+
+public function NotifyLogin(Controller C)
+{
+	YAS.NotifyLogin(C);
+	
+	Super.NotifyLogin(C);
+}
+
+public function NotifyLogout(Controller C)
+{
+	YAS.NotifyLogout(C);
+	
+	Super.NotifyLogout(C);
+}
+
+DefaultProperties
+{
+
+}
--- a/YAS/Classes/YAS_LocalMessage.uc
+++ b/YAS/Classes/YAS_LocalMessage.uc
@ -1,34 +0,0 @@
-class YAS_LocalMessage extends Object
-	abstract;
-
-var const             String PlayersDefault;
-var private localized String Players;
-
-var const             String SpectatorsDefault;
-var private localized String Spectators;
-
-enum E_YAS_LocalMessageType
-{
-	YAS_Players,
-	YAS_Spectators
-};
-
-public static function String GetLocalizedString(E_YAS_LocalMessageType LMT)
-{
-	switch (LMT)
-	{
-		case YAS_Players:
-			return (default.Players != "" ? default.Players : default.PlayersDefault);
-
-		case YAS_Spectators:
-			return (default.Spectators != "" ? default.Spectators : default.SpectatorsDefault);
-	}
-
-	return "";
-}
-
-defaultproperties
-{
-	PlayersDefault    = "Players"
-	SpectatorsDefault = "Spectators"
-}
--- a/YAS/Classes/YAS_RepInfoOwner.uc
+++ b/YAS/Classes/YAS_RepInfoOwner.uc
@ -40,8 +40,6 @@ public simulated event ReplicatedEvent(name VarName)
 {
 	`Log_Trace();
 	
-	`Log_Debug(`Location @ "Var:" @ VarName);
-
 	switch (VarName)
 	{
 		case 'LogLevel':
--- a/YAS/Classes/YAS_ScoreBoard.uc
+++ b/YAS/Classes/YAS_ScoreBoard.uc
@ -1,8 +1,6 @@
 class YAS_ScoreBoard extends KFGUI_Page
 	dependson(YAS_Types);

-const LocalMessage = class'YAS_LocalMessage';
-
 const HeaderWidthRatio         = 0.30f;
 const PlayerListWidthRatio     = 0.6f;
 const PlayerEntryHeightMod     = 1.05f;
@ -21,7 +19,7 @@ const IconRanked        = Texture2D'DailyObjective_UI.KF2_Dailies_Icon_PerkLvl';
 //const IconCustom        = Texture2D'UI_Menus.ServerBrowserMenu_SWF_I26';
 //const IconUnranked      = Texture2D'UI_Menus.ServerBrowserMenu_SWF_I28';
 const IconUnrankedAlt   = Texture2D'UI_VoiceComms_TEX.UI_VoiceCommand_Icon_Negative';
-const IconPassword      = Texture2D'UI_Menus.ServerBrowserMenu_SWF_I28';
+const IconPassword      = Texture2D'UI_Menus.ServerBrowserMenu_SWF_I27';
 //const IconDosh          = Texture2D'UI_HUD.InGameHUD_SWF_I13A';
 const IconPlayer        = Texture2D'UI_HUD.InGameHUD_ZED_SWF_I1F5';
 //const IconClock         = Texture2D'UI_HUD.InGameHUD_SWF_I17D';
@ -52,6 +50,8 @@ var KFPlayerController OwnerPC;
 var Color PingColor;
 var float PingBars;

+var localized String Players, Spectators;
+
 // Cache
 var public Array<YAS_RepInfoPlayer> RepInfos;

@ -203,25 +203,25 @@ function string WaveText()
 	local int CurrentWaveNum;
 	
 	CurrentWaveNum = KFGRI.WaveNum;
-	if (KFGRI.IsBossWave())
-	{
+    if (KFGRI.IsBossWave())
+    {
 		return class'KFGFxHUD_WaveInfo'.default.BossWaveString;
-	}
+    }
 	else if (KFGRI.IsFinalWave())
 	{
 		return class'KFGFxHUD_ScoreboardMapInfoContainer'.default.FinalString;
 	}
-	else
-	{
+    else
+    {
 		if (KFGRI.default.bEndlessMode)
 		{
-			return "" $ CurrentWaveNum;
+    		return "" $ CurrentWaveNum;
 		}
 		else
 		{
 			return CurrentWaveNum $ " / " $ KFGRI.GetFinalWaveNum();
 		}
-	}
+    }
 }

 function KFGameReplicationInfo GetKFGRI()
@ -430,9 +430,7 @@ function DrawMenu()
 	*/
 	
 	Canvas.SetDrawColorStruct(Settings.Style.PlayerCountTextColor);
-	S = LocalMessage.static.GetLocalizedString(YAS_Players) $ ":"
-		@ NumPlayer @ "/" @ KFGRI.MaxHumanCount $ "    "
-		$ LocalMessage.static.GetLocalizedString(YAS_Spectators) $ ": " $ NumSpec; ;
+	S = Players $ ":" @ NumPlayer @ "/" @ KFGRI.MaxHumanCount $ "    " $ Spectators $ ": " $ NumSpec; ; 
 	Canvas.TextSize(S, XL, YL, FontScalar, FontScalar);
 	DrawTextShadowHLeftVCenter(S, BoxX + EdgeSize, YPos, BoxH, FontScalar);
 	
--- a/YAS/Constants.uci
+++ b/YAS/Constants.uci
@ -1,50 +1,50 @@
 // Constants
-`define    NO_CONFIG                            0
+`define NO_CONFIG 0

 // Scoreboard
-`define    BOX_INNERBORDER                      0
-`define    BOX_INNERBORDER_TRANSPARENT          1
-`define    BOX_MEDIUM                           2
-`define    BOX_MEDIUM_SLIGHTTRANSPARENT         3
-`define    BOX_MEDIUM_TRANSPARENT               4
-`define    BOX_LARGE                            5
-`define    BOX_LARGE_SLIGHTTRANSPARENT          6
-`define    BOX_LARGE_TRANSPARENT                7
-`define    BOX_SMALL                            8
-`define    BOX_SMALL_SLIGHTTRANSPARENT          9
-`define    BOX_SMALL_TRANSPARENT                10
-`define    BOX_CORNER_8                         11
-`define    BOX_CORNER_16                        12
-`define    BOX_CORNER_32                        13
-`define    BOX_CORNER_64                        14
-`define    BOX_CORNER_512                       15
+`define BOX_INNERBORDER 					0
+`define	BOX_INNERBORDER_TRANSPARENT 		1
+`define	BOX_MEDIUM 							2
+`define	BOX_MEDIUM_SLIGHTTRANSPARENT 		3
+`define	BOX_MEDIUM_TRANSPARENT 				4
+`define	BOX_LARGE 							5
+`define	BOX_LARGE_SLIGHTTRANSPARENT 		6
+`define	BOX_LARGE_TRANSPARENT 				7
+`define	BOX_SMALL 							8
+`define	BOX_SMALL_SLIGHTTRANSPARENT 		9
+`define	BOX_SMALL_TRANSPARENT				10
+`define	BOX_CORNER_8						11
+`define	BOX_CORNER_16						12
+`define	BOX_CORNER_32						13
+`define	BOX_CORNER_64						14
+`define	BOX_CORNER_512						15

-`define    ITEMBOX_NORMAL                       0
-`define    ITEMBOX_DISABLED                     1
-`define    ITEMBOX_HIGHLIGHTED                  2
+`define ITEMBOX_NORMAL		0
+`define ITEMBOX_DISABLED	1
+`define ITEMBOX_HIGHLIGHTED	2

-`define    CHECKMARK_NORMAL                     0
-`define    CHECKMARK_DISABLED                   1
-`define    CHECKMARK_HIGHLIGHTED                2
+`define CHECKMARK_NORMAL		0
+`define CHECKMARK_DISABLED		1
+`define CHECKMARK_HIGHLIGHTED	2

-`define    ARROW_DOWN                           0
-`define    ARROW_LEFT                           1
-`define    ARROW_RIGHT                          2
-`define    ARROW_UP                             3
+`define	ARROW_DOWN		0
+`define	ARROW_LEFT		1
+`define	ARROW_RIGHT		2
+`define	ARROW_UP		3

-`define    BUTTON_NORMAL                        0
-`define    BUTTON_DISABLED                      1
-`define    BUTTON_HIGHLIGHTED                   2
-`define    BUTTON_PRESSED                       3
+`define	BUTTON_NORMAL			0
+`define	BUTTON_DISABLED			1
+`define	BUTTON_HIGHLIGHTED		2
+`define	BUTTON_PRESSED			3

-`define    TAB_TOP                              0
-`define    TAB_BOTTOM                           1
+`define	TAB_TOP			0
+`define	TAB_BOTTOM		1

-`define    PEN_WHITE                            0
-`define    PEN_BLACK                            1
-`define    PEN_GRAY                             2
+`define PEN_WHITE	0
+`define PEN_BLACK	1
+`define PEN_GRAY	2

-`define    CURSOR_DEFAULT                       0
-`define    CURSOR_SELECTION                     1
-`define    CURSOR_RESIZEVERT                    2
-`define    CURSOR_RESIZEHORZ                    3
+`define CURSOR_DEFAULT 		0
+`define CURSOR_SELECTION 	1
+`define CURSOR_RESIZEVERT	2
+`define CURSOR_RESIZEHORZ 	3
--- a/builder.cfg
+++ b/builder.cfg
@ -39,7 +39,7 @@ Map="KF-Nuked"
 # Endless:        KFGameContent.KFGameInfo_Endless
 # Objective:      KFGameContent.KFGameInfo_Objective
 # Versus:         KFGameContent.KFGameInfo_VersusSurvival
-Game="KFGameContent.KFGameInfo_Survival"
+Game="KFGameContent.KFGameInfo_VersusSurvival"

 # Difficulty:
 # Normal:         0
@ -55,7 +55,7 @@ Difficulty="0"
 GameLength="0"

 # Mutators
-Mutators="YAS.YASMut"
+Mutators="YAS.YASMut,FriendlyHUD.FriendlyHUDMutator"

 # Additional parameters
 Args=""
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f
+Subproject commit d830a5ea169e230fa40d63319b838fde1e25f6c1