From 75152d5ef7fba4ebcc8ea653aa38f46f92838e89 Mon Sep 17 00:00:00 2001
From: spazzo966 <32218122+spazzo966@users.noreply.github.com>
Date: Mon, 20 Nov 2023 07:04:08 +1100
Subject: [PATCH] 0.35 interface updates

---
 .../Base.StormData/UI/FontStyles.StormStyle   |   3 +-
 .../UI/Layout/CustomPanelSpazzo.StormLayout   | 236 ++---
 .../UI/Layout/SpazzoCustomTopBar.StormLayout  | 615 ++----------
 .../SpazzoCustomTopBarAbilities.StormLayout   |  21 +-
 .../SpazzoCustomTopBarQuests.StormLayout      |  44 +-
 .../UI/Layout/SpazzoTemplates.StormLayout     | 908 ++++++++++++++----
 .../LocalizedData/GameStrings.txt             |  16 +-
 7 files changed, 952 insertions(+), 891 deletions(-)

diff --git a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/FontStyles.StormStyle b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/FontStyles.StormStyle
index cb8c3d5..7a9fe3e 100644
--- a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/FontStyles.StormStyle
+++ b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/FontStyles.StormStyle
@@ -22,7 +22,8 @@
   <Style name="Spazzo_TopPanelDeathLabel" template="DeathTimerLabel" height="25" vjustify="Middle" hjustify="Center" />
   <Style name="Spazzo_TopPanelDeathLabelWide" template="Spazzo_TopPanelDeathLabel" height="30" />
   <Style name="Spazzo_TopPanelDeathLabelCompact" template="Spazzo_TopPanelDeathLabel" height="22" />
-  <Style name="Spazzo_TopPanelVikingDeathLabel" template="Spazzo_TopPanelDeathLabel" height="14" hjustify="Left" />
+  <Style name="Spazzo_TopPanelVikingDeathLabel" template="Spazzo_TopPanelDeathLabel" height="15" hjustify="Left" />
+  <Style name="Spazzo_TopPanelVikingDeathLabelUltrawide" template="Spazzo_TopPanelVikingDeathLabel" vjustify="Top" />
   <Style name="Spazzo_TopPanelAbilCooldownLabel" template="Storm_AbilityTopBar_Modified" height="12" />
   <Style name="Spazzo_TopPanelAbilCooldownLabel_Heroic" template="Storm_AbilityTopBar_Modified" height="18" />
   <Style name="Spazzo_TopPanelAbilCooldownLabel_Debug" template="Spazzo_TopPanelAbilCooldownLabel_Heroic" height="8" />
diff --git a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout
index bc6fcc9..73d1775 100644
--- a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout
+++ b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/CustomPanelSpazzo.StormLayout
@@ -2590,13 +2590,13 @@
         <Action type="SetProperty" Frame="DamageTenTooltip" Text="@UI/SpazzoDamage/Stukov/ScoreTen/One"/>
       </State>
       <State name="C2">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_weightedpustule_a.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_lurkingarm.dds" />
         <Action type="SetProperty" Frame="DamageEightTooltip" Text="@UI/SpazzoDamage/Stukov/ScoreEight/Two"/>
         <Action type="SetProperty" Frame="DamageNineTooltip" Text="@UI/SpazzoDamage/Stukov/ScoreNine/Two"/>
         <Action type="SetProperty" Frame="DamageTenTooltip" Text="@UI/SpazzoDamage/Stukov/ScoreTen/Two"/>
       </State>
       <State name="C3">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_lurkingarm.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_bio-killswitch.dds" />
         <Action type="SetProperty" Frame="DamageEightTooltip" Text="@UI/SpazzoDamage/Stukov/ScoreEight/Three"/>
         <Action type="SetProperty" Frame="DamageNineTooltip" Text="@UI/SpazzoDamage/Stukov/ScoreNine/Three"/>
         <Action type="SetProperty" Frame="DamageTenTooltip" Text="@UI/SpazzoDamage/Stukov/ScoreTen/Three"/>
@@ -2710,7 +2710,7 @@
         <Action type="SetProperty" Frame="SupportFiveTooltip" Text="@UI/Spazzo/Stukov/TalentFour/One"/>
       </State>
       <State name="C2">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_healingpathogen_b.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_healingpathogen_a.dds" />
         <Action type="SetProperty" Frame="SupportFiveTooltip" Text="@UI/Spazzo/Stukov/TalentFour/Two"/>
       </State>
       <State name="C3">
@@ -2836,11 +2836,11 @@
         <Action type="SetProperty" Frame="AccuracyFiveTooltip" Text="@UI/SpazzoAccuracy/Stukov/AccuracyFive/One"/>
       </State>
       <State name="C2">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_weightedpustule_a.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_lurkingarm.dds" />
         <Action type="SetProperty" Frame="AccuracyFiveTooltip" Text="@UI/SpazzoAccuracy/Stukov/AccuracyFive/Two"/>
       </State>
       <State name="C3">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_lurkingarm.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon1/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_bio-killswitch.dds" />
         <Action type="SetProperty" Frame="AccuracyFiveTooltip" Text="@UI/SpazzoAccuracy/Stukov/AccuracyFive/Three"/>
       </State>
       <State name="C5"></State>
@@ -2851,7 +2851,7 @@
         <Action type="SetProperty" Frame="AccuracySixTooltip" Text="@UI/SpazzoAccuracy/Stukov/AccuracySix/One"/>
       </State>
       <State name="C2">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_healingpathogen_b.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_stukov_healingpathogen_a.dds" />
         <Action type="SetProperty" Frame="AccuracySixTooltip" Text="@UI/SpazzoAccuracy/Stukov/AccuracySix/Two"/>
       </State>
       <State name="C3">
@@ -4606,7 +4606,7 @@
         <Action type="SetProperty" Frame="SupportTwelveTooltip" Text="@UI/Spazzo/DemonHunter/SupportTwelve/Two"/>
       </State>
       <State name="C3">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon6/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_damage.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon6/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_searing.dds" />
         <Action type="SetProperty" Frame="SupportElevenTooltip" Text="@UI/Spazzo/DemonHunter/SupportEleven/Three"/>
         <Action type="SetProperty" Frame="SupportTwelveTooltip" Text="@UI/Spazzo/DemonHunter/SupportTwelve/Three"/>
       </State>
@@ -4760,7 +4760,7 @@
         <Action type="SetProperty" Frame="AccuracyThirteenTooltip" Text="@UI/SpazzoAccuracy/DemonHunter/AccuracyThirteen/Two"/>
       </State>
       <State name="C3">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon6/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_damage.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon6/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_searing.dds" />
         <Action type="SetProperty" Frame="AccuracyThirteenTooltip" Text="@UI/SpazzoAccuracy/DemonHunter/AccuracyThirteen/Three"/>
       </State>
       <State name="C4"></State>
@@ -5582,7 +5582,7 @@
         <Action type="SetProperty" Frame="DamageSixteenTooltip" Text="@UI/SpazzoDamage/Firebat/ScoreSixteen/Two"/>
       </State>
       <State name="C3">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_slow.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_building.dds" />
         <Action type="SetProperty" Frame="DamageSixteenTooltip" Text="@UI/SpazzoDamage/Firebat/ScoreSixteen/Three"/>
       </State>
       <State name="C4"></State>
@@ -5729,7 +5729,7 @@
         <Action type="SetProperty" Frame="SupportTwoTooltip" Text="@UI/Spazzo/Firebat/BaselineTwo/Two"/>
       </State>
       <State name="C3">
-        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_slow.dds" />
+        <When type="Property" frame="$parent/PlayerTalentContainer/TalentTreeIcon2/IconImage/Label" Text="assets\textures\storm_ui_icon_talent_autoattack_building.dds" />
         <Action type="SetProperty" Frame="SupportOneTooltip" Text="@UI/Spazzo/Firebat/BaselineOne/Three"/>
         <Action type="SetProperty" Frame="SupportTwoTooltip" Text="@UI/Spazzo/Firebat/BaselineTwo/Three"/>
       </State>
@@ -17285,19 +17285,14 @@
                 <Key type="Curve" time="0.5" value="-142" inout="Smooth"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer1/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer1/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer1/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer1/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer1/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer1/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer1/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer1/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer1/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player2ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -17374,19 +17369,14 @@
                 <Key type="Animation" time="0" action="Pause"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer2/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer2/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer2/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer2/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer2/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer2/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer2/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer2/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer2/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player3ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -17466,19 +17456,14 @@
                 <Key type="Animation" time="0" action="Pause"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer3/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer3/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer3/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer3/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer3/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer3/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer3/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer3/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer3/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player4ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -17561,19 +17546,14 @@
                 <Key type="Animation" time="0" action="Pause"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer4/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer4/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer4/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer4/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer4/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer4/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer4/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer4/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer4/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player5ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -17653,19 +17633,14 @@
                 <Key type="Animation" time="0" action="Pause"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer5/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer5/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer5/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer5/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer5/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer5/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer5/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer5/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer5/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player6ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -17745,19 +17720,14 @@
                 <Key type="Curve" time="0.5" value="142" inout="Smooth"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer6/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer6/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer6/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer6/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer6/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer6/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer6/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer6/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer6/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player7ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -17834,19 +17804,14 @@
                 <Key type="Animation" time="0" action="Pause"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer7/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer7/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer7/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer7/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer7/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer7/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer7/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer7/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer7/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player8ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -17920,19 +17885,14 @@
                 <Key type="Curve" time="0.5" value="438" inout="Smooth"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer8/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer8/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer8/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer8/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer8/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer8/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer8/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer8/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer8/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player9ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -18016,19 +17976,14 @@
                 <Key type="Animation" time="0" action="Pause"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer9/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer9/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer9/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer9/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer9/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer9/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer9/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer9/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer9/@Text}"/>
           </Frame>
         </Frame>
         <Frame type="Frame" name="Player10ContainerFrame" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame">
@@ -18108,19 +18063,14 @@
                 <Key type="Animation" time="0" action="Pause"/>
             </Controller>
           </Animation>
-          <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-            <Frame type="Label" name="OlafDeathTimerLabel">
-              <Text val="{$OlafDeathTimerPlayer10/@Text}"/>
-              <Visible val="{$OlafDeathTimerPlayer10/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="BaleogDeathTimerLabel">
-              <Text val="{$BaleogDeathTimerPlayer10/@Text}"/>
-              <Visible val="{$BaleogDeathTimerPlayer10/@Visible}"/>
-            </Frame>
-            <Frame type="Label" name="ErikDeathTimerLabel">
-              <Text val="{$ErikDeathTimerPlayer10/@Text}"/>
-              <Visible val="{$ErikDeathTimerPlayer10/@Visible}"/>
-            </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel">
+            <Text val="{$OlafDeathTimerPlayer10/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame1/DeadLabel">
+            <Text val="{$BaleogDeathTimerPlayer10/@Text}"/>
+          </Frame>
+          <Frame type="Label" name="SelectionUnitStatusPanel/UnitStatusFrame0/TLVFrame/VikingUnitTracker/TrackedUnitStatusFrame2/DeadLabel">
+            <Text val="{$ErikDeathTimerPlayer10/@Text}"/>
           </Frame>
         </Frame>
         <!-- <Frame type="Label" name="PlayerVikingHPTestLabelOlaf">
@@ -22729,6 +22679,9 @@
               <Key type="Property" time="0" value="false"/>
               <Key type="Property" time="0.25" value="true"/>
             </Controller>
+            <Controller type="Property" property="Toggled" end="Pause"  frame="$Talent4MasterSetting/HeroicIngress/CheckBoxButton">
+              <Key type="Property" time="0" value="true" />
+            </Controller>
             <Controller type="State" stateGroup="SelectedValue" end="Pause" frame="$TopBarSettingsFrame/LayoutPulldown1">
               <Key type="Identifier" time="0" value="1" />
             </Controller>
@@ -22806,6 +22759,9 @@
               <Key type="Property" time="0.125" value="true"/>
               <Key type="Property" time="0.25" value="#TopBarProxyTalents"/>
             </Controller>
+            <Controller type="Property" property="Toggled" end="Pause"  frame="$Talent4MasterSetting/HeroicIngress/CheckBoxButton">
+              <Key type="Property" time="0" value="false" />
+            </Controller>
             <Controller type="State" stateGroup="SelectedValue" end="Pause" frame="$TopBarSettingsFrame/LayoutPulldown1">
               <Key type="Identifier" time="0" value="#DefaultLayoutOption" />
             </Controller>
diff --git a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBar.StormLayout b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBar.StormLayout
index 571115d..c61fbca 100644
--- a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBar.StormLayout
+++ b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBar.StormLayout
@@ -389,7 +389,7 @@
             <When type="Property" frame="$this" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_abathur.dds"/>
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="Assets/Textures/storm_ui_ingame_hero_loadingscreen_abathur.dds" />
             <Action type="SetProperty" frame="$parent/$parent/PlayerIconRef" Texture="Assets/Textures/storm_ui_glues_draft_portrait_abathur.dds" />
-            <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" AlwaysShowHero="False" />
+            <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" AlwaysShowHero="True" />
             <Action type="SetProperty" frame="$this" Alpha="0" />
           </State>
           <State name="Alarak">
@@ -487,11 +487,6 @@
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="Assets/Textures/storm_ui_ingame_hero_loadingscreen_chen.dds" />
             <Action type="SetProperty" frame="$parent/$parent/PlayerIconRef" Texture="Assets/Textures/storm_ui_glues_draft_portrait_chen.dds" />
             <Action type="SetProperty" frame="$this" Alpha="0" />
