20180326 - Console Button and Item Popup Fix

- Added a console button to the main menu, by popular request (gear icon
to the right of the rayshud title)
- Fixed an issue where hovering over an item in inventory with a
rotating 3D model would break all other item info panels when viewing
them in backpack or slot select screen

13 files changed, 187 insertions, 322 deletions

diff --git a/README.md b/README.md
index 9b4e339..27e8f6d 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,4 @@ Credits
 * m0re - Inspiration, occasional reference.
 * Whoever makes PVHUD - Inspiration, occasional reference.
 * My team - For dealing with me and giving me constructive feedback all the time.
-* Flame - If it weren't for your guide, I couldn't have made this at all. Thanks a million, man.
-
-v2017.10.29
+* Flame - If it weren't for your guide, I couldn't have made this at all. Thanks a million, man.
\ No newline at end of file
diff --git a/resource/GameMenu.res b/resource/GameMenu.res
index 81cf662..4e14347 100644
--- a/resource/GameMenu.res
+++ b/resource/GameMenu.res
@@ -49,6 +49,13 @@
 		"subimage"		"glyph_bug"
 		"tooltip"		"Report Bug"
 	}
+	"ConsoleButton"
+	{
+		"label"			""
+		"command"		"engine toggleconsole"
+		"subimage"		"glyph_options"
+		"tooltip"		"Console"
+	}
 	"CallVoteButton"
 	{
 		"label"			""
diff --git a/resource/sourcescheme.res b/resource/sourcescheme.res
index a9cd103..8123e6d 100644
--- a/resource/sourcescheme.res
+++ b/resource/sourcescheme.res
@@ -1,6 +1,5 @@
 //SourceScheme.res edited by rays, originally by:
 // Doodles - DoodleHUD - http://doodlesstuff.com
-//
 #base "SourceSchemeBase.res"
 Scheme
 {
diff --git a/resource/ui/MainMenuOverride.res b/resource/ui/MainMenuOverride.res
index 9b67d95..68b24c5 100644
--- a/resource/ui/MainMenuOverride.res
+++ b/resource/ui/MainMenuOverride.res
@@ -365,7 +365,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"QuestLogButtonNew"
-		"xpos"			"126"
+		"xpos"			"106"
 		"ypos"			"62"
 		"zpos"			"1"
 		"wide"			"20"
@@ -708,7 +708,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"CreateServerButton"
-		"xpos"			"145"
+		"xpos"			"125"
 		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
@@ -771,7 +771,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"ReportBugButton"
-		"xpos"			"164"
+		"xpos"			"144"
 		"ypos"			"59"
 		"zpos"			"12"
 		"wide"			"20"
@@ -834,7 +834,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldname"		"AchievementsButton"
-		"xpos"			"184"
+		"xpos"			"164"
 		"ypos"			"59"
 		"zpos"			"12"
 		"wide"			"20"
@@ -897,7 +897,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"WatchStreamButton"
-		"xpos"			"203"
+		"xpos"			"183"
 		"ypos"			"60"
 		"zpos"			"12"
 		"wide"			"20"
@@ -936,7 +936,7 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"vo/null.mp3"
 			"actionsignallevel" "2"
-				
+		
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"paintbackground"	"0"
@@ -984,13 +984,13 @@
 		"navDown"		"SettingsButton"
 		"navLeft"		"WatchStreamButton"
 	}
-
-	"CallVoteButton"
+	
+	"ConsoleButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"CallVoteButton"
-		"xpos"			"245"
-		"ypos"			"58"
+		"fieldname"		"ConsoleButton"
+		"xpos"			"205"
+		"ypos"			"57"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -1018,7 +1018,69 @@
 			"default"		"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"border_default"	""
+			"border_armed"		""
+			"paintbackground"	"0"
 
+			"defaultFgColor_override" "TanLight"
+			"armedFgColor_override" "Button Color"
+			"depressedFgColor_override" "Button Color"
+
+			"image_drawcolor"	"235 226 202 255"
+			"image_armedcolor"	"72 255 255 255"
+
+			"SubImage"
+			{
+				"ControlName"	"ImagePanel"
+				"fieldName"		"SubImage"
+				"xpos"			"4"
+				"ypos"			"7"
+				"zpos"			"1"
+				"wide"			"12"
+				"tall"			"13"
+				"visible"		"1"
+				"enabled"		"1"
+				"image"			"glyph_create"
+				"scaleImage"	"1"
+			}
+		}
+	}
+	
+	"ReportPlayerButton"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldname"		"ReportPlayerButton"
+		"xpos"			"225"
+		"ypos"			"57"
+		"zpos"			"12"
+		"wide"			"20"
+		"tall"			"25"
+		"visible"		"1"
+
+		"SubButton"
+		{
+			"ControlName"	"CExImageButton"
+			"fieldName"		"SubButton"
+			"xpos"			"0"
+			"ypos"			"0"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"3"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"textinsetx"	"100"
+			"use_proportional_insets" "1"
+			"font"			"HudFontSmallBold"
+			"textAlignment"	"west"
+			"dulltext"		"0"
+			"brighttext"	"0"
+			"default"		"1"
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
 			"border_default"	""
 			"border_armed"		""
 			"paintbackground"	"0"
@@ -1047,11 +1109,11 @@
 		}
 	}
 
