diff --git a/Emberwind/emberwind.css b/Emberwind/emberwind.css
index 9d9aa47eee..873e6cb9e4 100644
--- a/Emberwind/emberwind.css
+++ b/Emberwind/emberwind.css
@@ -27,7 +27,7 @@
 }
 
 body.sheet-darkmode .top-logo {
-    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/emberwind-logo-color.png");
+    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/emberwind-logo-white.png");
     margin-bottom: -40px
 }
 
@@ -696,6 +696,10 @@ body.sheet-darkmode .chevron-arrow-right {
     font-size: 1.6em;
 }
 
+.guide-header-long {
+    background-image: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/red-bar-tall.png");
+}
+
 .guide-header-small {
     font-weight: bold;
     font-size: 1.25em;
@@ -825,16 +829,29 @@ body.sheet-darkmode .condition-with-foe-grid > div:nth-child(3) {
     box-shadow: 0 0 5px -1px rgba(0, 0, 0, 0.6);
 }
 
+.init-btn::before {
+    content: "";
+    display: none;
+}
+
 .init-btn {
     height: 100%;
     width: 100%;
     background-color: #EE5F57;
+    background-image: none;
     border: none;
     padding: 3px 5px;
 }
 
 body.sheet-darkmode .init-btn {
     background-color: #EE5F57;
+    background-image: none;
+}
+
+.init-btn:hover,
+body.sheet-darkmode .init-btn:hover {
+    background-color: #EE5F57;
+    background-image: none;
 }
 
 .init-btn span {
@@ -3179,6 +3196,40 @@ input[type=checkbox].small-hex-button {
     content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/resistance-w.png");
 }
 
+.sheet-rolltemplate-action .sheet-dodge-img,
+.sheet-rolltemplate-basic-action .sheet-dodge-img,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .sheet-dodge-img,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .sheet-dodge-img {
+    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/dodge-w.png");
+}
+
+.sheet-rolltemplate-action .sheet-willpower-img,
+.sheet-rolltemplate-basic-action .sheet-willpower-img,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .sheet-willpower-img,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .sheet-willpower-img {
+    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/willpower-w.png");
+}
+
+.sheet-rolltemplate-action .sheet-header-npc-learned-bar .sheet-dodge-img,
+.sheet-rolltemplate-basic-action .sheet-header-npc-learned-bar .sheet-dodge-img {
+    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/dodge-b.png");
+}
+
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .sheet-header-npc-learned-bar .sheet-dodge-img,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .sheet-header-npc-learned-bar .sheet-dodge-img {
+    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/dodge-w.png");
+}
+
+.sheet-rolltemplate-action .sheet-header-npc-learned-bar .sheet-willpower-img,
+.sheet-rolltemplate-basic-action .sheet-header-npc-learned-bar .sheet-willpower-img {
+    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/willpower-b.png");
+}
+
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .sheet-header-npc-learned-bar .sheet-willpower-img,
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .sheet-header-npc-learned-bar .sheet-willpower-img {
+    content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/willpower-w.png");
+}
+
 .sheet-rolltemplate-turn .sheet-flex-center,
 .sheet-rolltemplate-skill .sheet-flex-center,
 .sheet-rolltemplate-action .sheet-flex-center,
diff --git a/Emberwind/emberwind.html b/Emberwind/emberwind.html
index 56734ca5b7..497e18f1f6 100644
--- a/Emberwind/emberwind.html
+++ b/Emberwind/emberwind.html
@@ -118,6 +118,9 @@
                         </div>
                     </div>
                     <div class="settings-row block-container block-npc">
+                        <div class="sheet-row bold">
+                            NPC ACTIONS:
+                        </div>
                         <div class="sheet-row">
                             <div class="sheet-col">
                                 <label>
@@ -333,7 +336,7 @@
 
                     <!--        Image -->
                     <div class="image flex-center">
-                        <button class="init-btn" type="action" name="act_pc-turn">
+                        <button type="roll" class="init-btn tokenaction" name="roll_hero-slot" value="@{whisper_state}&{template:turn} {{pc=[[0]]}} {{name=@{character_name}}} {{order=[[?{Hero Slot?|1,10|2,20|3,30|4,40} &{tracker}]]}}">
                             <input class="class-control" type="hidden" name="attr_class" value="">
                             <img class="class-img padding-right5" src="" alt=""/>
                             <span>Initiative</span>
@@ -383,35 +386,41 @@
                             </div>
 
                             <div class="sheet-col info-class-box">
-                                <span>Class:</span>
-                                <select name="attr_class" class="selector-fit no-border border-bottom-grey-1">
-                                    <option value="null">Select</option>
-                                    <option value="archer">Archer</option>
-                                    <option value="ardent">Ardent</option>
-                                    <option value="atlanta">Atlanta</option>
-                                    <option value="druid">Druid</option>
-                                    <option value="invoker">Invoker</option>
-                                    <option value="rogue">Rogue</option>
-                                    <option value="spiritualist">Spiritualist</option>
-                                    <option value="tactician">Tactician</option>
-                                    <option value="warrior">Warrior</option>
-                                    <option value="custom">Custom</option>
-                                </select>
+                                <label>
+                                    Class:
+                                    <select name="attr_class" class="selector-fit no-border border-bottom-grey-1">
+                                        <option value="null">Select</option>
+                                        <option value="archer">Archer</option>
+                                        <option value="ardent">Ardent</option>
+                                        <option value="atlanta">Atlanta</option>
+                                        <option value="druid">Druid</option>
+                                        <option value="invoker">Invoker</option>
+                                        <option value="rogue">Rogue</option>
+                                        <option value="spiritualist">Spiritualist</option>
+                                        <option value="tactician">Tactician</option>
+                                        <option value="warrior">Warrior</option>
+                                        <option value="custom">Custom</option>
+                                    </select>
+                                </label>
                             </div>
                         </div>
                         <div class="sheet-row">
                             <input class="class-control" type="hidden" name="attr_class" value="">
                             <div class="info-custom-class">
-                                <span>Custom Class:</span>
-                                <input type="text" name="attr_custom_class"
-                                       class="transparent no-border border-bottom-grey-1 width70"/>
+                                <label>
+                                    Custom Class:
+                                    <input type="text" name="attr_custom_class"
+                                           class="transparent no-border border-bottom-grey-1 width70"/>
+                                </label>
                             </div>
                         </div>
                         <div class="sheet-row">
                             <div class="info-subclass-box">
-                                <span>Subclass:</span>
-                                <input type="text" name="attr_subclass"
-                                       class="transparent no-border border-bottom-grey-1 width80"/>
+                                <label>
+                                    Subclass:
+                                    <input type="text" name="attr_subclass"
+                                           class="transparent no-border border-bottom-grey-1 width80"/>
+                                </label>
                             </div>
                         </div>
                     </div>
@@ -514,21 +523,21 @@
                             <div class="skill-left">
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Athletics}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{athletics}cf>[[@{athletics}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Athletics}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{athletics}cf>[[@{athletics}+1]]]]}} {{no-roll=[[1]]}}">
                                         Athletics:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_athletics" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Endurance}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{endurance}cf>[[@{endurance}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Endurance}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{endurance}cf>[[@{endurance}+1]]]]}} {{no-roll=[[1]]}}">
                                         Endurance:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_endurance" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Intimidate}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{intimidate}cf>[[@{intimidate}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Intimidate}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{intimidate}cf>[[@{intimidate}+1]]]]}} {{no-roll=[[1]]}}">
                                         Intimidate:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_intimidate" value="8"/>