-            <!-- How do we want to handle these? -->
-            <!-- <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame" Visible="True" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame/StormHealthBarBacking" Visible="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame/EarthHealthBarBacking" Visible="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame/FireHealthBarBacking" Visible="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}" /> -->
           </State>
           <State name="Cho">
             <When type="Property" frame="$this" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_cho.dds"/>
@@ -533,7 +528,7 @@
           </State>
           <State name="DVa">
             <When type="Property" frame="$this" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_dva.dds"/>
-            <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" AlwaysShowHero="False" />
+            <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" AlwaysShowHero="True" />
             <Action type="SetProperty" frame="$parent/$parent/PlayerIconRef" Texture="Assets/Textures/storm_ui_glues_draft_portrait_dva.dds" />
             <!-- <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" SpecificUnit="HeroDVaMech" />
             <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" SpecificUnit="HeroDVaPilot" /> -->
@@ -695,12 +690,6 @@
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="Assets/Textures/storm_ui_ingame_hero_loadingscreen_lostvikings.dds" />
             <Action type="SetProperty" frame="$parent/$parent/PlayerIconRef" Texture="Assets/Textures/storm_ui_glues_draft_portrait_lostvikings.dds" />
             <Action type="SetProperty" frame="$this" Alpha="0" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame" Visible="False" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame/OlafHealthBarBacking" Visible="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame/BaleogHealthBarBacking" Visible="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame/ErikHealthBarBacking" Visible="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}" />
-            <!-- <Action type="SetAnchor" frame="$parent/$parent/PlayerHeroLoadingScreenImage" side="Left" relative="$parent" pos="Min" offset="-47" /> -->
-            <!-- <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" ImageMaskTexture="_Assets/UI/spaz_ui_loadingscreenalphamask_stand_vikings.dds" /> -->
           </State>
           <State name="Lucio">
             <When type="Property" frame="$this" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_lucio.dds"/>
@@ -812,7 +801,7 @@
           </State>
           <State name="Ragnaros">
             <When type="Property" frame="$this" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_ragnaros.dds"/>
-             <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" AlwaysShowHero="False" />
+             <Action type="SetProperty" frame="$parent/$parent/SelectionUnitStatusPanel" AlwaysShowHero="True" />
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="Assets/Textures/storm_ui_ingame_hero_loadingscreen_ragnaros.dds" />
             <Action type="SetProperty" frame="$parent/$parent/PlayerIconRef" Texture="Assets/Textures/storm_ui_glues_draft_portrait_ragnaros.dds" />
             <Action type="SetProperty" frame="$this" Alpha="0" />
@@ -835,8 +824,6 @@
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="Assets/Textures/storm_ui_ingame_hero_loadingscreen_rexxar.dds" />
             <Action type="SetProperty" frame="$parent/$parent/PlayerIconRef" Texture="Assets/Textures/storm_ui_glues_draft_portrait_rexxar.dds" />
             <Action type="SetProperty" frame="$this" Alpha="0" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame" Visible="False" />
-            <Action type="SetProperty" frame="$parent/$parent/HeroSpecificOverrideTemplaterFrame/MishaPanel" Visible="False" />
           </State>
           <State name="Samuro">
             <When type="Property" frame="$this" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_samuro.dds"/>
@@ -2381,6 +2368,56 @@
         <Action type="SetState" frame="$this/T6AnchorFrame" Group="LayoutState" State="WIIIDE"/>
         <Action type="SetState" frame="$this/T7AnchorFrame" Group="LayoutState" State="WIIIDE"/>
       </State>
+      <State name="UltracompactHeroicIntoBasicHeroicTracerCoreEnabled">
+        <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+        <When type="Property" frame="$Talent4MasterSetting/HeroicIngress/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$Talent0MasterSetting/ShowActives/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$this/PlayerHeroIconFrame/HeroIconImage" operator="Equal" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_tracer.dds"/>
+        <Action type="SetAnchor" frame="$this/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" side="Left" relative="$ancestor[@type=SelectionUnitStatusPanel]/$parent/HeroicAnchorFrame" pos="Max" offset="0" />
+        <Action type="SetAnchor" frame="$this/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" side="Top" relative="$parent" pos="Mid" offset="13" />
+        <Action type="SetProperty" frame="$this/HeroicAnchorFrame/Label" Text="UTCPAVTR" />
+        <Action type="SetState" frame="$this/T1AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T2AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T3AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/HeroicAnchorFrame" Group="LayoutState" State="UltracompactAlternate"/>
+        <Action type="SetState" frame="$this/T5AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T6AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T7AnchorFrame" Group="LayoutState" State="Disabled"/>
+      </State>
+      <State name="UltracompactHeroicIntoBasicHeroicDeathwingCoreEnabledHeroicAvailable">
+        <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+        <When type="Property" frame="$Talent4MasterSetting/HeroicIngress/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$Talent0MasterSetting/ShowActives/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$this/PlayerHeroIconFrame/HeroIconImage" operator="Equal" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_deathwing.dds"/>
+        <When type="StateGroup" frame="$this/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" operator="Equal" TextureState="TierAvailable"/>
+        <Action type="SetAnchor" frame="$this/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" side="Left" relative="$ancestor[@type=SelectionUnitStatusPanel]/$parent/HeroicAnchorFrame" pos="Max" offset="0" />
+        <Action type="SetAnchor" frame="$this/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" side="Top" relative="$parent" pos="Mid" offset="13" />
+        <Action type="SetProperty" frame="$this/HeroicAnchorFrame/Label" Text="UTCPAVDW1" />
+        <Action type="SetState" frame="$this/T1AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T2AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T3AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/HeroicAnchorFrame" Group="LayoutState" State="UltracompactAlternate"/>
+        <Action type="SetState" frame="$this/T5AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T6AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T7AnchorFrame" Group="LayoutState" State="Disabled"/>
+      </State>
+      <State name="UltracompactHeroicIntoBasicHeroicDeathwingCoreEnabledHeroicNotSelected">
+        <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+        <When type="Property" frame="$Talent4MasterSetting/HeroicIngress/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$Talent0MasterSetting/ShowActives/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$this/PlayerHeroIconFrame/HeroIconImage" operator="Equal" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_deathwing.dds"/>
+        <When type="StateGroup" frame="$this/HeroSelectedTalentTreeFrame/TalentTreeIcon4/IconImage" operator="NotEqual" TextureState="TierSelected"/>
+        <Action type="SetAnchor" frame="$this/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" side="Left" relative="$ancestor[@type=SelectionUnitStatusPanel]/$parent/HeroicAnchorFrame" pos="Max" offset="0" />
+        <Action type="SetAnchor" frame="$this/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" side="Top" relative="$parent" pos="Mid" offset="13" />
+        <Action type="SetProperty" frame="$this/HeroicAnchorFrame/Label" Text="UTCPAVDW2" />
+        <Action type="SetState" frame="$this/T1AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T2AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T3AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/HeroicAnchorFrame" Group="LayoutState" State="UltracompactAlternate"/>
+        <Action type="SetState" frame="$this/T5AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T6AnchorFrame" Group="LayoutState" State="Disabled"/>
+        <Action type="SetState" frame="$this/T7AnchorFrame" Group="LayoutState" State="Disabled"/>
+      </State>
       <State name="UltracompactHeroicIntoBasicHeroicAlwaysVisible">
         <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
         <When type="StateGroup" frame="$Talent4MasterSetting/TogglePulldown2" operator="Equal" SelectedValue="1"/>
@@ -6317,8 +6354,8 @@
       <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
       <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
       <PlayerId val="{$parent/PlayerHeroNameFrameTemplate/@PlayerId}" />
-      <HeroesOnly val="False" />
-      <AlwaysShowHero val="False" />
+      <HeroesOnly val="True" />
+      <AlwaysShowHero val="True" />
       <CheckPassengers val="True" />
       <AcceptsMouse val="False"/>
       <AcceptsMouseTooltip val="False"/>
@@ -6339,17 +6376,11 @@
         </Frame>
         <Frame type="UnitStatusBehaviorLabel" name="DeadLabel" template="SpazzoCustomTopBar/BehaviorDescriptionTemplate"/>
         <Frame type="UnitStatusBehaviorAnim" name="DeadDescription" template="SpazzoCustomTopBar/BehaviorAnimationTemplate" />
-        <Frame type="Image" name="HealthBarBacking">
+        <Frame type="Image" name="HealthBarBacking" template="SpazzoTemplates/HealthBarBackingTemplate">
           <Anchor side="Top" relative="$parent" pos="Mid" offset="13" />
           <Anchor side="Left" relative="$ancestor[@type=SelectionUnitStatusPanel]/$parent/HeroBG" pos="Min" offset="2" />
           <Anchor side="Right" relative="$ancestor[@type=SelectionUnitStatusPanel]/$parent/HeroBG" pos="Max" offset="-3" />
           <Anchor side="Bottom" relative="$this" pos="Min" offset="9" />
-          <Texture val="@UI/Spazzo/HealthBarBacking" />
-          <TextureType val="Nineslice" />
-          <Unclipped val="False"/>
-          <AcceptsMouseTooltip val="False" />
-          <AcceptsMouse val="False" />
-          <Visible val="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}"/>
         </Frame>
         <Frame type="Image" name="ManaBarBacking">
           <Anchor side="Top" relative="$parent/HealthBarBacking" pos="Max" offset="0" />
@@ -6491,7 +6522,6 @@
           <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
           <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
         </Frame>
-        <Frame type="Frame" name="UnitVehicleTrackerFrame" template="SpazzoTemplates/VehicleTrackedUnitContainerFrame"/>
         <Frame type="Label" name="DeadMonitor">
           <Text val="False"/>
         </Frame>
@@ -6505,6 +6535,7 @@
           <AllowUnitClicks val="true" />
           <AllowCursorChanging val="true" />
         </Frame> -->
+        <Frame type="Frame" name="TLVFrame" template="SpazzoTemplates/VikingVikingHealthTemplate"/>
         <StateGroup name="CustomEnergyState">
           <DefaultState val="Vanilla"/>
           <State name="TLVRemove">
@@ -7269,61 +7300,31 @@
             <When type="Property" frame="$parent/$parent/PlayerHeroIconFrame/HeroIconImage" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_dva.dds"/>
             <When type="Property" frame="$this" Unit="HeroDVaMech"/>
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_dvamech_fake.dds" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" />
+            <!-- <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" /> -->
           </State>
           <State name="DVaPilot">
             <When type="Property" frame="$parent/$parent/PlayerHeroIconFrame/HeroIconImage" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_dva.dds"/>
             <When type="Property" frame="$this" Unit="HeroDVaPilot"/>
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="Assets/Textures/storm_ui_ingame_hero_loadingscreen_dva.dds" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" />
+            <!-- <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" /> -->
           </State>
           <State name="Samuro">
             <When type="Property" frame="$parent/$parent/PlayerHeroIconFrame/HeroIconImage" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_samuro.dds"/>
             <When type="Property" frame="$this" Unit="HeroSamuro"/>
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="Assets/Textures/storm_ui_ingame_hero_loadingscreen_samuro.dds" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" />
+            <!-- <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" /> -->
           </State>
           <State name="SamuroMirrorImage">
             <When type="Property" frame="$parent/$parent/PlayerHeroIconFrame/HeroIconImage" texture="Assets\Textures\storm_ui_ingame_hero_leaderboard_samuro.dds"/>
             <When type="Property" frame="$this" Unit="SamuroMirrorImage"/>
             <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_samuromirror_fake.dds" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" />
-            <Action type="SetProperty" frame="$parent/$parent/DummyAncestorRelationFrame/SelectionUnitStatusPanelTalentsFrame/UnitStatusFrame0/TrigGunnerIndicator" Visible="True" />
-          </State>
-          <State name="DragonKnight">
-            <When type="Property" frame="$this" Unit="VehicleDragon"/>
-            <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_dk_fake.dds" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" />
-          </State>
-          <State name="TriglavProtectorPilot">
-            <When type="Property" frame="$this" Unit="VolskayaVehicle"/>
-            <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_trig_fake.dds" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" />
-          </State>
-          <State name="TriglavProtectorGunner">
-            <When type="Property" frame="$this" Unit="VolskayaVehicleGunner"/>
-            <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_triggun_fake.dds" />
-            <Action type="SetProperty" frame="$parent/$parent/DummyAncestorRelationFrame/SelectionUnitStatusPanelTalentsFrame/UnitStatusFrame0/TrigGunnerIndicator" Visible="True" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" />
-            <!-- <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="AttachedVehicleGenericHeroInsideUnitTracker" /> -->
-          </State>
-          <State name="BlazeBunker">
-            <When type="Property" frame="$this" Unit="FirebatBunkerDropTurretUnit"/>
-            <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_bunker_fake.dds" />
-            <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="FirebatBunkerDropTurretPassengerUnitTracker" />
+            <!-- <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="VehicleGenericHeroInsideUnitTracker" /> -->
             <!-- <Action type="SetProperty" frame="$parent/$parent/DummyAncestorRelationFrame/SelectionUnitStatusPanelTalentsFrame/UnitStatusFrame0/TrigGunnerIndicator" Visible="True" /> -->
           </State>
-          <State name="Dropship">
-            <When type="Property" frame="$this" Unit="MedicMedivacDropship"/>
-            <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_medivac_fake.dds" />
-            <!-- <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" Behavior="MedicMedivacUnitTracker" /> -->
-            <!-- <Action type="SetProperty" frame="UnitVehicleTrackerFrame/UnitTrackingElement" ShowValidator="FirebatIsFirebatUnit" /> -->
-            <Action type="SetProperty" frame="$parent/$parent/DummyAncestorRelationFrame/SelectionUnitStatusPanelTalentsFrame/UnitStatusFrame0/TrigGunnerIndicator" Visible="True" />
-          </State>
           <State name="MoltenCore">
             <When type="Property" frame="$this" Unit="RagnarosBigRag"/>
             <!-- <Action type="SetProperty" frame="$parent/$parent/PlayerHeroLoadingScreenImage" Texture="_Assets/UI/spaz_ui_bigrag_fake.dds" /> -->