-	"MutePlayersButton"
+	"CallVoteButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"MutePlayersButton"
-		"xpos"			"265"
+		"fieldname"		"CallVoteButton"
+		"xpos"			"245"
 		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
@@ -1080,7 +1142,7 @@
 			"default"		"1"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			
+
 			"border_default"	""
 			"border_armed"		""
 			"paintbackground"	"0"
@@ -1109,12 +1171,12 @@
 		}
 	}
 
-	"ReportPlayerButton"
+	"MutePlayersButton"
 	{
 		"ControlName"	"EditablePanel"
-		"fieldname"		"ReportPlayerButton"
-		"xpos"			"225"
-		"ypos"			"57"
+		"fieldname"		"MutePlayersButton"
+		"xpos"			"265"
+		"ypos"			"58"
 		"zpos"			"12"
 		"wide"			"20"
 		"tall"			"25"
@@ -1708,7 +1770,7 @@
 		"ControlName"	"CExLabel"
 		"fieldname"		"VersionNumber"
 		"font"			"Cerbetica14"
-		"labelText"		"v2017.12.18"
+		"labelText"		"v2018.03.26"
 		"xpos"			"r55"
 		"ypos"			"r13"
 		"wide"			"80"
diff --git a/resource/ui/TFAdvancedOptionsDialog.res b/resource/ui/TFAdvancedOptionsDialog.res
index 5904b7f..3bcc9eb 100644
--- a/resource/ui/TFAdvancedOptionsDialog.res
+++ b/resource/ui/TFAdvancedOptionsDialog.res
@@ -13,12 +13,12 @@
 		"visible"		"1"

 		"enabled"		"1"

 		"tabPosition"		"0"

+		"bgcolor_override"		"25 25 25 255"

 		"paintbackgroundtype"	"0"

 		"settitlebarvisible"	"0"

 		"paintborder"			"1"

 		"paintbackground"		"1"

 		"border"				"NoBorder"

-		"bgcolor_override"		"25 25 25 255"

 		

 		"control_w"			"500"

 		"control_h"			"25"

diff --git a/resource/ui/charinfoarmorysubpanel.res b/resource/ui/charinfoarmorysubpanel.res
index 54f9a45..9787a50 100644
--- a/resource/ui/charinfoarmorysubpanel.res
+++ b/resource/ui/charinfoarmorysubpanel.res
@@ -256,24 +256,6 @@
 		"PaintBackgroundType"	"0"
 		"paintborder"	"0"
 		
-		"BackColor"
-    	{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"		"0"
-			"autoResize"	"0"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
-			"bgcolor_override"	"30 30 30 255"
-    	}
-		
 		"text_ypos"			"20"
 		"text_center"		"1"
 		"model_hide"		"0"
diff --git a/resource/ui/econ/BackpackPanel.res b/resource/ui/econ/BackpackPanel.res
index 5f59630..a993043 100644
--- a/resource/ui/econ/BackpackPanel.res
+++ b/resource/ui/econ/BackpackPanel.res
@@ -130,11 +130,13 @@
 				"font" "FontStorePrice"
 				"textAlignment" "east"
 				"xpos" "rs1"
+				"ypos"	"0"
 				"zpos" "15"
 				"wide" "25"
 				"tall" "12"
 				"textinsetx" "8"
-				"autoResize" "1"
+				"autoResize"	"0"
+				"skip_autoresize"	"1"
 				"pinCorner" "0"
 				"visible" "0"
 				"enabled" "1"
@@ -234,6 +236,7 @@
 		"selectionTextColor_override" "235 226 202 255"
 		"defaultSelectionBG2Color_override" "0 0 0 0"
 	}	