@@ -538,21 +547,21 @@
                             <div class="skill-right">
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Insight}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{insight}cf>[[@{insight}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Insight}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{insight}cf>[[@{insight}+1]]]]}} {{no-roll=[[1]]}}">
                                         Insight:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_insight" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill" style="font-size: 1.2em;"
-                                            value="@{whisper_state}&{template:skill} {{name=Knowledge}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{knowledge}cf>[[@{knowledge}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Knowledge}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{knowledge}cf>[[@{knowledge}+1]]]]}} {{no-roll=[[1]]}}">
                                         Knowledge:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_knowledge" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Mend}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{mend}cf>[[@{mend}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Mend}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{mend}cf>[[@{mend}+1]]]]}} {{no-roll=[[1]]}}">
                                         Mend:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_mend" value="8"/>
@@ -591,7 +600,7 @@
                         <div class="sheet-col width-half">
                             <div class="sheet-col green stats-col">
                                 <button class="custom-roll-button dodge-image" type='roll' name='roll_dodge'
-                                        value='@{whisper_state}&{template:skill} {{name=Dodge}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{dodge}+@{dodge_mod}]]cf>[[@{dodge}+@{dodge_mod}+1]]]]}} {{no-roll=[[1]]}}'>
+                                        value='@{whisper_state}&{template:skill} {{skill=Dodge}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{dodge}+@{dodge_mod}]]cf>[[@{dodge}+@{dodge_mod}+1]]]]}} {{no-roll=[[1]]}}'>
                                 </button>
                                 Dodge:
                             </div>