-            <Action type="SetProperty" frame="$parent/$parent/DummyAncestorRelationFrame/SelectionUnitStatusPanelTalentsFrame/UnitStatusFrame0/TrigGunnerIndicator" Visible="True" />
+            <!-- <Action type="SetProperty" frame="$parent/$parent/DummyAncestorRelationFrame/SelectionUnitStatusPanelTalentsFrame/UnitStatusFrame0/TrigGunnerIndicator" Visible="True" /> -->
           </State>
           <State name="NoCustom">
           </State>
@@ -7365,47 +7366,6 @@
             <Anchor side="Right" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/FountainAnchor" pos="Max" offset="0"/>
             <Anchor side="Bottom" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/FountainAnchor" pos="Max" offset="0"/>
           </Frame>
-          <Frame type="Frame" name="TrigGunnerIndicator">
-            <Visible val="false"/>
-            <StateGroup name="VehiclePassengerToggleStateGroup">
-              <DefaultState val="Enabled"/>
-              <State name="Ultracompact">
-                <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-                <Action type="SetAnchor" frame="$this" side="Top" relative="$INVALID" pos="0" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Left" relative="$INVALID" pos="0" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Right" relative="$INVALID" pos="0" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Bottom" relative="$INVALID" pos="0" offset="0" />
-              </State>
-              <State name="EnabledCompact">
-                <When type="Property" frame="$Talent0MasterSetting/ShowVehicleHP/CheckBoxButton" Toggled="True"/>
-                <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
-                <Action type="SetAnchor" frame="$this" side="Top" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/FarAnchor" pos="Min" offset="-35" />
-                <Action type="SetAnchor" frame="$this" side="Left" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/CloseAnchor" pos="Min" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Right" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="-23" />
-                <Action type="SetAnchor" frame="$this" side="Bottom" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="-23" />
-              </State>
-              <State name="Enabled">
-                <When type="Property" frame="$Talent0MasterSetting/ShowVehicleHP/CheckBoxButton" Toggled="True"/>
-                <Action type="SetAnchor" frame="$this" side="Top" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/FarAnchor" pos="Min" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Left" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/FarAnchor" pos="Min" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Right" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Bottom" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="0" />
-              </State>
-              <State name="Disabled">
-                <When type="Property" frame="$Talent0MasterSetting/ShowVehicleHP/CheckBoxButton" Toggled="False"/>
-                <Action type="SetAnchor" frame="$this" side="Top" relative="$INVALID" pos="0" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Left" relative="$INVALID" pos="0" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Right" relative="$INVALID" pos="0" offset="0" />
-                <Action type="SetAnchor" frame="$this" side="Bottom" relative="$INVALID" pos="0" offset="0" />
-              </State>
-            </StateGroup>
-            <Frame type="UnitStatusMinimapIcon" name="UnitStatusContainedHeroIcon" template="SpazzoTemplates/VehicleTrackedUnitContainerFrame/UnitTrackingElement/TrackedUnitStatusFrame0/UnitStatusContainedHeroIcon">
-              <Frame type="Image" name="BorderImage">
-                <AdjustmentColor val="{$ancestor[@name=DummyAncestorRelationFrame]/$parent/PlayerColourFrame/@Color}" />
-              </Frame>
-            </Frame>
-            <Frame type="UnitStatusShieldedHealthLabel" name="ContainedHeroHealthPercentLabel" template="SpazzoTemplates/VehicleTrackedUnitContainerFrame/UnitTrackingElement/TrackedUnitStatusFrame0/ContainedHeroHealthPercentLabel"/>
-          </Frame>
           <Frame type="Frame" name="UnitMapMechanicCount" template="SpazzoTemplates/UnitMapMechanicContainerFrame">
             <Anchor side="Top" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/FountainAnchor" pos="Min" offset="-3"/>
             <Anchor side="Left" relative="$ancestor[@name=DummyAncestorRelationFrame]/$parent/FountainAnchor" pos="Max" offset="0"/>
@@ -8054,457 +8014,6 @@
         </Frame>
       </Frame>
     </Frame>
-    <Frame type="Frame" name="HeroSpecificOverrideTemplaterFrame">
-      <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-      <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-      <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-      <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-      <Visible val="False"/>
-      <BatchImages val="True"/>
-      <BatchText val="True" />
-      <Batch val="True"/>
-      <Frame type="Image" name="OlafHealthBarBacking" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking">
-        <Anchor side="Top" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="0" />
-        <Anchor side="Left" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="0" />
-        <Anchor side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-        <Anchor side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-        <RenderPriority val="513"/>
-        <Visible val="False"/>
-        <StateGroup name="Size">
-          <DefaultState val="Default"/>
-          <State name="WIIDE">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="0" />
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetWIDE" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetWIDE" />
-          </State>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="0" />
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetUltracompact" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetUltracompact" />
-          </State>
-          <State name="Compact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="-24" />
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetCompact" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetCompact" />
-          </State>
-          <State name="Ingress">
-            <When type="StateGroup" frame="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/HeroicAnchorFrame" operator="Equal" UseState="InUse"/>
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="0" />
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetIngress" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-          <State name="IngressNoHeroicInUse">
-            <When type="StateGroup" frame="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/HeroicAnchorFrame" operator="Equal" UseState="OutOfUse"/>
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="0" />
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="0"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking" pos="Min" offset="0" />
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Image" name="BaleogHealthBarBacking" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking">
-        <Anchor side="Top" relative="$parent/OlafHealthBarBacking" pos="Min" offset="0" />
-        <Anchor side="Left" relative="$parent/OlafHealthBarBacking" pos="Max" offset="0" />
-        <Anchor side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-        <Anchor side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-        <RenderPriority val="513"/>
-        <Visible val="False"/>
-        <StateGroup name="Size">
-          <DefaultState val="Default"/>
-          <State name="WIIDE">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetWIDE" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetWIDE" />
-          </State>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetUltracompact" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetUltracompact" />
-          </State>
-          <State name="Compact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetCompact" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetCompact" />
-          </State>
-          <State name="Ingress">
-            <When type="StateGroup" frame="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/HeroicAnchorFrame" operator="Equal" UseState="InUse"/>
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetIngress" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-          <State name="IngressNoHeroicInUse">
-            <When type="StateGroup" frame="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/HeroicAnchorFrame" operator="Equal" UseState="OutOfUse"/>
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="0"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Image" name="ErikHealthBarBacking" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBarBacking">
-        <Anchor side="Top" relative="$parent/BaleogHealthBarBacking" pos="Min" offset="0" />
-        <Anchor side="Left" relative="$parent/BaleogHealthBarBacking" pos="Max" offset="0" />
-        <Anchor side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-        <Anchor side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-        <RenderPriority val="513"/>
-        <Visible val="False"/>
-        <StateGroup name="Size">
-          <DefaultState val="Default"/>
-          <State name="WIIDE">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetWIDE" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetWIDE" />
-          </State>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetUltracompact" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetUltracompact" />
-          </State>
-          <State name="Compact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetCompact" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetCompact" />
-          </State>
-          <State name="Ingress">
-            <When type="StateGroup" frame="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/HeroicAnchorFrame" operator="Equal" UseState="InUse"/>
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetIngress" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-          <State name="IngressNoHeroicInUse">
-            <When type="StateGroup" frame="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/HeroicAnchorFrame" operator="Equal" UseState="OutOfUse"/>
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="0"/>
-            <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
-            <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Image" name="OlafIndicatorIcon">
-        <Anchor side="Right" relative="$parent/OlafHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
-        <Anchor side="Bottom" relative="$parent/OlafHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
-        <Height val="#TLVIconSize"/>
-        <Width val="#TLVIconSize"/>
-        <Texture val="Assets\Textures\storm_ui_hud_heromechanic_vikings_shield_small_off.dds"/>
-        <RenderPriority val="515"/>
-        <Visible val="{$parent/OlafHealthBarBacking/@Visible}"/>
-        <StateGroup name="Size">
-          <DefaultState val="Default"/>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetProperty" frame="$this" Height="#TLVIconSizeUltracompact" />
-            <Action type="SetProperty" frame="$this" Width="#TLVIconSizeUltracompact" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
-            <Action type="SetProperty" frame="$this" Height="#TLVIconSize" />
-            <Action type="SetProperty" frame="$this" Width="#TLVIconSize" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Image" name="BaleogIndicatorIcon">
-        <Anchor side="Right" relative="$parent/BaleogHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
-        <Anchor side="Bottom" relative="$parent/BaleogHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
-        <Height val="#TLVIconSize"/>
-        <Width val="#TLVIconSize"/>
-        <Texture val="Assets\Textures\storm_ui_hud_heromechanic_vikings_sword_small_off.dds"/>
-        <RenderPriority val="515"/>
-        <Visible val="{$parent/BaleogHealthBarBacking/@Visible}"/>
-        <StateGroup name="Size">
-          <DefaultState val="Default"/>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetProperty" frame="$this" Height="#TLVIconSizeUltracompact" />
-            <Action type="SetProperty" frame="$this" Width="#TLVIconSizeUltracompact" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
-            <Action type="SetProperty" frame="$this" Height="#TLVIconSize" />
-            <Action type="SetProperty" frame="$this" Width="#TLVIconSize" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Image" name="ErikIndicatorIcon">
-        <Anchor side="Right" relative="$parent/ErikHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
-        <Anchor side="Bottom" relative="$parent/ErikHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
-        <Height val="#TLVIconSize"/>
-        <Width val="#TLVIconSize"/>
-        <Texture val="Assets\Textures\storm_ui_hud_heromechanic_vikings_boot_small_off.dds"/>
-        <RenderPriority val="515"/>
-        <Visible val="{$parent/ErikHealthBarBacking/@Visible}"/>
-        <StateGroup name="Size">
-          <DefaultState val="Default"/>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetProperty" frame="$this" Height="#TLVIconSizeUltracompact" />
-            <Action type="SetProperty" frame="$this" Width="#TLVIconSizeUltracompact" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
-            <Action type="SetProperty" frame="$this" Height="#TLVIconSize" />
-            <Action type="SetProperty" frame="$this" Width="#TLVIconSize" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Label" name="OlafDeathTimerLabel">
-        <Anchor side="Top" relative="$parent/OlafHealthBarBacking" pos="Min" offset="0" />
-        <Anchor side="Left" relative="$parent/OlafHealthBarBacking" pos="Min" offset="1" />
-        <Style val="Spazzo_TopPanelVikingDeathLabel"/>
-        <Color val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerColourFrame/@Color}" />
-        <RenderPriority val="515"/>
-        <StateGroup name="Position">
-          <DefaultState val="Default"/>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/OlafHealthBarBacking" pos="Min" offset="-1" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/OlafHealthBarBacking" pos="Min" offset="-1" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Label" name="BaleogDeathTimerLabel">
-        <Anchor side="Top" relative="$parent/BaleogHealthBarBacking" pos="Min" offset="0" />
-        <Anchor side="Left" relative="$parent/BaleogHealthBarBacking" pos="Min" offset="1" />
-        <Style val="Spazzo_TopPanelVikingDeathLabel"/>
-        <Color val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerColourFrame/@Color}" />
-        <RenderPriority val="515"/>
-        <StateGroup name="Position">
-          <DefaultState val="Default"/>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/BaleogHealthBarBacking" pos="Min" offset="-1" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/BaleogHealthBarBacking" pos="Min" offset="-1" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="Label" name="ErikDeathTimerLabel">
-        <Anchor side="Top" relative="$parent/ErikHealthBarBacking" pos="Min" offset="0" />
-        <Anchor side="Left" relative="$parent/ErikHealthBarBacking" pos="Min" offset="1" />
-        <Style val="Spazzo_TopPanelVikingDeathLabel"/>
-        <Color val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerColourFrame/@Color}" />
-        <RenderPriority val="515"/>
-        <StateGroup name="Position">
-          <DefaultState val="Default"/>
-          <State name="Ultracompact">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/ErikHealthBarBacking" pos="Min" offset="-1" />
-          </State>
-          <State name="Default">
-            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
-            <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/ErikHealthBarBacking" pos="Min" offset="-1" />
-          </State>
-        </StateGroup>
-      </Frame>
-      <Frame type="SelectionUnitStatusPanel" name="OlafPanel">
-        <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <PlayerId val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerHeroNameFrameTemplate/@PlayerId}" />
-        <HeroesOnly val="False" />
-        <AlwaysShowHero val="False" />
-        <SpecificUnit val="HeroOlaf"/>
-        <CheckPassengers val="True" />
-        <AcceptsMouse val="False"/>
-        <AcceptsMouseTooltip val="False"/>
-        <RenderPriority val="514"/>
-        <Visible val="{$parent/OlafHealthBarBacking/@Visible}"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame0">
-          <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-          <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-          <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-          <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-          <AcceptsMouse val="False"/>
-          <AcceptsMouseTooltip val="False"/>
-          <Persistent val="true" />
-          <Frame type="UnitStatusShieldedHealthBar" name="HealthBar" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBar">
-            <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/OlafHealthBarBacking" pos="Min" offset="1" />
-            <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/OlafHealthBarBacking" pos="Min" offset="1" />
-            <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/OlafHealthBarBacking" pos="Max" offset="-1" />
-            <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/OlafHealthBarBacking" pos="Max" offset="-1" />
-            <Expansion val="Up" />
-          </Frame>
-        </Frame>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame1" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/OlafPanel/UnitStatusFrame0"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame2" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/OlafPanel/UnitStatusFrame0"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame3" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/OlafPanel/UnitStatusFrame0"/>
-      </Frame>
-      <Frame type="SelectionUnitStatusPanel" name="BaleogPanel">
-        <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <PlayerId val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerHeroNameFrameTemplate/@PlayerId}" />
-        <HeroesOnly val="False" />
-        <AlwaysShowHero val="False" />
-        <CheckPassengers val="True" />
-        <SpecificUnit val="HeroBaleog"/>
-        <AcceptsMouse val="False"/>
-        <AcceptsMouseTooltip val="False"/>
-        <RenderPriority val="514"/>
-        <Visible val="{$parent/BaleogHealthBarBacking/@Visible}"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame0">
-          <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-          <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-          <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-          <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-          <AcceptsMouse val="False"/>
-          <AcceptsMouseTooltip val="False"/>
-          <Persistent val="true" />
-          <Frame type="UnitStatusShieldedHealthBar" name="HealthBar" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBar">
-            <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/BaleogHealthBarBacking" pos="Min" offset="1" />
-            <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/BaleogHealthBarBacking" pos="Min" offset="1" />
-            <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/BaleogHealthBarBacking" pos="Max" offset="-1" />
-            <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/BaleogHealthBarBacking" pos="Max" offset="-1" />
-            <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/OlafHealthBarBacking" pos="Max" offset="-1" />
-            <Expansion val="Up" />
-          </Frame>
-        </Frame>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame1" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/BaleogPanel/UnitStatusFrame0"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame2" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/BaleogPanel/UnitStatusFrame0"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame3" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/BaleogPanel/UnitStatusFrame0"/>
-      </Frame>
-      <Frame type="SelectionUnitStatusPanel" name="ErikPanel">
-        <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <PlayerId val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerHeroNameFrameTemplate/@PlayerId}" />
-        <HeroesOnly val="False" />
-        <AlwaysShowHero val="False" />
-        <CheckPassengers val="True" />
-        <SpecificUnit val="HeroErik"/>
-        <AcceptsMouse val="False"/>
-        <AcceptsMouseTooltip val="False"/>
-        <RenderPriority val="514"/>
-        <Visible val="{$parent/ErikHealthBarBacking/@Visible}"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame0">
-          <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-          <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-          <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-          <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-          <AcceptsMouse val="False"/>
-          <AcceptsMouseTooltip val="False"/>
-          <Persistent val="true" />
-          <Frame type="UnitStatusShieldedHealthBar" name="HealthBar" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/SelectionUnitStatusPanel/UnitStatusFrame0/HealthBar">
-            <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/ErikHealthBarBacking" pos="Min" offset="1" />
-            <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/ErikHealthBarBacking" pos="Min" offset="1" />
-            <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/ErikHealthBarBacking" pos="Max" offset="-1" />
-            <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/ErikHealthBarBacking" pos="Max" offset="-1" />
-            <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/OlafHealthBarBacking" pos="Max" offset="-1" />
-            <Expansion val="Up" />
-          </Frame>
-        </Frame>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame1" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/ErikPanel/UnitStatusFrame0"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame2" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/ErikPanel/UnitStatusFrame0"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame3" template="SpazzoCustomTopBar/PlayerCustomTalentTreeReferenceFrame/HeroSpecificOverrideTemplaterFrame/ErikPanel/UnitStatusFrame0"/>
-      </Frame>
-      <Frame type="SelectionUnitStatusPanel" name="MishaPanel">
-        <Anchor side="Top" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Left" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Min" offset="0"/>
-        <Anchor side="Right" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <Anchor side="Bottom" relative="$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent" pos="Max" offset="0"/>
-        <PlayerId val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerHeroNameFrameTemplate/@PlayerId}" />
-        <HeroesOnly val="False" />
-        <AlwaysShowHero val="False" />
-        <CheckPassengers val="True" />
-        <SpecificUnit val="RexxarMisha"/>
-        <AcceptsMouse val="False"/>
-        <AcceptsMouseTooltip val="False"/>
-        <Height val="200"/>
-        <Width val="150"/>
-        <AlwaysShowHero val="True" />
-        <CheckPassengers val="True" />
-        <!-- <AllowObserverLocalSelection val="True" /> -->
-        <AcceptsMouse val="False"/>
-        <AcceptsMouseTooltip val="False"/>
-        <Height val="200"/>
-        <Width val="150"/>
-        <Visible val="False"/>
-        <Frame type="UnitStatusFrame" name="UnitStatusFrame0">
-          <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-          <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-          <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-          <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-          <Width val="200" />
-          <Height val="170" />
-          <AcceptsMouse val="False"/>
-          <AcceptsMouseTooltip val="False"/>
-          <RenderPriority val="999"/>
-          <Frame type="Frame" name="MishaHealth">
-            <Anchor side="Top" relative="$parent" pos="Min" offset="53"/>
-            <Anchor side="Bottom" relative="$parent" pos="Min" offset="83"/>
-            <Anchor side="Left" relative="$parent" pos="Min" offset="50"/>
-            <Anchor side="Right" relative="$parent" pos="Min" offset="120"/>
-            <Frame type="UnitStatusMinimapIcon" name="UnitStatusContainedHeroIcon">
-              <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-              <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-              <Anchor side="Right" relative="$parent" pos="Max" offset="-34"/>
-              <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-              <ColorStyle val="Primary" />
-              <AdditionalColorStyle val="PrimaryLight" index="0" />
-              <Frame type="Image" name="IconImage">
-                <Anchor relative="$parent" offset="-2" />
-                <Texture val="{$parent/@MinimapIcon}" />
-              </Frame>
-              <Frame type="Image" name="BorderImage">
-                <Anchor relative="$parent" offset="0" />
-                <RenderPriority val="513" />
-                <Texture val="Assets\Textures\storm_ui_hud_vehicle_unitstatus_medivac_green.dds" />
-                <AdjustmentColor val="{$ancestor[@name=HeroSpecificOverrideTemplaterFrame]/$parent/PlayerColourFrame/@Color}" />
-                <ColorAdjustMode val="Fill" />
-                <!-- <ColorAdjustMode val="None" />
-                <LightAdjustColor val="{$parent/@AdditionalColor[0]}" />
-                <DarkAdjustColor val="{$parent/@Color[0]}" /> -->
-              </Frame>
-            </Frame>
-            <Frame type="UnitStatusShieldedHealthLabel" name="ContainedHeroHealthPercentLabel" >
-              <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-              <Anchor side="Left" relative="$parent" pos="Min" offset="26"/>
-              <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-              <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-              <FractionDigits val="0"/>
-              <RoundMode val="up"/>
-              <HideMax val="true"/>
-              <ShowPercent val="true"/>
-              <ShowWhileInvulnerable val="true"/>
-              <Frame type="Label" name="StatusLabel">
-                <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-                <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-                <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-                <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-                <RenderPriority val="999" />
-                <Style val="Storm_VitalsLabel_Modified"/>
-                <SnapToDevicePixels val="true"/>
-              </Frame>
-            </Frame>
-          </Frame>
-        </Frame>
-      </Frame>
-    </Frame>
     <Frame type="Frame" name="TalentNumberContainers">
       <Anchor relative="$parent" />
       <BatchImages val="True"/>