+
 	"ShowBaseItemsCheckbox"
 	{
 		"ControlName"	"CheckButton"
@@ -347,43 +350,25 @@
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-		
-		"BackColor"
-    	{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"			"0"
-			"autoResize"		"0"
-			"PaintBackgroundType""1"
-			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
-			
-			"attriblabel"
-			{
-				"font"			"ItemFontAttribLarge"
-				"xpos"			"0"
-				"ypos"			"30"
-				"zpos"			"101"
-				"wide"			"140"
-				"tall"			"60"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"labelText"		"%attriblist%"
-				"textAlignment"	"center"
-				"fgcolor"		"117 107 94 255"
-				"centerwrap"	"1"
-			}
-    	}
-	}
+
+		"attriblabel"
+		{
+			"font"			"ItemFontAttribLarge"
+			"xpos"			"0"
+			"ypos"			"30"
+			"zpos"			"101"
+			"wide"			"140"
+			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%attriblist%"
+			"textAlignment"	"center"
+			"fgcolor"		"117 107 94 255"
+			"centerwrap"	"1"
+		}
+    }
 	
 	"mousedragitempanel"
 	{
diff --git a/resource/ui/econ/ItemModelPanel.res b/resource/ui/econ/ItemModelPanel.res
index bfdbd6a..dc14c8b 100644
--- a/resource/ui/econ/ItemModelPanel.res
+++ b/resource/ui/econ/ItemModelPanel.res
@@ -8,6 +8,8 @@
 		"text_xpos_collection"	"0"
 		"text_ypos"			"15"
 		"text_forcesize" "0"
+		"text_xpos"		"15"
+		"text_wide"		"270"
 		//"model_xpos_collection"	"77"
 		//"model_ypos_collection"	"20"
 		//"model_wide_collection"	"156"
@@ -134,8 +136,6 @@
 			"fgcolor"		"200 80 60 255"
 			"bgcolor_override"		"0 0 0 255"
 			"PaintBackgroundType"	"2"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
 		}
 		
 		"paint_icon"
@@ -160,7 +160,7 @@
 			"xpos"			"4"
 			"ypos"			"4"
 			"zpos"			"2"
-			"wide"			"18"
+			"wide"			"10"
 			"tall"			"10"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -170,8 +170,7 @@
 			"textAlignment"	"center"
 			"fgcolor"		"200 80 60 255"
 			"bgcolor_override"		"0 0 0 255"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
+			"PaintBackgroundType"	"2"
 		}
 
 		"serieslabel"
@@ -182,7 +181,7 @@
 			"xpos"			"4"
 			"ypos"			"4"
 			"zpos"			"2"
-			"wide"			"18"
+			"wide"			"14"
 			"tall"			"10"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -192,8 +191,7 @@
 			"textAlignment"	"center"
 			"fgcolor"		"200 180 60 255"
 			"bgcolor_override"		"0 40 30 255"
-			"PaintBackgroundType"	"0"
-			"border"		"NoBorder"
+			"PaintBackgroundType"	"2"
 		}
 		
 		"matcheslabel"
@@ -204,7 +202,7 @@
 			"xpos"			"4"
 			"ypos"			"4"
 			"zpos"			"2"
-			"wide"			"24"
+			"wide"			"20"
 			"tall"			"10"
 			"autoResize"	"0"
 			"pinCorner"		"0"
@@ -212,7 +210,6 @@
 			"enabled"		"1"
 			"labelText"		""
 			"textAlignment"	"center"