@@ -603,7 +612,7 @@
                         <div class="sheet-col width-half">
                             <div class="sheet-col yellow stats-col">
                                 <button class="custom-roll-button willpower-image" type='roll' name='roll_dodge'
-                                        value='@{whisper_state}&{template:skill} {{name=Willpower}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{willpower}+@{willpower_mod}]]cf>[[@{willpower}+@{willpower_mod}+1]]]]}} {{no-roll=[[1]]}}'>
+                                        value='@{whisper_state}&{template:skill} {{skill=Willpower}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<[[@{willpower}+@{willpower_mod}]]cf>[[@{willpower}+@{willpower_mod}+1]]]]}} {{no-roll=[[1]]}}'>
                                 </button>
                                 Willpower:
                             </div>
@@ -618,21 +627,21 @@
                             <div class="skill-left">
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Acrobatics}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{acrobatics}cf>[[@{acrobatics}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Acrobatics}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{acrobatics}cf>[[@{acrobatics}+1]]]]}} {{no-roll=[[1]]}}">
                                         Acrobatics:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_acrobatics" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Stealth}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{stealth}cf>[[@{stealth}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Stealth}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{stealth}cf>[[@{stealth}+1]]]]}} {{no-roll=[[1]]}}">
                                         Stealth:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_stealth" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill" style="font-size: 0.95em"
-                                            value="@{whisper_state}&{template:skill} {{name=Sleight of Hand}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{sleight_of_hand}cf>[[@{sleight_of_hand}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Sleight of Hand}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{sleight_of_hand}cf>[[@{sleight_of_hand}+1]]]]}} {{no-roll=[[1]]}}">
                                         Sleight of Hand:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_sleight_of_hand"
@@ -643,21 +652,21 @@
                             <div class="skill-right">
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Focus}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{focus}cf>[[@{focus}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Focus}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{focus}cf>[[@{focus}+1]]]]}} {{no-roll=[[1]]}}">
                                         Focus:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_focus" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Fast Talk}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{fast_talk}cf>[[@{fast_talk}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Fast Talk}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{fast_talk}cf>[[@{fast_talk}+1]]]]}} {{no-roll=[[1]]}}">
                                         Fast Talk:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_fast_talk" value="8"/>
                                 </div>
                                 <div class="skill">
                                     <button type="roll" name="roll_skill"
-                                            value="@{whisper_state}&{template:skill} {{name=Leadership}} {{subtags=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{leadership}cf>[[@{leadership}+1]]]]}} {{no-roll=[[1]]}}">
+                                            value="@{whisper_state}&{template:skill} {{skill=Leadership}} {{name=@{character_name}}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{leadership}cf>[[@{leadership}+1]]]]}} {{no-roll=[[1]]}}">
                                         Leadership:
                                     </button>
                                     <input class="small transparent" type="number" name="attr_leadership" value="8"/>
@@ -813,7 +822,7 @@
                             <div class="action-button">
                                 <div>
                                     <button type="roll" name="roll_skill" style="font-size: 1.2em;"
-                                            value="@{whisper_state}&{template:skill} {{name=@{maneuver_name}}} {{subtags=@{statname}}} {{no-roll=[[@{actionmod}]]}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{actionmod}cf>[[@{actionmod}+1]]]]}} {{speed=@{maneuver_speed}}} {{description=@{maneuver_description}}}">
+                                            value="@{whisper_state}&{template:skill} {{name=@{maneuver_name}}} {{subtags=@{character_name}}} {{skill=@{statname}}} {{no-roll=[[@{actionmod}]]}} {{roll=[[[[@{advantage_roll}+1]]d20@{advantage_dice}cs<@{actionmod}cf>[[@{actionmod}+1]]]]}} {{speed=@{maneuver_speed}}} {{description=@{maneuver_description}}}">
                                     </button>
                                 </div>
                             </div>