diff --git a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarAbilities.StormLayout b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarAbilities.StormLayout
index bec9e51..dabeefe 100644
--- a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarAbilities.StormLayout
+++ b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarAbilities.StormLayout
@@ -3526,7 +3526,7 @@
       </State>
       <State name="HeroGarroshSeasonedSoldier">
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroGarrosh"/>
-        <When type="Property" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" texture="Assets\Textures\storm_ui_icon_garrosh_armor_up.dds"/>
+        <When type="Property" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" texture="Assets\Textures\storm_ui_icon_garrosh_bloodthirst.dds"/>
         <When type="StateGroup" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon6/IconImage" TextureState="TierSelected" />
         <Action type="SetProperty" frame="HeroAbil2/UnitAbilCharge" Visible="True" />
         <Action type="SetProperty" frame="HeroAbil2/UnitAbilCharge" AbilityLink="GarroshBloodthirst" />
@@ -4294,7 +4294,7 @@
       </State>
       <State name="DiabloHasSoulShieldTalent">
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroDiablo"/>
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_talent_spellshield.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_Talent_HardenedShield.dds"/>
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected" />
         <When type="Property" frame="$this/T1ControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="LabelT1" Text="SoulShield" />
@@ -4482,7 +4482,7 @@
         <Action type="SetProperty" frame="HeroActiveAbilT1/UnitAbilFrame" AbilityLink="TyrandeTrueshotAura" />
       </State>
       <State name="SgtHammerMaelstromRounds">
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_sgthammer_siegemode_var1.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_sgthammer_siegemode_var2.dds"/>
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected" />
         <When type="Property" frame="$this/T1ControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="LabelT1" Text="SgtHammerSiegeModeMaelstromRounds" />
@@ -7643,21 +7643,6 @@
           </Frame>
         </Frame>
       </Frame>
-      <Frame type="UnitStatusAbilIcon" name="UnitAbilFrameBackup" template="SpazzoCustomTopBarAbilities/AbilityTopBarTalentContainerTemplate/UnitAbilFrame">
-        <AbilityLink val="NULL" />
-        <Frame type="AbilIcon" name="AbilIcon">
-          <Frame type="Image" name="IconImage">
-            <Alpha val="0" />
-            <Visible val="false" />
-            <Unclipped val="false"/>
-          </Frame>
-          <Frame type="Label" name="CooldownLabel">
-            <StateGroup name="LabelStateGroup">
-              <DefaultState val="Heroic" />
-            </StateGroup>
-          </Frame>
-        </Frame>
-      </Frame>
       <Frame type="UnitStatusAbilCharge" name="AbilityCharge">
         <Frame type="Label" name="ChargesLabel">
           <StateGroup name="LabelStateGroup">
diff --git a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout
index 4779335..103b020 100644
--- a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout
+++ b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoCustomTopBarQuests.StormLayout
@@ -771,6 +771,19 @@
         <Action type="SetProperty" frame="$this/TalentTreeBorder/IconBorderImage" Visible="False" /> 
         <Action type="SetState" frame="$this" Group="BaselineType" State="HasNone"/>
       </State>
+      <State name="RexxarDummyState">
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroRexxar"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$Talent0MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <Action type="SetProperty" frame="$this/UnitAbilFrame" AbilityLink="NULL" />
+        <Action type="SetProperty" frame="$this/UnitStatusBehaviorIconBaselineQuest" Behavior="NULL" />
+        <Action type="SetProperty" frame="$this/UnitChargeFrame" AbilityLink="NULL" />
+        <Action type="SetProperty" frame="$this/UnitChargeFrame" ChargeLink="NULL" />
+        <Action type="SetProperty" frame="$this/UnitChargeFrame" ChargeLocation="Unit" /> 
+        <Action type="SetProperty" frame="$this/TalentTreeBorder" Visible="False" /> 
+        <Action type="SetProperty" frame="$this/TalentTreeBorder/IconBorderImage" Visible="False" /> 
+        <Action type="SetState" frame="$this" Group="BaselineType" State="HasNone"/>
+      </State>
       <State name="DeathwingHeroicAvailableForChoice">
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" unit="HeroDeathwing"/>
         <When type="Property" frame="$Talent0MasterSetting/ShowActives/CheckBoxButton" Toggled="True"/>
@@ -2458,6 +2471,17 @@
         <Action type="SetProperty" frame="$parent/BuffDurationT1" Behavior="JunkratConcussionMineBlowEmUpBonusDamageBehavior" />
         <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
       </State>
+      <State name="DwarfBlock">
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" Unit="HeroMuradin"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon1/IconImage" texture="Assets\Textures\storm_ui_icon_Muradin_Dwarftoss.dds"/>
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T1QuestControllerFrame" Visible="False"/>
+        <When type="Property" frame="$Talent1MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT1" Behavior="NULL" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT1" Behavior="TalentBucketBlock" />
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="False"/>
+      </State>
       <State name="NoState">
         <Action type="SetProperty" frame="$parent/QuestStackCounterT1" Behavior="NULL" />
         <Action type="SetProperty" frame="$parent/QuestStackCounterT1" Visible="False" />
@@ -2842,6 +2866,20 @@
         <Action type="SetState" frame="$this" Group="UsesTokens" State="True"/>
         <Action type="ApplyTemplate" frame="$parent/VisiblityControllerFrame" template="SpazzoCustomTopBarQuests/VisibityControllerFrameDontHideAtCompletion"/>
       </State>
+      <State name="ReflexiveBlock">
+        <When type="Property" frame="$ancestor[@type=UnitStatusFrame]" Unit="HeroIllidan"/>
+        <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon2/IconImage" TextureState="TierSelected"/>
+        <When type="Property" frame="$Talent2MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon2/IconImage" texture="Assets\Textures\storm_ui_icon_illidan_dive.dds"/>
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2" Behavior="TalentBucketBlock" />
+        <Action type="SetProperty" frame="$parent/BuffDurationT2" Behavior="TalentBucketBlock" />
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackLabel" Style="Spazzo_TopPanelQuestLabel_NotQuest" /> 
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" AdjustmentColor="255,200,200,200" /> 
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" Alpha="130" /> 
+        <Action type="SetProperty" frame="$parent/QuestStackCounterT2/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" ColorAdjustMode="Fill" /> 
+        <Action type="SetState" frame="$this" Group="UsesTokens" State="True"/>
+      </State>
       <State name="NoState">
         <Action type="SetProperty" frame="$parent/QuestStackCounterT2" Behavior="NULL" />
         <Action type="SetProperty" frame="$parent/QuestStackCounterT2" Visible="False" />