-			"border"		"NoBorder"
 			"fgcolor"		"200 180 60 255"
 			"bgcolor_override"		"0 40 30 255"
 			"PaintBackgroundType"	"2"
@@ -227,13 +224,12 @@
 			"zpos"			"2"
 			"autoResize"	"0"
 			"pinCorner"		"0"
-			"wide"			"20"
-			"border"		"NoBorder"
+			"wide"			"16"
 			"tall"			"16"
 			"visible"		"0"
 			"enabled"		"1"
 			"scaleImage"	"1"
-			}
+		}
 
 		"is_strange_icon"
 		{
diff --git a/resource/ui/itemrenamedialog.res b/resource/ui/itemrenamedialog.res
index 6bbd69f..7d7aa04 100644
--- a/resource/ui/itemrenamedialog.res
+++ b/resource/ui/itemrenamedialog.res
@@ -9,10 +9,10 @@
 		"ypos"					"105"
 		"wide"					"400"
 		"tall"					"240"
-		"settitlebarvisible"	"0"
+		"bgcolor_override"		"30 30 30 255"
 		"paintbackgroundtype"	"2"
+		"settitlebarvisible"	"0"
 		"paintbackground"		"1"
-		"bgcolor_override"		"30 30 30 255"
 		"border"				"CyanBorder"
 	}
 
diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index cfa4696..bb29ad4 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -30,11 +30,15 @@
 			"model_xpos"	"2"
 			"model_wide"	"90"
 			"model_tall"	"50"
+			"model_center_x" "1"
 			"text_ypos"		"0"
 			"text_forcesize" "2"
 			"text_center"	"0"
 			"text_yoffset"	"2"
 			"inset_eq_y"	"55"
+
+			"deferred_description"	"1"
+			"deferred_icon"			"1"
 		}
 		"modelpanels_kv"
 		{
@@ -59,6 +63,8 @@
 			
 			"inset_eq_x"	"4"
 			"inset_eq_y"	"2"
+
+			"deferred_description"	"1"
 			
 			"itemmodelpanel"
 			{
@@ -433,48 +439,31 @@
 		"visible"		"0"
 		"bgcolor_override"		"0 0 0 0"
 		"noitem_textcolor"		"117 107 94 255"
-		"PaintBackgroundType"	"0"
-		"paintborder"	"0"
-			"BackColor"
-    	{
-    		"ControlName"		"EditablePanel"
-    		"fieldName"			"BackColor"
-    		"xpos"				"0"
-    		"ypos"				"0"
-    		"zpos"				"-1"
-    		"wide"				"f0"
-    		"tall"	 			"f0"
-    		"visible"			"1"
-    		"enabled"			"1"
-			"pinCorner"			"0"
-			"autoResize"		"0"
-			"PaintBackgroundType""1"
-			"border"			"NoBorder"
-			"bgcolor_override"	"35 35 35 255"
-			
-			"attriblabel"
-			{
-				"font"			"ItemFontAttribLarge"
-				"xpos"			"0"
-				"ypos"			"30"
-				"zpos"			"101"
-				"wide"			"140"
-				"tall"			"60"
-				"autoResize"	"0"
-				"pinCorner"		"0"
-				"visible"		"1"
-				"enabled"		"1"
-				"labelText"		"%attriblist%"
-				"textAlignment"	"center"
-				"fgcolor"		"117 107 94 255"
-				"centerwrap"	"1"
-			}
-    	}
+		"PaintBackgroundType"	"2"
+		"paintborder"	"1"
 		
 		"text_ypos"			"20"
 		"text_center"		"1"
 		"model_hide"		"1"
 		"resize_to_text"	"1"
 		"padding_height"	"15"
-	}
+
+		"attriblabel"
+		{
+			"font"			"ItemFontAttribLarge"
+			"xpos"			"0"
+			"ypos"			"30"
+			"zpos"			"2"
+			"wide"			"140"
+			"tall"			"60"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"labelText"		"%attriblist%"
+			"textAlignment"	"center"
+			"fgcolor"		"117 107 94 255"
+			"centerwrap"	"1"
+		}
+    }
 }