@@ -2505,7 +2514,7 @@
                                 </div>
                             </div>
                             <div>
-                                <div class="guide-header-big guide-header">
+                                <div class="guide-header-big guide-header-long guide-header">
                                     SPECIAL ACTIONS TYPES & THEIR RESOURCES:
                                 </div>
 
@@ -4231,7 +4240,7 @@
                                     <summary class="npc-actions-grid transparent">
                                         <div class="action-button">
                                             <button type="roll" name="roll_action"
-                                                    value="@{whisper_state}&{template:action} {{npc-type=[[0]]}} {{name=@{npc_action_name}}} {{subtag1=@{character_name}}} {{rollType=[[2]]}} {{damage=[[0@{npc_action_dice} + @{npc_action_dice_bonus}]]}} {{against=[[@{npc_action_against}]]}} {{type=@{npc_action_type}}} {{range=@{npc_action_range}@{npc_action_field_description}}} {{description=@{npc_action_description}}}">
+                                                    value="@{whisper_state}&{template:action} {{npc-type=[[0]]}} {{name=@{npc_action_name}}} {{subtag1=@{character_name}}} {{rollType=[[2]]}} {{test=[[@{npc_action_check}]]}} {{damage=[[0@{npc_action_dice} + @{npc_action_dice_bonus}]]}} {{against=[[@{npc_action_against}]]}} {{type=@{npc_action_type}}} {{range=@{npc_action_range}@{npc_action_field_description}}} {{description=@{npc_action_description}}}">
                                             </button>
                                         </div>
 
@@ -4404,7 +4413,7 @@
                                     <summary class="npc-actions-grid transparent">
                                         <div class="action-button">
                                             <button type="roll" name="roll_action"
-                                                    value="@{whisper_state}&{template:action} {{npc-type=[[1]]}} {{name=@{npc_special_name}}} {{subtag1=@{character_name}}} {{rollType=[[@{npc_special_roll_type}]]}} {{damage=[[0@{npc_special_dice} + @{npc_special_dice_bonus}]]}} {{against=[[@{npc_special_against}]]}} {{range=@{npc_special_range}@{npc_special_field_description}}} {{description=@{npc_special_description}}} {{trigCondition=@{npc_special_trig_condition}}} {{trigEffect=@{npc_special_trig_effect}}}">
+                                                    value="@{whisper_state}&{template:action} {{npc-type=[[1]]}} {{name=@{npc_special_name}}} {{subtag1=@{character_name}}} {{rollType=[[@{npc_special_roll_type}]]}} {{test=[[@{npc_special_check}]]}} {{skill=@{npc_special_skill}}} {{damage=[[0@{npc_special_dice} + @{npc_special_dice_bonus}]]}} {{against=[[@{npc_special_against}]]}} {{range=@{npc_special_range}@{npc_special_field_description}}} {{description=@{npc_special_description}}} {{trigCondition=@{npc_special_trig_condition}}} {{trigEffect=@{npc_special_trig_effect}}}">
                                             </button>
                                         </div>
 
@@ -4644,7 +4653,7 @@
                                     <summary class="npc-actions-grid transparent">
                                         <div class="action-button">
                                             <button type="roll" name="roll_action"
-                                                    value="@{whisper_state}&{template:action} {{npc-type=[[2]]}} {{name=@{npc_learn_name}}} {{subtag1=@{character_name}}} {{rollType=[[@{npc_learn_roll_type}]]}} {{damage=[[0@{npc_learn_dice} + @{npc_learn_dice_bonus}]]}} {{against=[[@{npc_learn_against}]]}} {{range=@{npc_learn_range}@{npc_learn_field_description}}} {{description=@{npc_learn_description}}} {{trigCondition=@{npc_learn_trig_condition}}} {{trigEffect=@{npc_learn_trig_effect}}}">
+                                                    value="@{whisper_state}&{template:action} {{npc-type=[[2]]}} {{name=@{npc_learn_name}}} {{subtag1=@{character_name}}} {{rollType=[[@{npc_learn_roll_type}]]}} {{test=[[@{npc_learn_check}]]}} {{skill=@{npc_learn_skill}}} {{damage=[[0@{npc_learn_dice} + @{npc_learn_dice_bonus}]]}} {{against=[[@{npc_learn_against}]]}} {{range=@{npc_learn_range}@{npc_learn_field_description}}} {{description=@{npc_learn_description}}} {{trigCondition=@{npc_learn_trig_condition}}} {{trigEffect=@{npc_learn_trig_effect}}}">
                                             </button>
                                         </div>
 