@@ -2868,7 +2906,7 @@
       </State>
       <State name="MaelstromWeapon">
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" TextureState="TierSelected"/>
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" texture="Assets\Textures\storm_ui_icon_thrall_windfury_var1.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon3/IconImage" texture="Assets\Textures\storm_ui_icon_thrall_windfury.dds"/>
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T3QuestControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="$parent" Behavior="ThrallMaelstromWeaponTokenCounter" />
         <Action type="ApplyTemplate" frame="$parent/VisiblityControllerFrame" template="SpazzoCustomTopBarQuests/VisibityControllerFrameDontHideAtCompletion"/>
@@ -3718,7 +3756,7 @@
       <DefaultState val="NoState" />
       <State name="Zanshin">
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" TextureState="TierSelected"/>
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_genji_deflect_b.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_genji_deflect.dds"/>
         <When type="Property" frame="$ancestor[@type=UnitStatusFrame]/T7QuestControllerFrame" Visible="True"/>
         <Action type="SetProperty" frame="$parent" Behavior="GenjiDeflectZanshin" /> 
       </State> 
@@ -3738,7 +3776,7 @@
         <When type="StateGroup" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" TextureState="TierSelected"/>
         <When type="Property" frame="$Talent7MasterSetting/ShowNonQuests/CheckBoxButton" Toggled="True"/>
         <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/BottomPanelDetector" Text="False" />
-        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_malfurion_moonfire_a.dds"/>
+        <When type="Property" frame="$ancestor[@name=DummyAncestorRelationFrame]/$parent/HeroSelectedTalentTreeFrame/TalentTreeIcon7/IconImage" texture="Assets\Textures\storm_ui_icon_malfurion_moonfire.dds"/>
         <Action type="SetProperty" frame="$parent" Behavior="MalfurionMoonfireLunarShowerTokenCounter" /> 
         <Action type="SetProperty" frame="$parent/BehaviorIcon/StackLabel" Style="Spazzo_TopPanelQuestLabel_NotQuest" /> 
         <Action type="SetProperty" frame="$parent/BehaviorIcon/StackProgressBar/FillImageContainer/FillImage" AdjustmentColor="255,200,200,200" /> 
diff --git a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoTemplates.StormLayout b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoTemplates.StormLayout
index 6679f64..8d188f9 100644
--- a/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoTemplates.StormLayout
+++ b/interface/CustomScoreboard.StormInterface/Base.StormData/UI/Layout/SpazzoTemplates.StormLayout
@@ -24,6 +24,73 @@
   <Constant name="SpazzoCommandDynamicButtonLeftAnchor" val="-8" />
   <Constant name="SpazzoCommandFButtonLeftAnchor" val="-5" />
 
+
+  <Frame type="Image" name="HealthBarBackingTemplate">
+    <Texture val="@UI/Spazzo/HealthBarBacking" />
+    <TextureType val="Nineslice" />
+    <Unclipped val="False"/>
+    <AcceptsMouseTooltip val="False" />
+    <AcceptsMouse val="False" />
+    <Visible val="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}"/>
+  </Frame>
+
+  <Frame type="UnitStatusShieldedHealthBar" name="VikingHealthBar">
+    <Anchor side="Top" relative="$parent" pos="Mid" offset="8"/>
+    <Anchor side="Left" relative="$parent" pos="Min" offset="5"/>
+    <Anchor side="Right" relative="$this" pos="Min" offset="31"/>
+    <Anchor side="Bottom" relative="$this" pos="Min" offset="31"/>
+    <Texture val="Assets/Textures/storm_ui_targetinfopanel_statusbar.dds" />
+    <BarCount val="5" />
+    <ColorStyle val="Primary" index="0" />
+    <Tiled val="True" index="0" />
+    <ApplyToTotal val="True" index="0" />
+    <ColorStyle val="DoT" index="1" />
+    <Tiled val="True" index="1" />
+    <ReductionShown val="True" index="1" />
+    <IncreaseDuration val="0" index="1" />
+    <ApplyToTotal val="False" index="1" />
+    <ColorStyle val="Shields" index="2" />
+    <Tiled val="True" index="2" />
+    <ReductionShown val="true" index="2" />
+    <IncreaseDuration val="1000" index="2" />
+    <DecreaseDuration val="2000" index="2" />
+    <ApplyToTotal val="False" index="2" />
+    <ReductionColor val="109, 255, 255" index="2" />
+    <ColorStyle val="ShieldsDoT" index="3" />
+    <Tiled val="True" index="3" />
+    <ReductionShown val="True" index="3" />
+    <IncreaseDuration val="0" index="3" />
+    <ApplyToTotal val="False" index="3" />
+    <ColorStyle val="HoT" index="4" />
+    <Tiled val="True" index="4" />
+    <ReductionShown val="true" index="4" />
+    <IncreaseDuration val="0" index="4" />
+    <ApplyToTotal val="False" index="4" />
+    <Unclipped val="False"/>
+    <AcceptsMouseTooltip val="False" />
+    <AcceptsMouse val="False" />
+    <BackgroundShown val="true" />
+    <BackgroundColor val="125, 0, 0, 0" />
+    <BarInsetRect top="0" left="0" bottom="0" right="0" />
+    <BackgroundInsetRect top="0" left="0" bottom="0" right="0" />
+    <Expansion val="Up" />
+  </Frame>
+  
+  <Frame type="Image" name="VikingFakeHealthBar">
+    <Anchor side="Top" relative="$parent" pos="Mid" offset="8"/>
+    <Anchor side="Left" relative="$parent" pos="Min" offset="5"/>
+    <Anchor side="Right" relative="$this" pos="Min" offset="31"/>
+    <Anchor side="Bottom" relative="$this" pos="Min" offset="31"/>
+    <Texture val="Assets/Textures/storm_ui_targetinfopanel_statusbar.dds" />
+    <Color val="AllWhite" />
+    <Alpha val="70"/>
+    <Unclipped val="False"/>
+    <AcceptsMouseTooltip val="False" />
+    <AcceptsMouse val="False" />
+  </Frame>
+
+  
+  
   <Frame type="UnitStatusFrame" name="UnitStatusFrameTemplate">
     <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
     <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
@@ -420,120 +487,6 @@
       </Frame>
     </Frame>
   </Frame>
-  <Frame type="Frame" name="VehicleTrackedUnitContainerFrame">
-    <StateGroup name="VehiclePassengerToggleStateGroup">
-      <DefaultState val="Enabled"/>
-      <State name="Ultracompact">
-        <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
-        <Action type="SetAnchor" frame="$this" side="Top" relative="$INVALID" pos="0" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Left" relative="$INVALID" pos="0" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Right" relative="$INVALID" pos="0" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Bottom" relative="$INVALID" pos="0" offset="0" />
-      </State>
-      <State name="EnabledCompact">
-        <When type="Property" frame="$Talent0MasterSetting/ShowVehicleHP/CheckBoxButton" Toggled="True"/>
-        <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
-        <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/AbilityCooldownsContainerFrame/FarAnchor" pos="Min" offset="-35" />
-        <Action type="SetAnchor" frame="$this" side="Left" relative="$parent/AbilityCooldownsContainerFrame/CloseAnchor" pos="Min" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Right" relative="$parent/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="-23" />
-        <Action type="SetAnchor" frame="$this" side="Bottom" relative="$parent/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="-23" />
-      </State>
-      <State name="Enabled">
-        <When type="Property" frame="$Talent0MasterSetting/ShowVehicleHP/CheckBoxButton" Toggled="True"/>
-        <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/AbilityCooldownsContainerFrame/FarAnchor" pos="Min" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Left" relative="$parent/AbilityCooldownsContainerFrame/FarAnchor" pos="Min" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Right" relative="$parent/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Bottom" relative="$parent/AbilityCooldownsContainerFrame/FarAnchor" pos="Max" offset="0" />
-      </State>
-      <State name="Disabled">
-        <When type="Property" frame="$Talent0MasterSetting/ShowVehicleHP/CheckBoxButton" Toggled="False"/>
-        <Action type="SetAnchor" frame="$this" side="Top" relative="$INVALID" pos="0" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Left" relative="$INVALID" pos="0" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Right" relative="$INVALID" pos="0" offset="0" />
-        <Action type="SetAnchor" frame="$this" side="Bottom" relative="$INVALID" pos="0" offset="0" />
-      </State>
-    </StateGroup>
-    <Frame type="UnitStatusUnitTrackingBehavior" name="UnitTrackingElement">
-      <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-      <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-      <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-      <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-      <Behavior val="VehicleGenericHeroInsideUnitTracker" />
-      <Frame type="UnitStatusFrame" name="TrackedUnitStatusFrame0">
-        <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-        <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-        <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-        <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-        <Frame type="UnitStatusMinimapIcon" name="UnitStatusContainedHeroIcon">
-          <Anchor side="Top" relative="$parent" pos="Min" offset="1"/>
-          <Anchor side="Left" relative="$parent" pos="Max" offset="#SpazzoVehicleSizeNegOffset"/>
-          <Anchor side="Right" relative="$parent" pos="Max" offset="-5"/>
-          <Anchor side="Bottom" relative="$this" pos="Min" offset="#SpazzoVehicleSize"/>
-          <ColorStyle val="Primary" />
-          <AdditionalColorStyle val="PrimaryLight" index="0" />
-          <Frame type="Image" name="IconImage">
-            <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-            <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-            <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-            <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-            <Texture val="{$parent/@MinimapIcon}" />
-          </Frame>
-          <Frame type="Image" name="BorderImage">
-            <Anchor side="Top" relative="$parent/IconImage" pos="Min" offset="-2"/>
-            <Anchor side="Left" relative="$parent/IconImage" pos="Min" offset="-2"/>
-            <Anchor side="Right" relative="$parent/IconImage" pos="Max" offset="2"/>
-            <Anchor side="Bottom" relative="$parent/IconImage" pos="Max" offset="2"/>
-            <RenderPriority val="513" />
-            <Texture val="Assets\Textures\storm_ui_hud_vehicle_unitstatus_medivac_green.dds" />
-            <AdjustmentColor val="{$ancestor[@type=SelectionUnitStatusPanel]/$parent/PlayerColourFrame/@Color}" />
-            <ColorAdjustMode val="Fill" />
-          </Frame>
-        </Frame>
-        <Frame type="UnitStatusShieldedHealthLabel" name="ContainedHeroHealthPercentLabel" >
-          <Anchor side="Top" relative="$parent/UnitStatusContainedHeroIcon" pos="Min" offset="7"/>
-          <Anchor side="Left" relative="$parent/UnitStatusContainedHeroIcon" pos="Min" offset="-10"/>
-          <Anchor side="Right" relative="$parent/UnitStatusContainedHeroIcon" pos="Max" offset="10"/>
-          <Anchor side="Bottom" relative="$parent/UnitStatusContainedHeroIcon" pos="Max" offset="7"/>
-          <Visible val="True"/>
-          <FractionDigits val="0"/>
-          <RoundMode val="up"/>
-          <HideMax val="true"/>
-          <ShowPercent val="true"/>
-          <ShowWhileInvulnerable val="true"/>
-          <Frame type="Label" name="StatusLabel">
-            <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
-            <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
-            <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
-            <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
-            <RenderPriority val="999" />
-            <Style val="SpazzoVehicleHealthLabel"/>
-            <StateGroup name="Size">
-              <DefaultState val="Default"/>
-              <State name="Wide">
-                <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
-                <Action type="SetProperty" frame="$this" Style="SpazzoVehicleHealthLabel" />
-                <Action type="SetAnchor" frame="$parent" side="Top" relative="$parent/UnitStatusContainedHeroIcon" pos="Min" offset="11" />
-                <Action type="SetAnchor" frame="$parent" side="Bottom" relative="$parent/UnitStatusContainedHeroIcon" pos="Max" offset="11" />
-              </State>
-              <State name="Compact">
-                <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
-                <Action type="SetProperty" frame="$this" Style="SpazzoVehicleHealthLabelCompact" />
-                <Action type="SetAnchor" frame="$parent" side="Top" relative="$parent/UnitStatusContainedHeroIcon" pos="Min" offset="7" />
-                <Action type="SetAnchor" frame="$parent" side="Bottom" relative="$parent/UnitStatusContainedHeroIcon" pos="Max" offset="7" />
-              </State>
-              <State name="Default">
-                <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="2"/>
-                <Action type="SetProperty" frame="$this" Style="SpazzoVehicleHealthLabel" />
-                <Action type="SetAnchor" frame="$parent" side="Top" relative="$parent/UnitStatusContainedHeroIcon" pos="Min" offset="7" />
-                <Action type="SetAnchor" frame="$parent" side="Bottom" relative="$parent/UnitStatusContainedHeroIcon" pos="Max" offset="7" />
-              </State>
-            </StateGroup>
-            <SnapToDevicePixels val="true"/>
-          </Frame>
-        </Frame>
-      </Frame>
-    </Frame>
-  </Frame>
   <Frame type="Frame" name="SamuroRexxarTrackedSubUnitsFrame">
     <StateGroup name="UnitTypeFrame">
       <DefaultState val="NoState"/>
@@ -543,6 +496,8 @@
         <Action type="SetProperty" frame="SamuroTrackingElement" Visible="True" />
         <Action type="SetProperty" frame="SamuroTrackingElement" Behavior="SamuroMirrorImageUnitTracker" />
         <Action type="SetProperty" frame="SamuroBackgroundImage" Visible="True" />
+        <Action type="SetProperty" frame="RexxarTrackingElement" Visible="False" />
+        <Action type="SetProperty" frame="RexxarBackgroundImage" Visible="False" />
         <Action type="SetProperty" frame="BorderImage" Visible="True" />
       </State>
       <State name="Rexxar">