\ No newline at end of file
diff --git a/resource/ui/loadoutpresetpanel.res b/resource/ui/loadoutpresetpanel.res
index 8c54bc3..93bc313 100644
--- a/resource/ui/loadoutpresetpanel.res
+++ b/resource/ui/loadoutpresetpanel.res
@@ -24,10 +24,6 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 			"centerwrap"	"1"
-			"paintbackground"	"1"
-			"border_default"			"NoBorder"
-			"border_armed"				"NoBorder"
-			"border_depressed"			"NoBorder"
 		}
 	}
 }
\ No newline at end of file
diff --git a/scripts/HudAnimations_manifest.txt b/scripts/HudAnimations_manifest.txt
index b1030c1..89e835b 100644
--- a/scripts/HudAnimations_manifest.txt
+++ b/scripts/HudAnimations_manifest.txt
@@ -1,6 +1,6 @@
 hudanimations_manifest
 {
 	"file"		"scripts/hudanimations.txt"
-	"file"		"scripts/HudAnimations_custom.txt"
+	"file"		"scripts/hudanimations_custom.txt"
 	"file"		"scripts/hudanimations_tf.txt"
 }
\ No newline at end of file
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index ff15f44..5b72aed 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -12,7 +12,6 @@
 		"visible" 			"0"
 		"enabled" 			"0"
 		"labelText"			"i"
-		
 		"controlName"		"CExLabel"
 		"fieldName"	 		"KnucklesCrosses"
 		"zpos"				"0"
@@ -35,17 +34,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-102"
 		"wide"			"201"
 		"tall"			"200"
-
-		//"font"		"xHairCircleOutline"
-		"font"			"xHairCircle"
+		"font"			"xHairCircle"	//"xHairCircleOutline"
 		"labelText"		"o"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 100"
 	}
 	
@@ -56,18 +51,14 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-99"
 		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline32"
-		"font"			"Crosshairs32"
+		"font"			"Crosshairs32"	//"CrosshairsOutline32"
 		"labelText"		"0"
 		"textAlignment"	"center"
 		"outline"		"1"
-		
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -78,17 +69,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-102"
 		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline26"
-		"font"			"Crosshairs26"
+		"font"			"Crosshairs26"	//"CrosshairsOutline26"
 		"labelText"		"2"
-		"textAlignment"		"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -99,17 +86,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-101"
 		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline18"
-		"font"			"Crosshairs18"
+		"font"			"Crosshairs18"	//"CrosshairsOutline18"
 		"labelText"		"2"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -120,17 +103,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-102"
 		"ypos"			"c-98"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline32"
-		"font"			"Crosshairs32"
+		"font"			"Crosshairs32"	//"CrosshairsOutline32"
 		"labelText"		"2"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -141,17 +120,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-103"
 		"ypos"			"c-100"
 		"wide"			"201"
 		"tall"			"201"
-
-		//"font"		"CrosshairsOutline24"
-		"font"			"Crosshairs24"
+		"font"			"Crosshairs24"	//"CrosshairsOutline24"
 		"labelText"		"3"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 
@@ -162,17 +137,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-96"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline34"
-		"font"			"Crosshairs34"
+		"font"			"Crosshairs34"	//"CrosshairsOutline34"
 		"labelText"		"8"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -183,17 +154,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-96"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline34"
-		"font"			"Crosshairs34"
+		"font"			"Crosshairs34"	//"CrosshairsOutline34"
 		"labelText"		"9"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -204,17 +171,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-97"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline34"
-		"font"			"Crosshairs34"
+		"font"			"Crosshairs34"	//"CrosshairsOutline34"
 		"labelText"		"c"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -225,17 +188,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-97"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline34"
-		"font"			"Crosshairs34"
+		"font"			"Crosshairs34"	//"CrosshairsOutline34"
 		"labelText"		"d"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -246,17 +205,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-97"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline34"
-		"font"			"Crosshairs34"
+		"font"			"Crosshairs34"	//"CrosshairsOutline34"
 		"labelText"		"f"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"0 0 0 0"
 	}
 	