@@ -4886,17 +4895,6 @@
 
 <script type="text/worker">
 
-    on('clicked:pc-turn', (info) => {
-        startRoll("@{whisper_state}&{template:turn} {{pc=[[0]]}} {{name=@{selected|token_name}}} {{order=[[?{Hero Slot?|1,1|2,3|3,5|4,7} &{tracker}]]}}",
-        (results) => {
-            finishRoll(
-                results.rollId,
-                {
-                }
-            );
-        });
-    });
-
     on('clicked:npc-action', (info) => {
         startRoll("@{whisper_state}&{template:turn} {{pc=[[1]]}} {{name=@{character_name}}} {{roll=[[1d6]]}}",
         (results) => {
@@ -4910,14 +4908,14 @@
 
     on('clicked:npc-turn', (info) => {
         getAttrs(['npc_rank'], function(values) {
-            let order = 2;
+            let order = 15;
             let rank = values.npc_rank;
             if (rank === 'Awakened') {
-                order = 4;
+                order = 25;
             } else if (rank === 'Elite') {
-                order = 6;
+                order = 35;
             } else if (rank === 'Boss') {
-                order = 8;
+                order = 45;
             }
 
             startRoll("@{whisper_state}&{template:turn} {{pc=[[1]]}} {{name=@{character_name}}} {{order=[[" + order + " &{tracker}]]}}",
@@ -6783,21 +6781,63 @@
 
             {{#rollTotal() npc-type 0}}
             <div class="header-bar">
-                <div><h1 class="tcat-header black-text">{{name}}</h1></div>
+                <div>
+                    <h1 class="tcat-header black-text">
+                        {{name}}
+                        {{#rollTotal() test 1}}
+                        vs <img class="dodge-img" style="width: 20px; height: 20px" alt="" src="">
+                        {{/rollTotal() test 1}}
+                        {{#rollTotal() test 2}}
+                        vs <img class="willpower-img" style="width: 20px; height: 20px" alt="" src="">
+                        {{/rollTotal() test 2}}
+                    </h1>
+                </div>
                 <div><span class="tcat-subheader black-text">{{subtag1}} {{subtag2}}</span></div>
             </div>
             {{/rollTotal() npc-type 0}}
 
             {{#rollTotal() npc-type 1}}
             <div class="header-npc-special-bar">
-                <div><h1 class="tcat-header white-text">{{name}}</h1></div>
+                <div>
+                    <h1 class="tcat-header white-text">
+                        {{name}}
+                        {{#rollTotal() test 1}}
+                        vs <img class="dodge-img" style="width: 20px; height: 20px" alt="" src="">
+                        {{/rollTotal() test 1}}
+                        {{#rollTotal() test 2}}
+                        vs <img class="willpower-img" style="width: 20px; height: 20px" alt="" src="">
+                        {{/rollTotal() test 2}}
+                        {{#rollTotal() test 3}}
+                        <span class="indicator">AUTO-HIT</span>
+                        {{/rollTotal() test 3}}
+                        {{#rollTotal() test 4}}
+                        vs {{skill}}
+                        {{/rollTotal() test 4}}
+                    </h1>
+                </div>
                 <div><span class="tcat-subheader white-text">{{subtag1}} {{subtag2}}</span></div>
             </div>
             {{/rollTotal() npc-type 1}}
 
             {{#rollTotal() npc-type 2}}
             <div class="header-npc-learned-bar">
-                <div><h1 class="tcat-header black-text">{{name}}</h1></div>
+                <div>
+                    <h1 class="tcat-header black-text">
+                        {{name}}
+                        {{#rollTotal() test 1}}
+                        vs <img class="dodge-img" style="width: 20px; height: 20px" alt="" src="">
+                        {{/rollTotal() test 1}}
+                        {{#rollTotal() test 2}}
+                        vs <img class="willpower-img" style="width: 20px; height: 20px" alt="" src="">
+                        {{/rollTotal() test 2}}
+                        {{#rollTotal() test 3}}
+                        <span class="indicator">AUTO-HIT</span>
+                        {{/rollTotal() test 3}}
+                        {{#rollTotal() test 4}}
+                        vs {{skill}}
+                        {{/rollTotal() test 4}}
+                    </h1>
+                </div>
                 <div><span class="tcat-subheader black-text">{{subtag1}} {{subtag2}}</span></div>
             </div>
             {{/rollTotal() npc-type 2}}
@@ -6942,7 +6982,7 @@
             <!--            Auto-hit-->
             {{#rollTotal() rollType 2}}
             {{#damage}}
-            <div class="sheet-col">
+            <div class="sheet-col" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="flex-center sheet-row">
                     <div class="sheet-col kungfont">
                         {{damage}}
@@ -6971,6 +7011,7 @@
             {{#^rollTotal() healing 0}}
             <div class="sheet-col" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="flex-center sheet-row">
+                    <div class="kungfont">HP:</div>
                     <div class="sheet-col kungfont">
                         {{healing}}
                     </div>
@@ -6985,8 +7026,10 @@
     <rolltemplate class="sheet-rolltemplate-skill">
         <div class="container">
             <div class="header-bar">
-                <div><h1 class="tcat-header ">{{name}}</h1></div>
+                <div><h1 class="tcat-header">{{name}}</h1></div>
+                {{#subtags}}
                 <div><span class="tcat-subheader">{{subtags}}</span></div>
+                {{/subtags}}
             </div>
             {{#speed}}
             <div class="tcat-text">
@@ -7003,7 +7046,7 @@
             {{#^rollTotal() no-roll 0}}
             {{#roll}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
-                <div class="kungfont">CAP:</div>
+                <div class="kungfont">{{skill}}:</div>
                 <div>{{roll}}</div>
             </div>
             {{/roll}}
@@ -7034,46 +7077,46 @@
             </div>
             {{/roll}}
 
-            {{#rollTotal() order 1}}
+            {{#rollTotal() order 10}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Hero Slot 1</div>
             </div>
-            {{/rollTotal() order 1}}
-            {{#rollTotal() order 2}}
+            {{/rollTotal() order 10}}
+            {{#rollTotal() order 15}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Grunt Foe Slot</div>
             </div>
-            {{/rollTotal() order 2}}
-            {{#rollTotal() order 3}}
+            {{/rollTotal() order 15}}
+            {{#rollTotal() order 20}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Hero Slot 2</div>
             </div>
-            {{/rollTotal() order 3}}
-            {{#rollTotal() order 4}}
+            {{/rollTotal() order 20}}
+            {{#rollTotal() order 25}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Awakened Foe Slot</div>
             </div>
-            {{/rollTotal() order 4}}
-            {{#rollTotal() order 5}}
+            {{/rollTotal() order 25}}
+            {{#rollTotal() order 30}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Hero Slot 3</div>
             </div>
-            {{/rollTotal() order 5}}
-            {{#rollTotal() order 6}}
+            {{/rollTotal() order 30}}
+            {{#rollTotal() order 35}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Elite Foe Slot</div>
             </div>
-            {{/rollTotal() order 6}}
-            {{#rollTotal() order 7}}
+            {{/rollTotal() order 35}}
+            {{#rollTotal() order 40}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Hero Slot 4</div>
             </div>
-            {{/rollTotal() order 7}}
-            {{#rollTotal() order 8}}
+            {{/rollTotal() order 40}}
+            {{#rollTotal() order 45}}
             <div class="flex-center sheet-row" style="padding-top: 10px; padding-bottom: 5px">
                 <div class="kungfont">Boss Foe Slot</div>
             </div>
-            {{/rollTotal() order 8}}
+            {{/rollTotal() order 45}}
 
         </div>
     </rolltemplate>
diff --git a/Emberwind/images/awakened.png b/Emberwind/images/awakened.png
deleted file mode 100644
index 477692a3ea..0000000000
Binary files a/Emberwind/images/awakened.png and /dev/null differ
diff --git a/Emberwind/images/awakened_transparent.png b/Emberwind/images/awakened_transparent.png
deleted file mode 100644
index da65547f4d..0000000000
Binary files a/Emberwind/images/awakened_transparent.png and /dev/null differ
diff --git a/Emberwind/images/boss.png b/Emberwind/images/boss.png
deleted file mode 100644
index 45577ae4ce..0000000000
Binary files a/Emberwind/images/boss.png and /dev/null differ
diff --git a/Emberwind/images/boss_transparent.png b/Emberwind/images/boss_transparent.png
deleted file mode 100644
index 71756f256f..0000000000
Binary files a/Emberwind/images/boss_transparent.png and /dev/null differ
diff --git a/Emberwind/images/dodge.png b/Emberwind/images/dodge.png
deleted file mode 100644
index 7e5e50d832..0000000000
Binary files a/Emberwind/images/dodge.png and /dev/null differ
diff --git a/Emberwind/images/dodge_transparent.png b/Emberwind/images/dodge_transparent.png
deleted file mode 100644
index eb66ace52b..0000000000
Binary files a/Emberwind/images/dodge_transparent.png and /dev/null differ
diff --git a/Emberwind/images/elite.png b/Emberwind/images/elite.png
deleted file mode 100644
index 46385ecc35..0000000000
Binary files a/Emberwind/images/elite.png and /dev/null differ
diff --git a/Emberwind/images/elite_transparent.png b/Emberwind/images/elite_transparent.png
deleted file mode 100644
index 873de8b33e..0000000000
Binary files a/Emberwind/images/elite_transparent.png and /dev/null differ
diff --git a/Emberwind/images/emberwind-logo-white.png b/Emberwind/images/emberwind-logo-white.png
new file mode 100644
index 0000000000..e82557f104
Binary files /dev/null and b/Emberwind/images/emberwind-logo-white.png differ
diff --git a/Emberwind/images/grey-bar.png b/Emberwind/images/grey-bar.png
new file mode 100644
index 0000000000..1df98d9593
Binary files /dev/null and b/Emberwind/images/grey-bar.png differ
diff --git a/Emberwind/images/grunt.png b/Emberwind/images/grunt.png
deleted file mode 100644
index e8bb8b9d64..0000000000
Binary files a/Emberwind/images/grunt.png and /dev/null differ
diff --git a/Emberwind/images/grunt_transparent.png b/Emberwind/images/grunt_transparent.png
deleted file mode 100644
index fba2acaae8..0000000000
Binary files a/Emberwind/images/grunt_transparent.png and /dev/null differ
diff --git a/Emberwind/images/red-bar-tall.png b/Emberwind/images/red-bar-tall.png
new file mode 100644
index 0000000000..55293391e6
Binary files /dev/null and b/Emberwind/images/red-bar-tall.png differ
diff --git a/Emberwind/images/red-bar-wide.png b/Emberwind/images/red-bar-wide.png
new file mode 100644
index 0000000000..eb7e481134
Binary files /dev/null and b/Emberwind/images/red-bar-wide.png differ
diff --git a/Emberwind/images/red-bar.png b/Emberwind/images/red-bar.png
new file mode 100644
index 0000000000..ad7d4d7977
Binary files /dev/null and b/Emberwind/images/red-bar.png differ
diff --git a/Emberwind/images/resistance.png b/Emberwind/images/resistance.png
deleted file mode 100644
index 509cb85f38..0000000000
Binary files a/Emberwind/images/resistance.png and /dev/null differ
diff --git a/Emberwind/images/resistance_transparent.png b/Emberwind/images/resistance_transparent.png
deleted file mode 100644
index 16432e9078..0000000000
Binary files a/Emberwind/images/resistance_transparent.png and /dev/null differ
diff --git a/Emberwind/images/toughness.png b/Emberwind/images/toughness.png
deleted file mode 100644
index 38222140f6..0000000000
Binary files a/Emberwind/images/toughness.png and /dev/null differ
diff --git a/Emberwind/images/toughness_transparent.png b/Emberwind/images/toughness_transparent.png
deleted file mode 100644
index 27aa64da14..0000000000
Binary files a/Emberwind/images/toughness_transparent.png and /dev/null differ
diff --git a/Emberwind/images/white-bar.png b/Emberwind/images/white-bar.png
new file mode 100644
index 0000000000..0a62f2d8cd
Binary files /dev/null and b/Emberwind/images/white-bar.png differ
diff --git a/Emberwind/images/willpower.png b/Emberwind/images/willpower.png
deleted file mode 100644
index 8e58c83fec..0000000000
Binary files a/Emberwind/images/willpower.png and /dev/null differ
diff --git a/Emberwind/images/willpower_transparent.png b/Emberwind/images/willpower_transparent.png
deleted file mode 100644
index da91df3e62..0000000000
Binary files a/Emberwind/images/willpower_transparent.png and /dev/null differ