@@ -550,12 +505,16 @@
         <Action type="SetProperty" frame="SamuroTrackingElement" Visible="False" />
         <Action type="SetProperty" frame="SamuroTrackingElement" Behavior="NULL" />
         <Action type="SetProperty" frame="SamuroBackgroundImage" Visible="False" />
-        <Action type="SetProperty" frame="BorderImage" Visible="False" />
+        <Action type="SetProperty" frame="RexxarTrackingElement" Visible="True" />
+        <Action type="SetProperty" frame="RexxarBackgroundImage" Visible="True" />
+        <Action type="SetProperty" frame="BorderImage" Visible="True" />
       </State>
       <State name="NoState">
         <Action type="SetProperty" frame="SamuroTrackingElement" Visible="False" />
         <Action type="SetProperty" frame="SamuroTrackingElement" Behavior="NULL" />
         <Action type="SetProperty" frame="SamuroBackgroundImage" Visible="False" />
+        <Action type="SetProperty" frame="RexxarTrackingElement" Visible="False" />
+        <Action type="SetProperty" frame="RexxarTrackingElement" Visible="False" />
         <Action type="SetProperty" frame="BorderImage" Visible="False" />
       </State>
     </StateGroup>
@@ -576,7 +535,7 @@
       <Anchor side="Left" relative="$parent" pos="Min" offset="0" />
       <Anchor side="Bottom" relative="$parent" pos="Max" offset="0" />
       <Anchor side="Right" relative="$parent" pos="Max" offset="0" />
-      <RenderPriority val="499" />
+      <RenderPriority val="540" />
       <Visible val="False"/>
       <Texture val="_Assets\UI\spaz_ui_talentborder_newer.dds" />
     </Frame>
@@ -619,15 +578,6 @@
                 </Frame>
               </Frame>
             </Frame>
-            <!-- <Frame type="Label" name="CooldownLabel">
-              <Anchor side="Top" relative="$parent" pos="Min" offset="0" />
-              <Anchor side="Left" relative="$parent" pos="Min" offset="0" />
-              <Anchor side="Right" relative="$parent" pos="Max" offset="0" />
-              <Anchor side="Bottom" relative="$parent" pos="Max" offset="0" />
-              <RenderPriority val="513" />
-              <Text val="000" />
-              <Style val="Spazzo_SamuroLabel" />
-            </Frame> -->
           </Frame>
         </Frame>
         <Frame type="UnitStatusShieldedHealthBar" name="HealthBar">
@@ -707,15 +657,6 @@
                 </Frame>
               </Frame>
             </Frame>
-            <!-- <Frame type="Label" name="CooldownLabel">
-              <Anchor side="Top" relative="$parent" pos="Min" offset="0" />
-              <Anchor side="Left" relative="$parent" pos="Min" offset="0" />
-              <Anchor side="Right" relative="$parent" pos="Max" offset="0" />
-              <Anchor side="Bottom" relative="$parent" pos="Max" offset="0" />
-              <RenderPriority val="513" />
-              <Text val="000" />
-              <Style val="Spazzo_SamuroLabelBottom" />
-            </Frame> -->
           </Frame>
         </Frame>
         <Frame type="UnitStatusShieldedHealthBar" name="HealthBar">
@@ -759,6 +700,54 @@
         </Frame>
       </Frame>
     </Frame>
+    <Frame type="Image" name="RexxarBackgroundImage">
+      <Anchor side="Top" relative="$parent" pos="Min" offset="2" />
+      <Anchor side="Left" relative="$parent" pos="Min" offset="2" />
+      <Anchor side="Bottom" relative="$parent" pos="Max" offset="-2" />
+      <Anchor side="Right" relative="$parent" pos="Max" offset="-2" />
+      <RenderPriority val="498" />
+      <Visible val="False"/>
+      <Texture val="Assets\Textures\ui_targetportrait_hero_misha.dds" />
+      <ColorAdjustMode val="None" />
+      <Desaturated val="True" />
+      <DesaturationColor val="494B83" />
+    </Frame>
+    <Frame type="UnitStatusUnitTrackingBehavior" name="RexxarTrackingElement">
+      <Anchor relative="$parent" />
+      <Visible val="False"/>
+      <Behavior val="RexxarMishaTracker" />
+      <Frame type="UnitStatusFrame" name="TrackedUnitStatusFrame0">
+        <Anchor side="Top" relative="$parent" pos="Min" offset="0" />
+        <Anchor side="Left" relative="$parent" pos="Min" offset="0" />
+        <Anchor side="Bottom" relative="$parent" pos="Max" offset="0" />
+        <Anchor side="Right" relative="$parent" pos="Max" offset="0" />
+        <Frame type="Image" name="HealthBarBacking" template="SpazzoTemplates/HealthBarBackingTemplate">
+          <Anchor side="Top" relative="$parent" pos="Mid" offset="5" />
+          <Anchor side="Left" relative="$parent" pos="Min" offset="0" />
+          <Anchor side="Right" relative="$parent" pos="Max" offset="0" />
+          <Anchor side="Bottom" relative="$parent" pos="Max" offset="0" />
+          <RenderPriority val="500" />
+        </Frame>
+        <Frame type="UnitStatusShieldedHealthBar" name="HealthBar" template="SpazzoTemplates/VikingHealthBar">
+          <Anchor side="Top" relative="$parent/HealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Left" relative="$parent/HealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Right" relative="$parent/HealthBarBacking" pos="Max" offset="-1" />
+          <Anchor side="Bottom" relative="$parent/HealthBarBacking" pos="Max" offset="-1" />
+          <RenderPriority val="515" />
+          <Expansion val="Right" />
+        </Frame>
+        <Frame type="Image" name="RexxarBackgroundImage">
+          <Anchor side="Top" relative="$parent" pos="Min" offset="2" />
+          <Anchor side="Left" relative="$parent" pos="Min" offset="2" />
+          <Anchor side="Bottom" relative="$parent" pos="Max" offset="-2" />
+          <Anchor side="Right" relative="$parent" pos="Max" offset="-2" />
+          <RenderPriority val="498" />
+          <Visible val="True"/>
+          <Texture val="Assets\Textures\ui_targetportrait_hero_misha.dds" />
+          <ColorAdjustMode val="None" />
+        </Frame>
+      </Frame>
+    </Frame>
   </Frame>
   <Frame type="PlayerScoreValueFrame" name="PlayerScoreValueLabel">
     <Anchor side="Top" relative="$parent" pos="Min" offset="0" />
@@ -2522,36 +2511,7 @@
         </Frame>
         <Animation name="FadeAway">
           <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowTooltips/CheckBoxButton" />
-          <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowVehicleHP/CheckBoxButton" />
-          <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowTooltips/CheckBoxButton" />
-          <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowVehicleHP/CheckBoxButton" />
-          <Controller type="Fade" frame="$this" end="Pause">
-            <Key type="Curve" time="0" value="255" inout="Slow" />
-            <Key type="Curve" time="0.125" value="255" inout="Slow" />
-            <Key type="Curve" time="0.25" value="0" inout="Slow" />
-          </Controller>
-        </Animation>
-      </Frame>
-      <Frame type="Frame" name="ShowVehicleHP" template="SpazzoTemplates/ExpandoCheckboxMiddle">
-        <Anchor side="Bottom" relative="$parent/ShowQuests" pos="Min" offset="#OptionsMenuRevampTalentOptionsDistance" />
-        <Frame type="Button" name="CheckBoxButton">
-          <Toggled val="#TopBarShowVehiclePassengerHealth"/>
-          <Tooltip val="{$this/FormatFrame/@Text}"/>
-          <Frame type="TextFormatFrame" name="FormatFrame">
-            <Anchor relative="$parent" />
-            <FormatText val="@UI/Spazzo/Baseline/Vehicle" />
-            <Replacement index="0" val="#ToggleTopBarBasicAbilitiesVehicleHealthHotkey" />
-            <ReplacedName index="0" val="hotkeyvalue" />
-          </Frame>
-        </Frame>
-        <Frame type="Label" name="Label">
-          <Text val="@UI/Spazzo/Baseline/VehicleShort"/>
-        </Frame>
-        <Animation name="FadeAway">
-          <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowTooltips/CheckBoxButton" />
-          <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowBasics/CheckBoxButton" />
           <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowTooltips/CheckBoxButton" />
-          <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowBasics/CheckBoxButton" />
           <Controller type="Fade" frame="$this" end="Pause">
             <Key type="Curve" time="0" value="255" inout="Slow" />
             <Key type="Curve" time="0.125" value="255" inout="Slow" />
@@ -2577,9 +2537,7 @@
         </Frame>
         <Animation name="FadeAway">
           <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowBasics/CheckBoxButton" />
-          <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowVehicleHP/CheckBoxButton" />
           <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowBasics/CheckBoxButton" />
-          <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowVehicleHP/CheckBoxButton" />
           <Controller type="Fade" frame="$this" end="Pause">
             <Key type="Curve" time="0" value="255" inout="Slow" />
             <Key type="Curve" time="0.125" value="255" inout="Slow" />
@@ -2610,7 +2568,7 @@
         </Animation>
       </Frame>
       <Frame type="Frame" name="ShowObjectives" template="SpazzoTemplates/ExpandoCheckboxMiddle">
-        <Anchor side="Bottom" relative="$parent/ShowVehicleHP" pos="Min" offset="#OptionsMenuRevampTalentOptionsDistance" />
+        <Anchor side="Bottom" relative="$parent/ShowTooltips" pos="Min" offset="#OptionsMenuRevampTalentOptionsDistance" />
         <Frame type="Button" name="CheckBoxButton">
           <Toggled val="#DisplayHeldObjective"/>
           <Tooltip val="@UI/Spazzo/Baseline/HeldObjectives" />
@@ -3492,9 +3450,7 @@
         </Frame>
         <!-- <Animation name="FadeAway">
           <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowTooltips/CheckBoxButton" />
-          <Event event="OnMouseEnter" action="DirectionForward,Play" frame="$parent/ShowVehicleHP/CheckBoxButton" />
           <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowTooltips/CheckBoxButton" />
-          <Event event="OnMouseExit" action="DirectionReverse,Play" frame="$parent/ShowVehicleHP/CheckBoxButton" />
           <Controller type="Fade" frame="$this" end="Pause">
             <Key type="Curve" time="0" value="255" inout="Slow" />
             <Key type="Curve" time="0.125" value="0" inout="Slow" />
@@ -5933,5 +5889,621 @@
       </StateGroup>
     </Frame>
   </Frame>