@@ -267,17 +222,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-97"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline34"
-		"font"			"Crosshairs34"
+		"font"			"Crosshairs34"	//"CrosshairsOutline34"
 		"labelText"		"g"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -288,17 +239,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-85"
 		"ypos"			"c-100"
 		"wide"			"199"
 		"tall"			"200"
-
-		"font"			"CrosshairsOutline24"
-		"font"			"Crosshairs24"
+		"font"			"Crosshairs24"	//"CrosshairsOutline24"
 		"labelText"		"i"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -309,17 +256,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-85"
 		"ypos"			"c-100"
 		"wide"			"199"
 		"tall"			"200"
-
-		//"font"		"CrosshairsOutline24"
-		"font"			"Crosshairs24"
+		"font"			"Crosshairs24"	//"CrosshairsOutline24"
 		"labelText"		"h"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -330,17 +273,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-100"
 		"ypos"			"c-103"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"SymbolOutline24"
-		"font"			"Symbol24"
+		"font"			"Symbol24"	//"SymbolOutline24"
 		"labelText"		"+"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -351,17 +290,13 @@
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-
 		"xpos"			"c-108"
 		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-
-		//"font"		"KonrWingsOutline24"
-		"font"			"KonrWings24"
+		"font"			"KonrWings24"	//"KonrWingsOutline24"
 		"labelText"		"i"
-		"textAlignment"	"center"	
-		
+		"textAlignment"	"center"
 		"fgcolor"		"255 255 255 255"
 	}
 	
@@ -372,14 +307,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"427"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"75"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"154"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -393,14 +324,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"40"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"374"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -414,14 +341,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"439"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"374"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -435,14 +358,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"426"
-		"xpos_lodef"	"278"
-		"xpos_hidef"	"308"
 		"ypos"			"190"
 		"zpos"			"-5"
 		"wide"			""
 		"tall"			"38"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -455,14 +374,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"427"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"252"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"38"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -475,14 +390,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"365"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"50"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -497,14 +408,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"439"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"50"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -522,14 +429,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"384"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"55"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"170"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -543,14 +446,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"35"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"330"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -564,14 +463,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"403"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"330"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -585,14 +480,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"384"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"187"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"38"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -606,14 +497,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"384"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"254"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"38"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -627,14 +514,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"315"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"50"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -648,14 +531,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"403"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"50"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -673,14 +552,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"319"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"70"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"154"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -694,14 +569,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"10"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"290"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -715,14 +586,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"340"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"290"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -736,14 +603,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"319"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"186"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"38"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -757,14 +620,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"319"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"255"
 		"zpos"			"-5"
 		"wide"			"1"
 		"tall"			"38"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -778,14 +637,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"250"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"50"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -799,14 +654,10 @@
 		"ControlName"	"ImagePanel"
 		"fieldName"		"VerticalLine"
 		"xpos"			"340"
-		"xpos_lodef"	"279"
-		"xpos_hidef"	"309"
 		"ypos"			"240"
 		"zpos"			"-5"
 		"wide"			"50"
 		"tall"			"1"
-		"tall_lodef"	"206"
-		"tall_hidef"	"212"
 		"autoResize"	"0"
 		"pinCorner"		"0"
 		"visible"		"0"
@@ -815,7 +666,7 @@
 		"alpha" 		"100"
 	}
 	//--------------------------------------------------------------
-	// TRANSPARENT VIEWMODELS
+	// TRANSPARENT VIEWMODEL
 	//--------------------------------------------------------------
 	"TransparentViewmodel"
 	{
@@ -851,7 +702,7 @@
 		"ypos"	"c66"
 		"xpos_minmode"	"c20"
 		"ypos_minmode"	"c16"
-		"wide"	"300" //was made 4 units taller in MvM update
+		"wide"	"300"
 		"tall"	"300"
 	}
 	
@@ -1028,7 +879,7 @@
 		"ypos"					"c45"
 		"wide"					"250"
 		"tall"  				"120"
-		"xpos_minmode"			"c-100"		
+		"xpos_minmode"			"c-100"
 		"ypos_minmode"			"c5"
 		"wide_minmode"			"f0"
 		"tall_minmode"			"480"