+  
+
+  <Frame type="UnitStatusBehaviorIcon" name="VikingDeadRefTemplate">
+    <Anchor relative="$parent" />
+    <Behavior val="Dead" />
+    <AcceptsMouse val="False"/>
+    <AcceptsMouseTooltip val="False"/>
+    <Frame type="BehaviorIcon" name="BehaviorIcon">
+      <Anchor relative="$parent" />
+      <MinStackCountDisplayed val="1" />
+    </Frame>
+  </Frame>
+
+  <Frame type="Label" name="VikingDeadTextTemplate">
+    <SubpixelRendering val="True"/>
+    <Style val="Spazzo_TopPanelVikingDeathLabel" />
+    <AcceptsMouse val="False"/>
+    <AcceptsMouseTooltip val="False"/>
+    <ScaleText val="True"/>
+    <Visible val="False"/>
+    <Color val="{$ancestor[@name=SelectionUnitStatusPanel]/$parent/PlayerColourFrame/@Color}" />
+    <Text val="REPLACEME"/>
+  </Frame>
+  
+  <Frame type="Frame" name="VikingVikingHealthTemplate">
+    <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
+    <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
+    <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
+    <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
+    <StateGroup name="Visibility">
+      <DefaultState val="NotTLV"/>
+      <State name="NotTLV">
+        <Action type="SetProperty" frame="$this" Visible="False" />
+      </State>
+      <State name="TLV">
+        <When type="Property" frame="$parent" Unit="HeroLostVikingsController"/>
+        <Action type="SetProperty" frame="$this" Visible="True" />
+      </State>
+    </StateGroup>
+    <Frame type="Image" name="OlafHealthBarBacking" template="SpazzoTemplates/HealthBarBackingTemplate">
+      <Anchor side="Top" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="0" />
+      <Anchor side="Left" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="0" />
+      <Anchor side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
+      <Anchor side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
+      <RenderPriority val="513"/>
+      <Visible val="{$Talent0MasterSetting/ShowHealthBackings/CheckBoxButton/@Toggled}"/>
+      <StateGroup name="Size">
+        <DefaultState val="Default"/>
+        <State name="WIIDE">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
+          <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="0" />
+          <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetWIDE" />
+          <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetWIDE" />
+        </State>
+        <State name="Ultracompact">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+          <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="0" />
+          <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetUltracompact" />
+          <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetUltracompact" />
+        </State>
+        <State name="Compact">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
+          <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="-24" />
+          <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetCompact" />
+          <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffsetCompact" />
+        </State>
+        <State name="Ingress">
+          <When type="StateGroup" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroicAnchorFrame" operator="Equal" UseState="InUse"/>
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
+          <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="0" />
+          <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffsetIngress" />
+          <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
+        </State>
+        <State name="IngressNoHeroicInUse">
+          <When type="StateGroup" frame="$ancestor[@name=SelectionUnitStatusPanel]/$parent/HeroicAnchorFrame" operator="Equal" UseState="OutOfUse"/>
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
+          <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="0" />
+          <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
+          <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
+        </State>
+        <State name="Default">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="0"/>
+          <Action type="SetAnchor" frame="$this" side="Top" relative="$parent/$parent/HealthBarBacking" pos="Min" offset="0" />
+          <Action type="SetAnchor" frame="$this" side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
+          <Action type="SetAnchor" frame="$this" side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
+        </State>
+      </StateGroup>
+    </Frame>
+    <Frame type="Image" name="BaleogHealthBarBacking" template="SpazzoTemplates/VikingVikingHealthTemplate/OlafHealthBarBacking">
+      <Anchor side="Top" relative="$parent/OlafHealthBarBacking" pos="Min" offset="0" />
+      <Anchor side="Left" relative="$parent/OlafHealthBarBacking" pos="Max" offset="0" />
+      <Anchor side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
+      <Anchor side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
+    </Frame>
+    <Frame type="Image" name="ErikHealthBarBacking" template="SpazzoTemplates/VikingVikingHealthTemplate/OlafHealthBarBacking">
+      <Anchor side="Top" relative="$parent/BaleogHealthBarBacking" pos="Min" offset="0" />
+      <Anchor side="Left" relative="$parent/BaleogHealthBarBacking" pos="Max" offset="0" />
+      <Anchor side="Right" relative="$this" pos="Min" offset="#TLVHealthBarRightOffset" />
+      <Anchor side="Bottom" relative="$this" pos="Min" offset="#TLVHealthBarBottomOffset" />
+    </Frame>
+    <Frame type="UnitStatusUnitTrackingBehavior" name="VikingUnitTracker">
+      <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
+      <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
+      <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
+      <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
+      <Behavior val="LostVikingsVikingTracker" />
+      <Frame type="UnitStatusFrame" name="TrackedUnitStatusFrame0">
+        <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
+        <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
+        <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
+        <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
+        <Frame type="UnitStatusShieldedHealthBar" name="HealthBar" template="SpazzoTemplates/VikingHealthBar">
+          <Anchor side="Top" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Left" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Right" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Max" offset="-1" />
+          <Anchor side="Bottom" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Max" offset="-1" />
+        </Frame>
+        <Frame type="Image" name="FakeDeadHealthBar" template="SpazzoTemplates/VikingFakeHealthBar">
+          <Anchor side="Top" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Left" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Right" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Max" offset="-1" />
+          <Anchor side="Bottom" relative="$ancestor[@name=VikingUnitTracker]/$parent/OlafHealthBarBacking" pos="Max" offset="-1" />
+          <Visible val="False"/>
+        </Frame>
+        <Frame type="Image" name="ImageBoundCheck">
+          <Anchor relative="$parent/DeadTextDisplay" />
+          <Texture val="Assets\Textures\storm_ui_homescreenbackground_nexomania.dds"/>
+          <RenderPriority val="999" />
+          <Alpha val="120"/>
+          <Unclipped val="True"/>
+        </Frame>
+        <StateGroup name="DeadState">
+          <DefaultState val="NotDead"/>
+          <State name="NotDead">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="False"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="False" />
+            <Action type="SetProperty" frame="DeadText" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextMinimal" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="Primary" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="255" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="Dead">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="1"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="2"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="3"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadSpaced">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadCompact">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadUltrawide">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadMinimal">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="True" />
+          </State>
+        </StateGroup>
+        <Frame type="UnitStatusBehaviorIcon" name="VikingDeadRef" template="SpazzoTemplates/VikingDeadRefTemplate"/>
+        <Frame type="Label" name="DeadLabel" template="SpazzoTemplates/VikingDeadTextTemplate">
+          <Anchor side="Top" relative="$parent/HealthBar" pos="Min" offset="0"/>
+          <Anchor side="Left" relative="$parent/HealthBar" pos="Min" offset="0"/>
+          <Anchor side="Right" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Anchor side="Bottom" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Animation name="PopOut">
+            <Event event="OnShown" action="Reset, Play" frame="$this" />
+            <Event event="OnHidden" action="Reset" frame="$this" />
+            <Controller type="Anchor" end="Pause" side="Top" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="-30" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+            <Controller type="Anchor" end="Pause" side="Bottom" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="30" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+            <Controller type="Anchor" end="Pause" side="Right" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="55" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+          </Animation>
+        </Frame>
+        <Frame type="Label" name="DeadLabelSpaced" template="SpazzoTemplates/VikingDeadTextTemplate">
+          <Anchor side="Top" relative="$parent/HealthBar" pos="Min" offset="0"/>
+          <Anchor side="Left" relative="$parent/HealthBar" pos="Min" offset="5"/>
+          <Anchor side="Right" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Anchor side="Bottom" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Text val="{$parent/DeadLabel/@Text}"/>
+          <Style val="Spazzo_TopPanelVikingDeathLabelUltrawide"/>
+          <Animation name="PopOut">
+            <Event event="OnShown" action="Reset, Play" frame="$this" />
+            <Event event="OnHidden" action="Reset" frame="$this" />
+            <Controller type="Anchor" end="Pause" side="Bottom" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="30" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+            <Controller type="Anchor" end="Pause" side="Right" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="30" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+          </Animation>
+        </Frame>
+        <Frame type="Label" name="DeadLabelCompact" template="SpazzoTemplates/VikingDeadTextTemplate">
+          <Anchor side="Top" relative="$parent/HealthBar" pos="Mid" offset="0"/>
+          <Anchor side="Left" relative="$parent/HealthBar" pos="Min" offset="0"/>
+          <Anchor side="Right" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Anchor side="Bottom" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Text val="{$parent/DeadLabel/@Text}"/>
+          <Animation name="PopOut">
+            <Event event="OnShown" action="Reset, Play" frame="$this" />
+            <Event event="OnHidden" action="Reset" frame="$this" />
+            <Controller type="Anchor" end="Pause" side="Top" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="-30" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+            <Controller type="Anchor" end="Pause" side="Right" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="40" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+          </Animation>
+        </Frame>
+        <Frame type="Label" name="DeadLabelUltrawide" template="SpazzoTemplates/VikingDeadTextTemplate">
+          <Anchor side="Top" relative="$parent/HealthBar" pos="Min" offset="0"/>
+          <Anchor side="Left" relative="$parent/HealthBar" pos="Min" offset="2"/>
+          <Anchor side="Right" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Anchor side="Bottom" relative="$parent/HealthBar" pos="Max" offset="0"/>
+          <Text val="{$parent/DeadLabel/@Text}"/>
+          <Style val="Spazzo_TopPanelVikingDeathLabelUltrawide"/>
+          <Animation name="PopOut">
+            <Event event="OnShown" action="Reset, Play" frame="$this" />
+            <Event event="OnHidden" action="Reset" frame="$this" />
+            <Controller type="Anchor" end="Pause" side="Bottom" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="30" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+            <Controller type="Anchor" end="Pause" side="Right" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="30" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+          </Animation>
+        </Frame>
+        <Frame type="Label" name="DeadLabelMinimal" template="SpazzoTemplates/VikingDeadTextTemplate">
+          <Anchor side="Top" relative="$parent/HealthBar" pos="Min" offset="-17"/>
+          <Anchor side="Left" relative="$parent/HealthBar" pos="Min" offset="0"/>
+          <Anchor side="Right" relative="$parent/HealthBar" pos="Mid" offset="0"/>
+          <Anchor side="Bottom" relative="$parent/HealthBar" pos="Max" offset="17"/>
+          <Text val="{$parent/DeadLabel/@Text}"/>
+          <Animation name="PopOut">
+            <Event event="OnShown" action="Reset, Play" frame="$this" />
+            <Event event="OnHidden" action="Reset" frame="$this" />
+            <Controller type="Anchor" end="Pause" side="Top" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="-15" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+            <Controller type="Anchor" end="Pause" side="Bottom" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="15" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+            <Controller type="Anchor" end="Pause" side="Right" relative="True" unclipped="True" frame="$this">
+              <Key type="Curve" time="0" value="20" />
+              <Key type="Curve" time="0.7" value="0" />
+            </Controller>
+          </Animation>
+        </Frame>
+      </Frame>
+      <Frame type="UnitStatusFrame" name="TrackedUnitStatusFrame1">
+        <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
+        <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
+        <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
+        <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
+        <Frame type="UnitStatusShieldedHealthBar" name="HealthBar" template="SpazzoTemplates/VikingHealthBar">
+          <Anchor side="Top" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Left" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Right" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Max" offset="-1" />
+          <Anchor side="Bottom" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Max" offset="-1" />
+        </Frame>
+        <Frame type="Image" name="FakeDeadHealthBar" template="SpazzoTemplates/VikingFakeHealthBar">
+          <Anchor side="Top" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Left" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Right" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Max" offset="-1" />
+          <Anchor side="Bottom" relative="$ancestor[@name=VikingUnitTracker]/$parent/BaleogHealthBarBacking" pos="Max" offset="-1" />
+          <Visible val="False"/>
+        </Frame>
+        <StateGroup name="DeadState">
+          <DefaultState val="NotDead"/>
+          <State name="NotDead">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="False"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="False" />
+            <Action type="SetProperty" frame="DeadText" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextMinimal" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="Primary" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="255" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="Dead">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="1"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="2"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="3"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadSpaced">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadCompact">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadUltrawide">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadMinimal">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="True" />
+          </State>
+        </StateGroup>
+        <Frame type="UnitStatusBehaviorIcon" name="VikingDeadRef" template="SpazzoTemplates/VikingDeadRefTemplate"/>
+        <Frame type="Label" name="DeadLabel" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel"/>
+        <Frame type="Label" name="DeadLabelSpaced" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelSpaced"/>
+        <Frame type="Label" name="DeadLabelCompact" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelCompact"/>
+        <Frame type="Label" name="DeadLabelUltrawide" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelUltrawide"/>
+        <Frame type="Label" name="DeadLabelMinimal" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelMinimal"/>
+      </Frame>
+      <Frame type="UnitStatusFrame" name="TrackedUnitStatusFrame2">
+        <Anchor side="Top" relative="$parent" pos="Min" offset="0"/>
+        <Anchor side="Left" relative="$parent" pos="Min" offset="0"/>
+        <Anchor side="Right" relative="$parent" pos="Max" offset="0"/>
+        <Anchor side="Bottom" relative="$parent" pos="Max" offset="0"/>
+        <Frame type="UnitStatusShieldedHealthBar" name="HealthBar" template="SpazzoTemplates/VikingHealthBar">
+          <Anchor side="Top" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Left" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Right" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Max" offset="-1" />
+          <Anchor side="Bottom" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Max" offset="-1" />
+        </Frame>
+        <Frame type="Image" name="FakeDeadHealthBar" template="SpazzoTemplates/VikingFakeHealthBar">
+          <Anchor side="Top" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Left" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Min" offset="1" />
+          <Anchor side="Right" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Max" offset="-1" />
+          <Anchor side="Bottom" relative="$ancestor[@name=VikingUnitTracker]/$parent/ErikHealthBarBacking" pos="Max" offset="-1" />
+          <Visible val="False"/>
+        </Frame>
+        <StateGroup name="DeadState">
+          <DefaultState val="NotDead"/>
+          <State name="NotDead">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="False"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="False" />
+            <Action type="SetProperty" frame="DeadText" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextMinimal" Visible="False" />
+            <Action type="SetProperty" frame="DeadTextUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="Primary" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="255" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="Dead">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="1"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="2"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="3"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadSpaced">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="1"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadCompact">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="2"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadUltrawide">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="3"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="True" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="False" />
+          </State>
+          <State name="DeadMinimal">
+            <When type="Property" frame="VikingDeadRef/BehaviorIcon" InheritedVisible="True"/>
+            <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+            <Action type="SetProperty" frame="FakeDeadHealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" Visible="True" />
+            <Action type="SetProperty" frame="HealthBar" ColorStyle="AllWhite" />
+            <Action type="SetProperty" frame="HealthBar" Alpha="70" />
+            <Action type="SetProperty" frame="DeadLabel" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelSpaced" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelCompact" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelUltrawide" Visible="False" />
+            <Action type="SetProperty" frame="DeadLabelMinimal" Visible="True" />
+          </State>
+        </StateGroup>
+        <Frame type="UnitStatusBehaviorIcon" name="VikingDeadRef" template="SpazzoTemplates/VikingDeadRefTemplate"/>
+        <Frame type="Label" name="DeadLabel" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabel"/>
+        <Frame type="Label" name="DeadLabelSpaced" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelSpaced"/>
+        <Frame type="Label" name="DeadLabelCompact" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelCompact"/>
+        <Frame type="Label" name="DeadLabelUltrawide" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelUltrawide"/>
+        <Frame type="Label" name="DeadLabelMinimal" template="SpazzoTemplates/VikingVikingHealthTemplate/VikingUnitTracker/TrackedUnitStatusFrame0/DeadLabelMinimal"/>
+      </Frame>
+    </Frame>
+    <Frame type="Image" name="OlafIndicatorIcon">
+      <Anchor side="Right" relative="$parent/OlafHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
+      <Anchor side="Bottom" relative="$parent/OlafHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
+      <Height val="#TLVIconSize"/>
+      <Width val="#TLVIconSize"/>
+      <Texture val="Assets\Textures\storm_ui_hud_heromechanic_vikings_shield_small_off.dds"/>
+      <RenderPriority val="515"/>
+      <Visible val="{$parent/OlafHealthBarBacking/@Visible}"/>
+      <StateGroup name="Size">
+        <DefaultState val="Default"/>
+        <State name="Ultracompact">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+          <Action type="SetProperty" frame="$this" Height="#TLVIconSizeUltracompact" />
+          <Action type="SetProperty" frame="$this" Width="#TLVIconSizeUltracompact" />
+        </State>
+        <State name="Default">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
+          <Action type="SetProperty" frame="$this" Height="#TLVIconSize" />
+          <Action type="SetProperty" frame="$this" Width="#TLVIconSize" />
+        </State>
+      </StateGroup>
+    </Frame>
+    <Frame type="Image" name="BaleogIndicatorIcon">
+      <Anchor side="Right" relative="$parent/BaleogHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
+      <Anchor side="Bottom" relative="$parent/BaleogHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
+      <Height val="#TLVIconSize"/>
+      <Width val="#TLVIconSize"/>
+      <Texture val="Assets\Textures\storm_ui_hud_heromechanic_vikings_sword_small_off.dds"/>
+      <RenderPriority val="515"/>
+      <Visible val="{$parent/BaleogHealthBarBacking/@Visible}"/>
+      <StateGroup name="Size">
+        <DefaultState val="Default"/>
+        <State name="Ultracompact">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+          <Action type="SetProperty" frame="$this" Height="#TLVIconSizeUltracompact" />
+          <Action type="SetProperty" frame="$this" Width="#TLVIconSizeUltracompact" />
+        </State>
+        <State name="Default">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
+          <Action type="SetProperty" frame="$this" Height="#TLVIconSize" />
+          <Action type="SetProperty" frame="$this" Width="#TLVIconSize" />
+        </State>
+      </StateGroup>
+    </Frame>
+    <Frame type="Image" name="ErikIndicatorIcon">
+      <Anchor side="Right" relative="$parent/ErikHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
+      <Anchor side="Bottom" relative="$parent/ErikHealthBarBacking" pos="Max" offset="#TLVIconOffset" />
+      <Height val="#TLVIconSize"/>
+      <Width val="#TLVIconSize"/>
+      <Texture val="Assets\Textures\storm_ui_hud_heromechanic_vikings_boot_small_off.dds"/>
+      <RenderPriority val="515"/>
+      <Visible val="{$parent/ErikHealthBarBacking/@Visible}"/>
+      <StateGroup name="Size">
+        <DefaultState val="Default"/>
+        <State name="Ultracompact">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="Equal" SelectedValue="4"/>
+          <Action type="SetProperty" frame="$this" Height="#TLVIconSizeUltracompact" />
+          <Action type="SetProperty" frame="$this" Width="#TLVIconSizeUltracompact" />
+        </State>
+        <State name="Default">
+          <When type="StateGroup" frame="$TopBarSettingsFrame/LayoutPulldown1" operator="NotEqual" SelectedValue="4"/>
+          <Action type="SetProperty" frame="$this" Height="#TLVIconSize" />
+          <Action type="SetProperty" frame="$this" Width="#TLVIconSize" />
+        </State>
+      </StateGroup>
+    </Frame>
+  </Frame>
 
 </Desc>
\ No newline at end of file
diff --git a/interface/CustomScoreboard.StormInterface/enus.StormData/LocalizedData/GameStrings.txt b/interface/CustomScoreboard.StormInterface/enus.StormData/LocalizedData/GameStrings.txt
index 08e94c2..1326759 100644
--- a/interface/CustomScoreboard.StormInterface/enus.StormData/LocalizedData/GameStrings.txt
+++ b/interface/CustomScoreboard.StormInterface/enus.StormData/LocalizedData/GameStrings.txt
@@ -1334,7 +1334,7 @@ UI/SpazzoAccuracy/LiLi/ScoreNine=Unused
 UI/SpazzoAccuracy/LiLi/ScoreTen=Unused
 UI/SpazzoAccuracy/LiLi/ScoreEleven=Unused
 UI/SpazzoAccuracy/LiLi/ScoreTwelve=Unused
-Spazzo/Button/Tooltip/LiLiHealingBrew=<s val="StandardTooltipHeader">Healing Brew</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,LiLiHealingBrew,Cost.Vital[Energy]" player="0"/><n/>Cooldown: <d ref="Abil,LiLiHealingBrew,Cost.Cooldown.TimeUse" player="0"/> seconds</s><n/>Heal lowest Health Allied Health Hero within <c val="#TooltipNumbers"><d ref="Effect,HealingBrewSearchArea,AreaArray[0].Radius" player="%playernum%"/></c> range for <c val="#TooltipNumbers"><d ref="Effect,LiLiHealingBrewCreateHealer,RechargeVitalRate" player="%playernum%"/></c> Health.
+Spazzo/Button/Tooltip/LiLiHealingBrew=<s val="StandardTooltipHeader">Healing Brew</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,LiLiHealingBrew,Cost.Vital[Energy]" player="0"/><n/>Cooldown: <d ref="Abil,LiLiHealingBrew,Cost.Cooldown.TimeUse" player="0"/> seconds</s><n/>Heal the lowest Health allied Health Hero within <c val="#TooltipNumbers"><d ref="Effect,HealingBrewSearchArea,AreaArray[0].Radius" player="%playernum%"/></c> range for <c val="#TooltipNumbers"><d ref="Effect,LiLiHealingBrewCreateHealer,RechargeVitalRate" player="%playernum%"/></c> Health.
 Spazzo/Button/Tooltip/LiLiCloudSerpent=<s val="StandardTooltipHeader">Cloud Serpent</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,LiLiCloudSerpent,Cost.Vital[Energy]" player="0"/><n/>Cooldown: <d ref="Abil,LiLiCloudSerpent,Cost.Cooldown.TimeUse" player="0"/> seconds</s><n/>Summon a Cloud Serpent on an allied Hero that attacks nearby enemies every second. Each attack deals <c val="#TooltipNumbers"><d ref="Effect,CloudSerpentWeaponDamage,Amount" player="%playernum%"/></c> damage and heals the ally for <c val="#TooltipNumbers"><d ref="Effect,LiLiCloudSerpentCreateHealer,RechargeVitalRate" player="%playernum%"/></c>. Lasts for <c val="#TooltipNumbers"><d ref="Behavior,CloudSerpentOwnerBehavior,Duration" player="0"/></c> seconds.
 Spazzo/Button/Tooltip/LiLiBlindingWind=<s val="StandardTooltipHeader">Blinding Wind</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,LiLiBlindingWind,Cost.Vital[Energy]" player="0"/><n/>Cooldown: <d ref="Abil,LiLiBlindingWind,Cost.Cooldown.TimeUse" player="0"/> seconds</s><n/>Throw a cloud of wind at the <c val="#TooltipNumbers"><d ref="Effect,BlindingWindSearchArea,AreaArray[0].MaxCount"player="0"/></c> nearest enemies (prioritizing Heroes), dealing <c val="#TooltipNumbers"><d ref="Effect,LiLiBlindingWindDamage,Amount" player="%playernum%"/></c> damage. Heroes hit are Blinded and Slowed by <c val="#TooltipNumbers"><d ref="-100*Behavior,LiLiBlindingWindSlow,Modification.UnifiedMoveSpeedFactor"player="0"/>%</c> for <c val="#TooltipNumbers"><d ref="Behavior,LiLiBlindingWindBlindBuff,Duration" player="0" precision="1"/></c> seconds.
 
@@ -1870,7 +1870,7 @@ UI/SpazzoAccuracy/Monk/ScoreEleven=Unused
 UI/SpazzoAccuracy/Monk/ScoreTwelve=Unused
 Spazzo/Button/Tooltip/MonkRadiantDash=<s val="StandardTooltipHeader">Radiant Dash</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,MonkRadiantDash,Cost.Vital[Energy]" player="0"/><n/>Charge Cooldown: <d ref="Abil,MonkRadiantDash,Cost.Charge.TimeUse" player="0"/> seconds</s><n/>Jump to an allied or enemy unit. Enemies are immediately hit with a Basic Attack.<n/><n/>Stores up to <c val="#TooltipNumbers"><d ref="Abil,MonkRadiantDash,Cost[0].Charge.CountMax"player="0"/></c> charges.
 Spazzo/Button/Tooltip/MonkBreathOfHeaven=<s val="StandardTooltipHeader">Breath of Heaven</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,MonkBreathOfHeaven,Cost.Vital[Energy]" player="0"/><n/>Cooldown: <d ref="Abil,MonkBreathOfHeaven,Cost.Cooldown.TimeUse" player="0"/> seconds</s><n/>Heal nearby Heroes for <c val="#TooltipNumbers"><d ref="Effect,MonkBreathOfHeavenCreateHealerExecute,RechargeVitalRate" player="%playernum%"/></c> and give them <c val="#TooltipNumbers"><d ref="Behavior,MonkBreathofHeavenMoveSpeedBuff,Modification.UnifiedMoveSpeedFactor*100"player="0"/>%</c> Movement Speed for <c val="#TooltipNumbers"><d ref="Behavior,MonkBreathofHeavenMoveSpeedBuff,Duration" player="0"/></c> seconds.
-Spazzo/Button/Tooltip/MonkDeadlyReach=<s val="StandardTooltipHeader">Deadly Reach</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,RehgarChainHeal,Cost.Vital[Energy]" player="0"/><n/>Cooldown: <d ref="Abil,MonkDeadlyReach,Cost.Cooldown.TimeUse" player="0"/> seconds</s><n/>Kharazim's next Basic Attack increases his Attack Speed and Attack Range by <c val="#TooltipNumbers"><d ref="Behavior,MonkDeadlyReachCasterBehavior,Modification.UnifiedAttackSpeedFactor*100"/>%</c> for <c val="#TooltipNumbers"><d ref="Behavior,MonkDeadlyReachCasterBehavior,Duration" player="0" precision="2"/></c> seconds.
+Spazzo/Button/Tooltip/MonkDeadlyReach=<s val="StandardTooltipHeader">Deadly Reach</s><n/><s val="StandardTooltipDetails">Mana: <d ref="Abil,RehgarChainHeal,Cost.Vital[Energy]" player="0"/><n/>Cooldown: <d ref="Abil,MonkDeadlyReach,Cost.Cooldown.TimeUse" player="0"/> seconds</s><n/>Kharazim's next Basic Attack increases his Attack Speed and Attack Range by <c val="#TooltipNumbers"><d ref="Behavior,MonkDeadlyReachCasterBehavior,Modification.AdditiveAttackSpeedFactor*100"/>%</c> for <c val="#TooltipNumbers"><d ref="Behavior,MonkDeadlyReachCasterBehavior,Duration" player="0" precision="2"/></c> seconds.
 
 UI/Spazzo/Tracer/BaselineOne=Basic Attack Damage to non-Heroes
 UI/Spazzo/Tracer/BaselineTwo=Melee Damage to non-Heroes
@@ -3920,7 +3920,7 @@ UI/SpazzoAccuracy/Medic/ScoreOne=Healing Beam Casts & Redirects
 UI/SpazzoAccuracy/Medic/ScoreTwo=Safeguard Casts
 UI/SpazzoAccuracy/Medic/ScoreThree=Displacment Grenade Casts
 UI/SpazzoAccuracy/Medic/ScoreFour=Displacement Grenade Manual Detonations
-UI/SpazzoAccuracy/Medic/ScoreFive=Cellular Reactor Casts
+UI/SpazzoAccuracy/Medic/ScoreFive=Cellular Reactor Casts, Trauma Trigger Activations
 UI/SpazzoAccuracy/Medic/ScoreSix=Stim Drone, Medivac Casts
 UI/SpazzoAccuracy/Medic/ScoreSeven=Reinfocements Casts
 UI/SpazzoAccuracy/Medic/ScoreEight=Displacement Grenades that hit 1+ Hero
@@ -4867,10 +4867,10 @@ UI/SpazzoDamage/Stukov/ScoreFour=Weighted Pustule Expiration Damage
 UI/SpazzoDamage/Stukov/ScoreFive=Lurking Arm Damage to Heroes
 UI/SpazzoDamage/Stukov/ScoreSix=Lurking Arm Damage to non-Heroes
 UI/SpazzoDamage/Stukov/ScoreSeven=Bio-Kill Switch Damage
-UI/SpazzoDamage/Stukov/ScoreEight=Reactive Ballistospore Damage to Heroes(Application), Low Blow Bonus Damage to to Low Health Heroes
+UI/SpazzoDamage/Stukov/ScoreEight=Low Blow Bonus Damage to to Low Health Heroes, Reactive Ballistospore Damage to Heroes(Application)
 UI/SpazzoDamage/Stukov/ScoreEight/One=Unused
-UI/SpazzoDamage/Stukov/ScoreEight/Two=Reactive Ballistospore Damage to Heroes(Application)
-UI/SpazzoDamage/Stukov/ScoreEight/Three=Low Blow Bonus Damage to to Low Health Heroes
+UI/SpazzoDamage/Stukov/ScoreEight/Two=Low Blow Bonus Damage to to Low Health Heroes
+UI/SpazzoDamage/Stukov/ScoreEight/Three=Reactive Ballistospore Damage to Heroes(Application)
 UI/SpazzoDamage/Stukov/ScoreNine=Low Blow Persisting Lurking Arm Damage to Heroes
 UI/SpazzoDamage/Stukov/ScoreNine/One=Unused
 UI/SpazzoDamage/Stukov/ScoreNine/Two=Unused
@@ -4938,8 +4938,8 @@ UI/SpazzoAccuracy/Stukov/AccuracyThree=Lurking Arm Casts
 UI/SpazzoAccuracy/Stukov/AccuracyFour=Bio Kill Switch Casts
 UI/SpazzoAccuracy/Stukov/AccuracyFive=Reactive Ballistospore Casts
 UI/SpazzoAccuracy/Stukov/AccuracyFive/One=Unused
-UI/SpazzoAccuracy/Stukov/AccuracyFive/Two=Reactive Ballistospore Casts
-UI/SpazzoAccuracy/Stukov/AccuracyFive/Three=Unused
+UI/SpazzoAccuracy/Stukov/AccuracyFive/Two=Unused
+UI/SpazzoAccuracy/Stukov/AccuracyFive/Three=Reactive Ballistospore Casts
 UI/SpazzoAccuracy/Stukov/AccuracySix=One Good Spread Activation Count
 UI/SpazzoAccuracy/Stukov/AccuracySix/One=One Good Spread Activation Count
 UI/SpazzoAccuracy/Stukov/AccuracySix/Two=Unused