diff --git a/Ironsworn/Ironsworn.html b/Ironsworn/Ironsworn.html
index 0471a69bc0..eabba3d7b8 100644
--- a/Ironsworn/Ironsworn.html
+++ b/Ironsworn/Ironsworn.html
@@ -45,7 +45,7 @@
           </div>
             <div class="resource">
               <label class="roll-resource-label">
-                <button class="hide" type="roll" title="@{rollhealth}" name="rollhealth" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +health}} {{action=[[d6+@{health}+(?{Modifier|0})]]}} {{negate1=[[1+@{health}+(?{Modifier|0})]]}} {{negate2=[[2+@{health}+(?{Modifier|0})]]}} {{negate3=[[3+@{health}+(?{Modifier|0})]]}} {{negate4=[[4+@{health}+(?{Modifier|0})]]}} {{negate5=[[5+@{health}+(?{Modifier|0})]]}} {{negate6=[[6+@{health}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{health}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{health}]]}}"></button>
+                <button class="hide" type="roll" title="@{rollhealth}" name="rollhealth" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +health}} {{action=[[{d6+@{health}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{health}+(?{Modifier|0})]]}} {{negate2=[[2+@{health}+(?{Modifier|0})]]}} {{negate3=[[3+@{health}+(?{Modifier|0})]]}} {{negate4=[[4+@{health}+(?{Modifier|0})]]}} {{negate5=[[5+@{health}+(?{Modifier|0})]]}} {{negate6=[[6+@{health}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{health}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{health}]]}}"></button>
                 <div data-i18n="resource-health">HEALTH</div>
               </label>
               <select class="resource-value" name="attr_health">
@@ -59,7 +59,7 @@
             </div>
             <div class="resource">
               <label class="roll-resource-label">
-                <button class="hide" type="roll" title="@{rollspirit}" name="rollspirit" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +spirit}} {{action=[[d6+@{spirit}+(?{Modifier|0})]]}} {{negate1=[[1+@{spirit}+(?{Modifier|0})]]}} {{negate2=[[2+@{spirit}+(?{Modifier|0})]]}} {{negate3=[[3+@{spirit}+(?{Modifier|0})]]}} {{negate4=[[4+@{spirit}+(?{Modifier|0})]]}} {{negate5=[[5+@{spirit}+(?{Modifier|0})]]}} {{negate6=[[6+@{spirit}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{spirit}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{spirit}]]}}"></button>
+                <button class="hide" type="roll" title="@{rollspirit}" name="rollspirit" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +spirit}} {{action=[[{d6+@{spirit}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{spirit}+(?{Modifier|0})]]}} {{negate2=[[2+@{spirit}+(?{Modifier|0})]]}} {{negate3=[[3+@{spirit}+(?{Modifier|0})]]}} {{negate4=[[4+@{spirit}+(?{Modifier|0})]]}} {{negate5=[[5+@{spirit}+(?{Modifier|0})]]}} {{negate6=[[6+@{spirit}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{spirit}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{spirit}]]}}"></button>
                 <div data-i18n="resource-spirit">SPIRIT</div>
               </label>
               <select class="resource-value" name="attr_spirit">
@@ -73,7 +73,7 @@
             </div>
             <div class="resource">
               <label class="roll-resource-label">
-                <button class="hide" type="roll" title="@{rollsupply}" name="rollsupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +supply}} {{action=[[d6+@{supply}+(?{Modifier|0})]]}} {{negate1=[[1+@{supply}+(?{Modifier|0})]]}} {{negate2=[[2+@{supply}+(?{Modifier|0})]]}} {{negate3=[[3+@{supply}+(?{Modifier|0})]]}} {{negate4=[[4+@{supply}+(?{Modifier|0})]]}} {{negate5=[[5+@{supply}+(?{Modifier|0})]]}} {{negate6=[[6+@{supply}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{supply}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{supply}]]}}"></button>
+                <button class="hide" type="roll" title="@{rollsupply}" name="rollsupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +supply}} {{action=[[{d6+@{supply}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{supply}+(?{Modifier|0})]]}} {{negate2=[[2+@{supply}+(?{Modifier|0})]]}} {{negate3=[[3+@{supply}+(?{Modifier|0})]]}} {{negate4=[[4+@{supply}+(?{Modifier|0})]]}} {{negate5=[[5+@{supply}+(?{Modifier|0})]]}} {{negate6=[[6+@{supply}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{supply}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{supply}]]}}"></button>
                 <div data-i18n="resource-supply">SUPPLY</div>
               </label>
               <select class="resource-value" name="attr_supply">
@@ -314,31 +314,31 @@
                   <div class="stat">
                     <label class="roll-label">
                       <h3 class="stats-title">EDGE</h3><span class="stats-input" name="attr_edge"></span>
-                      <button class="hide" type="roll" title="Roll +Edge" name="rollEdge" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +edge}} {{action=[[d6+@{edge}+(?{Modifier|0})]]}} {{negate1=[[1+@{edge}+(?{Modifier|0})]]}} {{negate2=[[2+@{edge}+(?{Modifier|0})]]}} {{negate3=[[3+@{edge}+(?{Modifier|0})]]}} {{negate4=[[4+@{edge}+(?{Modifier|0})]]}} {{negate5=[[5+@{edge}+(?{Modifier|0})]]}} {{negate6=[[6+@{edge}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{edge}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{edge}]]}}"></button>
+                      <button class="hide" type="roll" title="Roll +Edge" name="rollEdge" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +edge}} {{action=[[{d6+@{edge}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{edge}+(?{Modifier|0})]]}} {{negate2=[[2+@{edge}+(?{Modifier|0})]]}} {{negate3=[[3+@{edge}+(?{Modifier|0})]]}} {{negate4=[[4+@{edge}+(?{Modifier|0})]]}} {{negate5=[[5+@{edge}+(?{Modifier|0})]]}} {{negate6=[[6+@{edge}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{edge}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{edge}]]}}"></button>
                     </label>
                   </div>
                   <div class="stat">
                     <label class="roll-label">
                       <h3 class="stats-title">HEART</h3><span class="stats-input" name="attr_heart"></span>
-                      <button class="hide" type="roll" title="Roll +Heart" name="rollHeart" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +heart}} {{action=[[d6+@{heart}+(?{Modifier|0})]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
+                      <button class="hide" type="roll" title="Roll +Heart" name="rollHeart" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +heart}} {{action=[[{d6+@{heart}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
                     </label>
                   </div>
                   <div class="stat">
                     <label class="roll-label">
                       <h3 class="stats-title">IRON</h3><span class="stats-input" name="attr_iron"></span>
-                      <button class="hide" type="roll" title="Roll +Iron" name="rollIron" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +iron}} {{action=[[d6+@{iron}+(?{Modifier|0})]]}} {{negate1=[[1+@{iron}+(?{Modifier|0})]]}} {{negate2=[[2+@{iron}+(?{Modifier|0})]]}} {{negate3=[[3+@{iron}+(?{Modifier|0})]]}} {{negate4=[[4+@{iron}+(?{Modifier|0})]]}} {{negate5=[[5+@{iron}+(?{Modifier|0})]]}} {{negate6=[[6+@{iron}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{iron}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{iron}]]}}"></button>
+                      <button class="hide" type="roll" title="Roll +Iron" name="rollIron" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +iron}} {{action=[[{d6+@{iron}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{iron}+(?{Modifier|0})]]}} {{negate2=[[2+@{iron}+(?{Modifier|0})]]}} {{negate3=[[3+@{iron}+(?{Modifier|0})]]}} {{negate4=[[4+@{iron}+(?{Modifier|0})]]}} {{negate5=[[5+@{iron}+(?{Modifier|0})]]}} {{negate6=[[6+@{iron}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{iron}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{iron}]]}}"></button>
                     </label>
                   </div>
                   <div class="stat">
                     <label class="roll-label">
                       <h3 class="stats-title">SHADOW</h3><span class="stats-input" name="attr_shadow"></span>
-                      <button class="hide" type="roll" title="Roll +Shadow" name="rollShadow" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +shadow}} {{action=[[d6+@{shadow}+(?{Modifier|0})]]}} {{negate1=[[1+@{shadow}+(?{Modifier|0})]]}} {{negate2=[[2+@{shadow}+(?{Modifier|0})]]}} {{negate3=[[3+@{shadow}+(?{Modifier|0})]]}} {{negate4=[[4+@{shadow}+(?{Modifier|0})]]}} {{negate5=[[5+@{shadow}+(?{Modifier|0})]]}} {{negate6=[[6+@{shadow}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{shadow}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{shadow}]]}}"></button>
+                      <button class="hide" type="roll" title="Roll +Shadow" name="rollShadow" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +shadow}} {{action=[[{d6+@{shadow}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{shadow}+(?{Modifier|0})]]}} {{negate2=[[2+@{shadow}+(?{Modifier|0})]]}} {{negate3=[[3+@{shadow}+(?{Modifier|0})]]}} {{negate4=[[4+@{shadow}+(?{Modifier|0})]]}} {{negate5=[[5+@{shadow}+(?{Modifier|0})]]}} {{negate6=[[6+@{shadow}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{shadow}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{shadow}]]}}"></button>
                     </label>
                   </div>
                   <div class="stat">
                     <label class="roll-label">
                       <h3 class="stats-title">WITS</h3><span class="stats-input" name="attr_wits"></span>
-                      <button class="hide" type="roll" title="Roll +Wits" name="rollWits" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +wits}} {{action=[[d6+@{wits}+(?{Modifier|0})]]}} {{negate1=[[1+@{wits}+(?{Modifier|0})]]}} {{negate2=[[2+@{wits}+(?{Modifier|0})]]}} {{negate3=[[3+@{wits}+(?{Modifier|0})]]}} {{negate4=[[4+@{wits}+(?{Modifier|0})]]}} {{negate5=[[5+@{wits}+(?{Modifier|0})]]}} {{negate6=[[6+@{wits}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{wits}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{wits}]]}}"></button>
+                      <button class="hide" type="roll" title="Roll +Wits" name="rollWits" value="&amp;{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +wits}} {{action=[[{d6+@{wits}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{wits}+(?{Modifier|0})]]}} {{negate2=[[2+@{wits}+(?{Modifier|0})]]}} {{negate3=[[3+@{wits}+(?{Modifier|0})]]}} {{negate4=[[4+@{wits}+(?{Modifier|0})]]}} {{negate5=[[5+@{wits}+(?{Modifier|0})]]}} {{negate6=[[6+@{wits}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{wits}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{wits}]]}}"></button>
                     </label>
                   </div>
             <div class="stat-toggle edit-toggle">
@@ -4261,7 +4261,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Enter the Fray Move" name="rollenterTheFray" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Enter the Fray}} {{action=[[d6+?{Stat|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Enter the Fray Move" name="rollenterTheFray" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Enter the Fray}} {{action=[[{d6+?{Stat|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="enter_the_fray"/>
@@ -4270,7 +4270,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Strike Move" name="rollstrike" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Strike}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart - Wyvern&#44;@{heart}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Strike Move" name="rollstrike" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Strike}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart - Wyvern&#44;@{heart}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="strike"/>
@@ -4279,7 +4279,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Clash Move" name="rollclash" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Clash}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Clash Move" name="rollclash" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Clash}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="clash"/>
@@ -4303,7 +4303,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Battle Move" name="rollBattle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Battle}} {{action=[[d6+?{Stat|Edge, @{edge}|Iron, @{iron}|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Battle Move" name="rollBattle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Battle}} {{action=[[{d6+?{Stat|Edge, @{edge}|Iron, @{iron}|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="battle"/>
@@ -4327,7 +4327,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Delve the Depths Move" name="rolldelveTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Delve the Depths}} {{action=[[d6+?{Stat|Edge,@{edge}|Shadow,@{shadow}|Wits,@{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Delve the Depths Move" name="rolldelveTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Delve the Depths}} {{action=[[{d6+?{Stat|Edge,@{edge}|Shadow,@{shadow}|Wits,@{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="delve_the_depths"/>
@@ -4336,7 +4336,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Find an Opportunity Move" name="rollfindAnOpportunity" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Find an Opportunity}} {{action=[[d6+undefined+(?{Modifier|0})]]}} {{negate1=[[1+undefined+(?{Modifier|0})]]}} {{negate2=[[2+undefined+(?{Modifier|0})]]}} {{negate3=[[3+undefined+(?{Modifier|0})]]}} {{negate4=[[4+undefined+(?{Modifier|0})]]}} {{negate5=[[5+undefined+(?{Modifier|0})]]}} {{negate6=[[6+undefined+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[undefined+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[undefined]]}}"></button>
+                              <button class="roll-show" type="roll" title="Find an Opportunity Move" name="rollfindAnOpportunity" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Find an Opportunity}} {{action=[[{d6+undefined+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+undefined+(?{Modifier|0})]]}} {{negate2=[[2+undefined+(?{Modifier|0})]]}} {{negate3=[[3+undefined+(?{Modifier|0})]]}} {{negate4=[[4+undefined+(?{Modifier|0})]]}} {{negate5=[[5+undefined+(?{Modifier|0})]]}} {{negate6=[[6+undefined+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[undefined+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[undefined]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="find_an_opportunity"/>
@@ -4351,7 +4351,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Check Your Gear Move" name="rollcheckYourGear" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Check Your Gear}} {{action=[[d6+?{Stat|Supply,@{supply}|Wits - Improviser,@{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Check Your Gear Move" name="rollcheckYourGear" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Check Your Gear}} {{action=[[{d6+?{Stat|Supply,@{supply}|Wits - Improviser,@{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="check_your_gear"/>
@@ -4369,7 +4369,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Escape the Depths Move" name="rollescapeTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Escape the Depths}} {{action=[[d6+?{Stat|Edge,@{edge}|Heart,@{heart}|Iron,@{iron}|Wits,@{wits}|Shadow,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Escape the Depths Move" name="rollescapeTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Escape the Depths}} {{action=[[{d6+?{Stat|Edge,@{edge}|Heart,@{heart}|Iron,@{iron}|Wits,@{wits}|Shadow,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="escape_the_depths"/>
@@ -4389,7 +4389,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Face Danger Move" name="rollfaceDanger" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Danger}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Face Danger Move" name="rollfaceDanger" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Danger}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="face_danger"/>
@@ -4398,7 +4398,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Secure an Advantage Move" name="rollsecureAnAdvantage" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Secure an Advantage}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Secure an Advantage Move" name="rollsecureAnAdvantage" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Secure an Advantage}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="secure_an_advantage"/>
@@ -4407,7 +4407,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Gather Information Move" name="rollgatherInformation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Gather Information}} {{action=[[d6+?{Stat|Wits,@{wits}|Shadow - Infiltrator/Trickster/Scry,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Gather Information Move" name="rollgatherInformation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Gather Information}} {{action=[[{d6+?{Stat|Wits,@{wits}|Shadow - Infiltrator/Trickster/Scry,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="gather_information"/>
@@ -4416,7 +4416,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Heal Move" name="rollheal" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Heal}} {{action=[[d6+?{Stat|Wits,@{wits}|Iron,@{iron}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Heal Move" name="rollheal" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Heal}} {{action=[[{d6+?{Stat|Wits,@{wits}|Iron,@{iron}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="heal"/>
@@ -4425,7 +4425,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Resupply Move" name="rollresupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Resupply}} {{action=[[d6+?{Stat|Wits,@{wits}|Edge - Cave Lion,@{edge}|Shadow - Infiltrator,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Resupply Move" name="rollresupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Resupply}} {{action=[[{d6+?{Stat|Wits,@{wits}|Edge - Cave Lion,@{edge}|Shadow - Infiltrator,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="resupply"/>
@@ -4434,7 +4434,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Make Camp Move" name="rollmakeCamp" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Make Camp}} {{action=[[d6+?{Stat|Supply&#44;@{supply}|Wits - Wildblood&#44;@{wits}|Health - Mammoth&#44;?{Mammoth's Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Make Camp Move" name="rollmakeCamp" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Make Camp}} {{action=[[{d6+?{Stat|Supply&#44;@{supply}|Wits - Wildblood&#44;@{wits}|Health - Mammoth&#44;?{Mammoth's Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="make_camp"/>
@@ -4443,7 +4443,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Undertake a Journey Move" name="rollundertakeAJourney" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Undertake a Journey}} {{action=[[d6+?{Stat|Wits,@{wits}|Shadow - Shadow-walk,@{shadow}|Spirit or Heart - Tether&#44;?{Tether Stat&amp;#124;Spirit&amp;#44;@{spirit}&amp;#124;Heart&amp;#44;@{heart}&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Undertake a Journey Move" name="rollundertakeAJourney" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Undertake a Journey}} {{action=[[{d6+?{Stat|Wits,@{wits}|Shadow - Shadow-walk,@{shadow}|Spirit or Heart - Tether&#44;?{Tether Stat&amp;#124;Spirit&amp;#44;@{spirit}&amp;#124;Heart&amp;#44;@{heart}&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="undertake_a_journey"/>
@@ -4466,7 +4466,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Compel Move" name="rollcompel" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Compel}} {{action=[[d6+?{Stat|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Compel Move" name="rollcompel" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Compel}} {{action=[[{d6+?{Stat|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="compel"/>
@@ -4475,7 +4475,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Sojourn Move" name="rollsojourn" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Sojourn}} {{action=[[d6+?{Stat|Heart&#44;@{heart}|Shadow - Pretender&#44;@{shadow}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Sojourn Move" name="rollsojourn" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Sojourn}} {{action=[[{d6+?{Stat|Heart&#44;@{heart}|Shadow - Pretender&#44;@{shadow}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="sojourn"/>
@@ -4484,7 +4484,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Draw the Circle Move" name="rolldrawTheCircle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Draw the Circle}} {{action=[[d6+@{heart}+(?{Modifier|0})]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Draw the Circle Move" name="rolldrawTheCircle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Draw the Circle}} {{action=[[{d6+@{heart}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="draw_the_circle"/>
@@ -4493,7 +4493,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Forge a Bond Move" name="rollforgeABond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Forge a Bond}} {{action=[[d6+?{Stat|Heart,@{heart}|Shadow - Trickster,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Forge a Bond Move" name="rollforgeABond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Forge a Bond}} {{action=[[{d6+?{Stat|Heart,@{heart}|Shadow - Trickster,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="forge_a_bond"/>
@@ -4502,7 +4502,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Test Your Bond Move" name="rolltestYourBond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Test Your Bond}} {{action=[[d6+@{heart}+(?{Modifier|0})]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Test Your Bond Move" name="rolltestYourBond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Test Your Bond}} {{action=[[{d6+@{heart}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="test_your_bond"/>
@@ -4511,7 +4511,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Aid Your Ally Move" name="rollaidYourAlly" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Aid Your Ally}} {{action=[[d6+?{Stat|Edge, @{edge}|Iron, @{iron}|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Aid Your Ally Move" name="rollaidYourAlly" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Aid Your Ally}} {{action=[[{d6+?{Stat|Edge, @{edge}|Iron, @{iron}|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="aid_your_ally"/>
@@ -4555,7 +4555,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Swear an Iron Vow Move" name="rollswearAnIronVow" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Swear an Iron Vow}} {{action=[[d6+?{Stat|Heart&#44;@{heart}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Swear an Iron Vow Move" name="rollswearAnIronVow" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Swear an Iron Vow}} {{action=[[{d6+?{Stat|Heart&#44;@{heart}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="swear_an_iron_vow"/>
@@ -4585,7 +4585,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Advance Move" name="rolladvance" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Advance}} {{action=[[d6+undefined+(?{Modifier|0})]]}} {{negate1=[[1+undefined+(?{Modifier|0})]]}} {{negate2=[[2+undefined+(?{Modifier|0})]]}} {{negate3=[[3+undefined+(?{Modifier|0})]]}} {{negate4=[[4+undefined+(?{Modifier|0})]]}} {{negate5=[[5+undefined+(?{Modifier|0})]]}} {{negate6=[[6+undefined+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[undefined+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[undefined]]}}"></button>
+                              <button class="roll-show" type="roll" title="Advance Move" name="rolladvance" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Advance}} {{action=[[{d6+undefined+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+undefined+(?{Modifier|0})]]}} {{negate2=[[2+undefined+(?{Modifier|0})]]}} {{negate3=[[3+undefined+(?{Modifier|0})]]}} {{negate4=[[4+undefined+(?{Modifier|0})]]}} {{negate5=[[5+undefined+(?{Modifier|0})]]}} {{negate6=[[6+undefined+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[undefined+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[undefined]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="advance"/>
@@ -4599,7 +4599,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Endure Harm Move" name="rollendureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Harm}} {{action=[[d6+?{Stat|Health,@{health}|Iron,@{iron}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Endure Harm Move" name="rollendureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Harm}} {{action=[[{d6+?{Stat|Health,@{health}|Iron,@{iron}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="endure_harm"/>
@@ -4608,7 +4608,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Endure Stress Move" name="rollendureStress" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Stress}} {{action=[[d6+?{Stat|Spirit,@{spirit}|Heart,@{heart}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Endure Stress Move" name="rollendureStress" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Stress}} {{action=[[{d6+?{Stat|Spirit,@{spirit}|Heart,@{heart}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="endure_stress"/>
@@ -4617,7 +4617,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Companion Endure Harm Move" name="rollcompanionEndureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Companion Endure Harm}} {{action=[[d6+?{Stat|Heart&#44;@{heart}|Companion's Health&#44;?{Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Companion Endure Harm Move" name="rollcompanionEndureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Companion Endure Harm}} {{action=[[{d6+?{Stat|Heart&#44;@{heart}|Companion's Health&#44;?{Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="companion_endure_harm"/>
@@ -4626,7 +4626,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Face Death Move" name="rollfaceDeath" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Death}} {{action=[[d6+?{Stat|Heart,@{heart}|Shadow - Shadow-kin,@{shadow}}+(?{Modifier|0})]]}} {{owl=[[?{Owl Companion|No&#44;0|Yes&#44;?{Owl's Health&amp;#124;0&amp;#125;&#125;]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}+(?{Owl Companion})]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Face Death Move" name="rollfaceDeath" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Death}} {{action=[[{d6+?{Stat|Heart,@{heart}|Shadow - Shadow-kin,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{owl=[[?{Owl Companion|No&#44;0|Yes&#44;?{Owl's Health&amp;#124;0&amp;#125;&#125;]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}+(?{Owl Companion})]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="face_death"/>
@@ -4635,7 +4635,7 @@
               </div>
               <div class="move-list">
                       <div class="button-container">
-                              <button class="roll-show" type="roll" title="Face Desolation Move" name="rollfaceDesolation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Desolation}} {{action=[[d6+@{heart}+(?{Modifier|0})]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
+                              <button class="roll-show" type="roll" title="Face Desolation Move" name="rollfaceDesolation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Desolation}} {{action=[[{d6+@{heart}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
                       </div>
                 <label class="move">
                   <input class="hide selected-move" type="radio" name="attr_selected_move" value="face_desolation"/>
@@ -5128,7 +5128,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-battle">Battle</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Battle Move" name="rollBattle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Battle}} {{action=[[d6+?{Stat|Edge, @{edge}|Iron, @{iron}|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Battle Move" name="rollBattle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Battle}} {{action=[[{d6+?{Stat|Edge, @{edge}|Iron, @{iron}|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5162,7 +5162,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-clash">Clash</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Clash Move" name="rollclash" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Clash}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Clash Move" name="rollclash" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Clash}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5182,7 +5182,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-companion-endure-harm">Companion Endure Harm</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Companion Endure Harm Move" name="rollcompanionEndureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Companion Endure Harm}} {{action=[[d6+?{Stat|Heart&#44;@{heart}|Companion's Health&#44;?{Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Companion Endure Harm Move" name="rollcompanionEndureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Companion Endure Harm}} {{action=[[{d6+?{Stat|Heart&#44;@{heart}|Companion's Health&#44;?{Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5200,7 +5200,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-compel">Compel</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Compel Move" name="rollcompel" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Compel}} {{action=[[d6+?{Stat|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Compel Move" name="rollcompel" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Compel}} {{action=[[{d6+?{Stat|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5221,7 +5221,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-delve-the-depths">Delve the Depths</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Delve the Depths Move" name="rolldelveTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Delve the Depths}} {{action=[[d6+?{Stat|Edge,@{edge}|Shadow,@{shadow}|Wits,@{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Delve the Depths Move" name="rolldelveTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Delve the Depths}} {{action=[[{d6+?{Stat|Edge,@{edge}|Shadow,@{shadow}|Wits,@{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5301,7 +5301,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-draw-the-circle">Draw the Circle</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Draw the Circle Move" name="rolldrawTheCircle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Draw the Circle}} {{action=[[d6+@{heart}+(?{Modifier|0})]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Draw the Circle Move" name="rolldrawTheCircle" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Draw the Circle}} {{action=[[{d6+@{heart}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5350,7 +5350,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-endure-harm">Endure Harm</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Endure Harm Move" name="rollendureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Harm}} {{action=[[d6+?{Stat|Health,@{health}|Iron,@{iron}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Endure Harm Move" name="rollendureHarm" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Harm}} {{action=[[{d6+?{Stat|Health,@{health}|Iron,@{iron}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5383,7 +5383,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-endure-stress">Endure Stress</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Endure Stress Move" name="rollendureStress" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Stress}} {{action=[[d6+?{Stat|Spirit,@{spirit}|Heart,@{heart}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Endure Stress Move" name="rollendureStress" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Endure Stress}} {{action=[[{d6+?{Stat|Spirit,@{spirit}|Heart,@{heart}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5415,7 +5415,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-enter-the-fray">Enter the Fray</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Enter the Fray Move" name="rollenterTheFray" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Enter the Fray}} {{action=[[d6+?{Stat|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Enter the Fray Move" name="rollenterTheFray" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Enter the Fray}} {{action=[[{d6+?{Stat|Heart, @{heart}|Shadow, @{shadow}|Wits, @{wits}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5448,7 +5448,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-escape-the-depths">Escape the Depths</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Escape the Depths Move" name="rollescapeTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Escape the Depths}} {{action=[[d6+?{Stat|Edge,@{edge}|Heart,@{heart}|Iron,@{iron}|Wits,@{wits}|Shadow,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Escape the Depths Move" name="rollescapeTheDepths" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Escape the Depths}} {{action=[[{d6+?{Stat|Edge,@{edge}|Heart,@{heart}|Iron,@{iron}|Wits,@{wits}|Shadow,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5491,7 +5491,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-face-danger">Face Danger</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Face Danger Move" name="rollfaceDanger" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Danger}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Face Danger Move" name="rollfaceDanger" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Danger}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5520,7 +5520,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-face-death">Face Death</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Face Death Move" name="rollfaceDeath" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Death}} {{action=[[d6+?{Stat|Heart,@{heart}|Shadow - Shadow-kin,@{shadow}}+(?{Modifier|0})]]}} {{owl=[[?{Owl Companion|No&#44;0|Yes&#44;?{Owl's Health&amp;#124;0&amp;#125;&#125;]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}+(?{Owl Companion})]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Face Death Move" name="rollfaceDeath" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Death}} {{action=[[{d6+?{Stat|Heart,@{heart}|Shadow - Shadow-kin,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{owl=[[?{Owl Companion|No&#44;0|Yes&#44;?{Owl's Health&amp;#124;0&amp;#125;&#125;]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}+(?{Owl Companion})]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5540,7 +5540,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-face-desolation">Face Desolation</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Face Desolation Move" name="rollfaceDesolation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Desolation}} {{action=[[d6+@{heart}+(?{Modifier|0})]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Face Desolation Move" name="rollfaceDesolation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Face Desolation}} {{action=[[{d6+@{heart}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5590,7 +5590,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-forge-a-bond">Forge a Bond</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Forge a Bond Move" name="rollforgeABond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Forge a Bond}} {{action=[[d6+?{Stat|Heart,@{heart}|Shadow - Trickster,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Forge a Bond Move" name="rollforgeABond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Forge a Bond}} {{action=[[{d6+?{Stat|Heart,@{heart}|Shadow - Trickster,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5639,7 +5639,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-gather-information">Gather Information</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Gather Information Move" name="rollgatherInformation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Gather Information}} {{action=[[d6+?{Stat|Wits,@{wits}|Shadow - Infiltrator/Trickster/Scry,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Gather Information Move" name="rollgatherInformation" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Gather Information}} {{action=[[{d6+?{Stat|Wits,@{wits}|Shadow - Infiltrator/Trickster/Scry,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5655,7 +5655,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-heal">Heal</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Heal Move" name="rollheal" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Heal}} {{action=[[d6+?{Stat|Wits,@{wits}|Iron,@{iron}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Heal Move" name="rollheal" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Heal}} {{action=[[{d6+?{Stat|Wits,@{wits}|Iron,@{iron}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5714,7 +5714,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-make-camp">Make Camp</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Make Camp Move" name="rollmakeCamp" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Make Camp}} {{action=[[d6+?{Stat|Supply&#44;@{supply}|Wits - Wildblood&#44;@{wits}|Health - Mammoth&#44;?{Mammoth's Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Make Camp Move" name="rollmakeCamp" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Make Camp}} {{action=[[{d6+?{Stat|Supply&#44;@{supply}|Wits - Wildblood&#44;@{wits}|Health - Mammoth&#44;?{Mammoth's Health&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5825,7 +5825,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-resupply">Resupply</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Resupply Move" name="rollresupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Resupply}} {{action=[[d6+?{Stat|Wits,@{wits}|Edge - Cave Lion,@{edge}|Shadow - Infiltrator,@{shadow}}+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Resupply Move" name="rollresupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Resupply}} {{action=[[{d6+?{Stat|Wits,@{wits}|Edge - Cave Lion,@{edge}|Shadow - Infiltrator,@{shadow}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5893,7 +5893,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-secure-an-advantage">Secure an Advantage</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Secure an Advantage Move" name="rollsecureAnAdvantage" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Secure an Advantage}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Secure an Advantage Move" name="rollsecureAnAdvantage" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Secure an Advantage}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart&#44;@{heart}|Shadow&#44;@{shadow}|Wits&#44;@{wits}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;|Essence - Invoke&#44;?{Essence&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5920,7 +5920,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-sojourn">Sojourn</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Sojourn Move" name="rollsojourn" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Sojourn}} {{action=[[d6+?{Stat|Heart&#44;@{heart}|Shadow - Pretender&#44;@{shadow}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Sojourn Move" name="rollsojourn" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Sojourn}} {{action=[[{d6+?{Stat|Heart&#44;@{heart}|Shadow - Pretender&#44;@{shadow}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5953,7 +5953,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-strike">Strike</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Strike Move" name="rollstrike" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Strike}} {{action=[[d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart - Wyvern&#44;@{heart}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Strike Move" name="rollstrike" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Strike}} {{action=[[{d6+?{Stat|Edge&#44;@{edge}|Iron&#44;@{iron}|Heart - Wyvern&#44;@{heart}|Light - Lightbearer&#44;?{Light&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -5969,7 +5969,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-swear-an-iron-vow">Swear an Iron Vow</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Swear an Iron Vow Move" name="rollswearAnIronVow" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Swear an Iron Vow}} {{action=[[d6+?{Stat|Heart&#44;@{heart}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Swear an Iron Vow Move" name="rollswearAnIronVow" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Swear an Iron Vow}} {{action=[[{d6+?{Stat|Heart&#44;@{heart}|God's Stat - Devotant&#44;?{God's Stat&amp;#124;0&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -6003,7 +6003,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-test-your-bond">Test Your Bond</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Test Your Bond Move" name="rolltestYourBond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Test Your Bond}} {{action=[[d6+@{heart}+(?{Modifier|0})]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Test Your Bond Move" name="rolltestYourBond" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Test Your Bond}} {{action=[[{d6+@{heart}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{heart}+(?{Modifier|0})]]}} {{negate2=[[2+@{heart}+(?{Modifier|0})]]}} {{negate3=[[3+@{heart}+(?{Modifier|0})]]}} {{negate4=[[4+@{heart}+(?{Modifier|0})]]}} {{negate5=[[5+@{heart}+(?{Modifier|0})]]}} {{negate6=[[6+@{heart}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{heart}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{heart}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -6032,7 +6032,7 @@
                                   <div class="move-title move-preview" data-i18n="move-title-undertake-a-journey">Undertake a Journey</div>
                                   <div class="roll-viewer">
                                           <label class="roll-label">Roll
-                                                  <button class="hide" type="roll" title="Undertake a Journey Move" name="rollundertakeAJourney" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Undertake a Journey}} {{action=[[d6+?{Stat|Wits,@{wits}|Shadow - Shadow-walk,@{shadow}|Spirit or Heart - Tether&#44;?{Tether Stat&amp;#124;Spirit&amp;#44;@{spirit}&amp;#124;Heart&amp;#44;@{heart}&amp;#125;&#125;+(?{Modifier|0})]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
+                                                  <button class="hide" type="roll" title="Undertake a Journey Move" name="rollundertakeAJourney" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Undertake a Journey}} {{action=[[{d6+?{Stat|Wits,@{wits}|Shadow - Shadow-walk,@{shadow}|Spirit or Heart - Tether&#44;?{Tether Stat&amp;#124;Spirit&amp;#44;@{spirit}&amp;#124;Heart&amp;#44;@{heart}&amp;#125;&#125;+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+?{Stat}+(?{Modifier|0})]]}} {{negate2=[[2+?{Stat}+(?{Modifier|0})]]}} {{negate3=[[3+?{Stat}+(?{Modifier|0})]]}} {{negate4=[[4+?{Stat}+(?{Modifier|0})]]}} {{negate5=[[5+?{Stat}+(?{Modifier|0})]]}} {{negate6=[[6+?{Stat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[?{Stat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[?{Stat}]]}}"></button>
                                           </label>
                                   </div>
                                   <div class="move-description">
@@ -9696,7 +9696,7 @@
         <div class="resources">
             <div class="resource">
               <label class="roll-resource-label">
-                <button class="hide" type="roll" title="@{rollsupply}" name="rollsupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +supply}} {{action=[[d6+@{supply}+(?{Modifier|0})]]}} {{negate1=[[1+@{supply}+(?{Modifier|0})]]}} {{negate2=[[2+@{supply}+(?{Modifier|0})]]}} {{negate3=[[3+@{supply}+(?{Modifier|0})]]}} {{negate4=[[4+@{supply}+(?{Modifier|0})]]}} {{negate5=[[5+@{supply}+(?{Modifier|0})]]}} {{negate6=[[6+@{supply}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{supply}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{supply}]]}}"></button>
+                <button class="hide" type="roll" title="@{rollsupply}" name="rollsupply" value="&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +supply}} {{action=[[{d6+@{supply}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{supply}+(?{Modifier|0})]]}} {{negate2=[[2+@{supply}+(?{Modifier|0})]]}} {{negate3=[[3+@{supply}+(?{Modifier|0})]]}} {{negate4=[[4+@{supply}+(?{Modifier|0})]]}} {{negate5=[[5+@{supply}+(?{Modifier|0})]]}} {{negate6=[[6+@{supply}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{supply}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{supply}]]}}"></button>
                 <div data-i18n="resource-supply">SUPPLY</div>
               </label>
               <select class="resource-value" name="attr_supply">
@@ -17638,6 +17638,49 @@
     </div>{{/rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() challenge1 challenge2}}
     {{/rollTotal() rarityDie6 rarityAction}}
     {{#^rollTotal() rarityDie6 rarityAction}}
+    {{#rollGreater() rarityAction 10}}
+    {{#rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-complication"></div>
+      <div class="sheet-subfooter">COMPLICATION</div>
+    </div>{{#rollTotal() rarityDie1 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
+    </div>{{/rollTotal() rarityDie1 rarityAction}}{{/rollTotal() challenge2 10}} 
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/rollTotal() challenge1 10}}
+    {{#^rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/rollTotal() challenge2 10}}
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-strong-hit"></div>
+      <div class="sheet-subfooter">STRONG HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/^rollTotal() challenge1 10}}
+    {{/rollGreater() rarityAction 10}}
+    {{#^rollGreater() rarityAction 10}}
     {{#rollGreater() rarityAction challenge1}}
     {{#rollTotal() challenge1 challenge2}}
     <div class="sheet-result-row sheet-roll-outcome">
@@ -17699,8 +17742,7 @@
       <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
     </div>{{/rollTotal() rarityDie1 rarityAction}}{{/^rollGreater() rarityAction challenge2}}
     {{/^rollTotal() challenge1 challenge2}}
-    {{/^rollGreater() rarityAction challenge1}}
-    {{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate1}}
+    {{/^rollGreater() rarityAction challenge1}}{{/^rollGreater() rarityAction 10}}{{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate1}}
     {{/rollTotal() momentum -1}}{{#rollTotal() momentum -2}}
     {{#rollTotal() rarityAction negate2}}
     <div class="sheet-result-body sheet-result-row">
@@ -17784,6 +17826,49 @@
     </div>{{/rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() challenge1 challenge2}}
     {{/rollTotal() rarityDie6 rarityAction}}
     {{#^rollTotal() rarityDie6 rarityAction}}
+    {{#rollGreater() rarityAction 10}}
+    {{#rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-complication"></div>
+      <div class="sheet-subfooter">COMPLICATION</div>
+    </div>{{#rollTotal() rarityDie1 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
+    </div>{{/rollTotal() rarityDie1 rarityAction}}{{/rollTotal() challenge2 10}} 
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/rollTotal() challenge1 10}}
+    {{#^rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/rollTotal() challenge2 10}}
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-strong-hit"></div>
+      <div class="sheet-subfooter">STRONG HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/^rollTotal() challenge1 10}}
+    {{/rollGreater() rarityAction 10}}
+    {{#^rollGreater() rarityAction 10}}
     {{#rollGreater() rarityAction challenge1}}
     {{#rollTotal() challenge1 challenge2}}
     <div class="sheet-result-row sheet-roll-outcome">
@@ -17845,8 +17930,7 @@
       <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
     </div>{{/rollTotal() rarityDie1 rarityAction}}{{/^rollGreater() rarityAction challenge2}}
     {{/^rollTotal() challenge1 challenge2}}
-    {{/^rollGreater() rarityAction challenge1}}
-    {{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate2}}
+    {{/^rollGreater() rarityAction challenge1}}{{/^rollGreater() rarityAction 10}}{{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate2}}
     {{/rollTotal() momentum -2}}{{#rollTotal() momentum -3}}
     {{#rollTotal() rarityAction negate3}}
     <div class="sheet-result-body sheet-result-row">
@@ -17930,6 +18014,49 @@
     </div>{{/rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() challenge1 challenge2}}
     {{/rollTotal() rarityDie6 rarityAction}}
     {{#^rollTotal() rarityDie6 rarityAction}}
+    {{#rollGreater() rarityAction 10}}
+    {{#rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-complication"></div>
+      <div class="sheet-subfooter">COMPLICATION</div>
+    </div>{{#rollTotal() rarityDie1 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
+    </div>{{/rollTotal() rarityDie1 rarityAction}}{{/rollTotal() challenge2 10}} 
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/rollTotal() challenge1 10}}
+    {{#^rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/rollTotal() challenge2 10}}
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-strong-hit"></div>
+      <div class="sheet-subfooter">STRONG HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/^rollTotal() challenge1 10}}
+    {{/rollGreater() rarityAction 10}}
+    {{#^rollGreater() rarityAction 10}}
     {{#rollGreater() rarityAction challenge1}}
     {{#rollTotal() challenge1 challenge2}}
     <div class="sheet-result-row sheet-roll-outcome">
@@ -17991,8 +18118,7 @@
       <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
     </div>{{/rollTotal() rarityDie1 rarityAction}}{{/^rollGreater() rarityAction challenge2}}
     {{/^rollTotal() challenge1 challenge2}}
-    {{/^rollGreater() rarityAction challenge1}}
-    {{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate3}}
+    {{/^rollGreater() rarityAction challenge1}}{{/^rollGreater() rarityAction 10}}{{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate3}}
     {{/rollTotal() momentum -3}}{{#rollTotal() momentum -4}}
     {{#rollTotal() rarityAction negate4}}
     <div class="sheet-result-body sheet-result-row">
@@ -18076,6 +18202,49 @@
     </div>{{/rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() challenge1 challenge2}}
     {{/rollTotal() rarityDie6 rarityAction}}
     {{#^rollTotal() rarityDie6 rarityAction}}
+    {{#rollGreater() rarityAction 10}}
+    {{#rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-complication"></div>
+      <div class="sheet-subfooter">COMPLICATION</div>
+    </div>{{#rollTotal() rarityDie1 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
+    </div>{{/rollTotal() rarityDie1 rarityAction}}{{/rollTotal() challenge2 10}} 
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/rollTotal() challenge1 10}}
+    {{#^rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/rollTotal() challenge2 10}}
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-strong-hit"></div>
+      <div class="sheet-subfooter">STRONG HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/^rollTotal() challenge1 10}}
+    {{/rollGreater() rarityAction 10}}
+    {{#^rollGreater() rarityAction 10}}
     {{#rollGreater() rarityAction challenge1}}
     {{#rollTotal() challenge1 challenge2}}
     <div class="sheet-result-row sheet-roll-outcome">
@@ -18137,8 +18306,7 @@
       <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
     </div>{{/rollTotal() rarityDie1 rarityAction}}{{/^rollGreater() rarityAction challenge2}}
     {{/^rollTotal() challenge1 challenge2}}
-    {{/^rollGreater() rarityAction challenge1}}
-    {{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate4}}
+    {{/^rollGreater() rarityAction challenge1}}{{/^rollGreater() rarityAction 10}}{{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate4}}
     {{/rollTotal() momentum -4}}{{#rollTotal() momentum -5}}
     {{#rollTotal() rarityAction negate5}}
     <div class="sheet-result-body sheet-result-row">
@@ -18222,6 +18390,49 @@
     </div>{{/rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() challenge1 challenge2}}
     {{/rollTotal() rarityDie6 rarityAction}}
     {{#^rollTotal() rarityDie6 rarityAction}}
+    {{#rollGreater() rarityAction 10}}
+    {{#rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-complication"></div>
+      <div class="sheet-subfooter">COMPLICATION</div>
+    </div>{{#rollTotal() rarityDie1 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
+    </div>{{/rollTotal() rarityDie1 rarityAction}}{{/rollTotal() challenge2 10}} 
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/rollTotal() challenge1 10}}
+    {{#^rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/rollTotal() challenge2 10}}
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-strong-hit"></div>
+      <div class="sheet-subfooter">STRONG HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/^rollTotal() challenge1 10}}
+    {{/rollGreater() rarityAction 10}}
+    {{#^rollGreater() rarityAction 10}}
     {{#rollGreater() rarityAction challenge1}}
     {{#rollTotal() challenge1 challenge2}}
     <div class="sheet-result-row sheet-roll-outcome">
@@ -18283,8 +18494,7 @@
       <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
     </div>{{/rollTotal() rarityDie1 rarityAction}}{{/^rollGreater() rarityAction challenge2}}
     {{/^rollTotal() challenge1 challenge2}}
-    {{/^rollGreater() rarityAction challenge1}}
-    {{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate5}}
+    {{/^rollGreater() rarityAction challenge1}}{{/^rollGreater() rarityAction 10}}{{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate5}}
     {{/rollTotal() momentum -5}}{{#rollTotal() momentum -6}}
     {{#rollTotal() rarityAction negate6}}
     <div class="sheet-result-body sheet-result-row">
@@ -18368,6 +18578,49 @@
     </div>{{/rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() challenge1 challenge2}}
     {{/rollTotal() rarityDie6 rarityAction}}
     {{#^rollTotal() rarityDie6 rarityAction}}
+    {{#rollGreater() rarityAction 10}}
+    {{#rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-complication"></div>
+      <div class="sheet-subfooter">COMPLICATION</div>
+    </div>{{#rollTotal() rarityDie1 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
+    </div>{{/rollTotal() rarityDie1 rarityAction}}{{/rollTotal() challenge2 10}} 
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/rollTotal() challenge1 10}}
+    {{#^rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/rollTotal() challenge2 10}}
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-strong-hit"></div>
+      <div class="sheet-subfooter">STRONG HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/^rollTotal() challenge1 10}}
+    {{/rollGreater() rarityAction 10}}
+    {{#^rollGreater() rarityAction 10}}
     {{#rollGreater() rarityAction challenge1}}
     {{#rollTotal() challenge1 challenge2}}
     <div class="sheet-result-row sheet-roll-outcome">
@@ -18429,8 +18682,7 @@
       <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
     </div>{{/rollTotal() rarityDie1 rarityAction}}{{/^rollGreater() rarityAction challenge2}}
     {{/^rollTotal() challenge1 challenge2}}
-    {{/^rollGreater() rarityAction challenge1}}
-    {{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate6}}
+    {{/^rollGreater() rarityAction challenge1}}{{/^rollGreater() rarityAction 10}}{{/^rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() rarityAction negate6}}
     {{/rollTotal() momentum -6}}{{/rollLess() momentum 0}}
     {{#^rollLess() momentum 0}}
     <div class="sheet-result-body sheet-result-row">
@@ -18457,6 +18709,49 @@
     </div>{{/rollTotal() rarityDie6 rarityAction}}{{/^rollTotal() challenge1 challenge2}}
     {{/rollTotal() rarityDie6 rarityAction}}
     {{#^rollTotal() rarityDie6 rarityAction}}
+    {{#rollGreater() rarityAction 10}}
+    {{#rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-complication"></div>
+      <div class="sheet-subfooter">COMPLICATION</div>
+    </div>{{#rollTotal() rarityDie1 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The rarity’s power fails or works against you</div>
+    </div>{{/rollTotal() rarityDie1 rarityAction}}{{/rollTotal() challenge2 10}} 
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/rollTotal() challenge1 10}}
+    {{#^rollTotal() challenge1 10}}
+    {{#rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-weak-hit"></div>
+      <div class="sheet-subfooter">WEAK HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/rollTotal() challenge2 10}}
+    {{#^rollTotal() challenge2 10}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-strong-hit"></div>
+      <div class="sheet-subfooter">STRONG HIT</div>
+    </div>{{#rollTotal() rarityDie5 rarityAction}}
+    <div class="sheet-result-row sheet-roll-outcome">
+      <div class="sheet-rarity-die"></div>
+      <div class="sheet-subfooter">The power of the rarity manifests in a subtle way</div>
+    </div>{{/rollTotal() rarityDie5 rarityAction}}{{/^rollTotal() challenge2 10}}
+    {{/^rollTotal() challenge1 10}}
+    {{/rollGreater() rarityAction 10}}
+    {{#^rollGreater() rarityAction 10}}
     {{#rollGreater() rarityAction challenge1}}
     {{#rollTotal() challenge1 challenge2}}
     <div class="sheet-result-row sheet-roll-outcome">
@@ -18592,8 +18887,7 @@
     {{/^rollGreater() momentum challenge1}}
     {{/^rollGreater() rarityAction challenge2}}
     {{/^rollTotal() challenge1 challenge2}}
-    {{/^rollGreater() rarityAction challenge1}}
-    {{/^rollTotal() rarityDie6 rarityAction}}{{/^rollLess() momentum 0}}
+    {{/^rollGreater() rarityAction challenge1}}{{/^rollGreater() rarityAction 10}}{{/^rollTotal() rarityDie6 rarityAction}}{{/^rollLess() momentum 0}}
     {{/rarityAction}}
     {{#discoverASite}}
     <div class="sheet-subheader">{{header}}</div>
diff --git a/Ironsworn/README.md b/Ironsworn/README.md
index 98437f9a53..6af18cc6bf 100644
--- a/Ironsworn/README.md
+++ b/Ironsworn/README.md
@@ -24,130 +24,143 @@ The sheet has been tested across multiple browsers and devices, show below in th
 
 ## Roll Logic
 ### Wield a Rarity
-Structured it using javascript for readability.
+Structured it using pseudo code for readability.
 ```javascript
-if (actionWithRarity == (negativeMomentum + modifiers)) {
-  negateActionDie()
-  if (modifiers > firstChallengeDie) {
-    if (firstChallengeDie == secondChallengeDie) {
-      opportunity()
-    } else {
-      if (modifiers > secondChallengeDie) {
-        strongHit()
-      } else {
-        weakHit()
-      }
-    }
-  } else {
-    if (firstChallengeDie == secondChallengeDie) {
-      complication()
-    } else {
-      if (modifiers > secondChallengeDie) {
-        weakHit()
-      } else {
-        miss()
-      }
-    }
-  }
-} else {
-  if (actionWithRarity > firstChallengeDie) {
-    if (firstChallengeDie == secondChallengeDie) {
-      opportunity()
-      if (actionWithRarity == (6 + modifiers)) {
-        rarityDramatic()
-      }
-      if (actionWithRarity == (5 + modifiers)) {
-        raritySubtle()
-      }
-    } else {
-      if (actionWithRarity > secondChallengeDie) {
-        strongHit()
-        if (actionWithRarity == (6 + modifiers)) {
-          rarityDramatic()
-        }
-        if (actionWithRarity == (5 + modifiers)) {
-          raritySubtle()
-        }
-      } else {
-        if (actionWithRarity == (6 + modifiers)) {
-          strongHit()
-          rarityDramatic()
-        } else {
-          weakHit()
-          if (actionWithRarity == (5 + modifiers)) {
-            raritySubtle()
-          }
-          if (momentum > secondChallengeDie) {
-            burnMomentum('Strong Hit')
-          }
-        }
-      }
-    }
-  } else {
-    if (firstChallengeDie == secondChallengeDie) {
-      if (actionWithRarity == (6 + modifiers)) {
-        strongHit()
-        rarityDramatic()
-      } else {
+if rarityDie6 == rarityAction
+  if challenge1 == challenge2
+    opportunity()
+  else
+    strongHit()
+  if rarityDie6 == rarityAction
+    rarityDramatic()
+else
+  if rarityAction > 10
+    if challenge1 == 10
+      if challenge2 == 10
         complication()
-        if (actionWithRarity == (1 + modifiers)) {
-          rarityMiss()
-        }
-        if (momentum > firstChallengeDie) {
-          burnMomentum('Strong Hit')
-          if (actionWithRarity == (5 + modifiers)) {
-            raritySubtle()
-          }
-        }
-      }
-    } else {
-      if (actionWithRarity > secondChallengeDie) {
-        if (actionWithRarity == (6 + modifiers)) {
+        if rarityDie1 == rarityAction
+          rarityFail()
+      else
+        weakHit()
+        if rarityDie5 == rarityAction
+          raritySubtle()
+    else
+      if challenge2 == 10
+        weakHit
+        if rarityDie5 == rarityAction
+          raritySubtle()
+      else
+        strongHit
+        if rarityDie5 == rarityAction
+          raritySubtle()
+  else
+    if rarityAction > challenge1
+      if challenge1 == challenge2
+        opportunity()
+        if rarityDie5 == rarityAction
+          raritySubtle()
+      else
+        if rarityAction > challenge2
           strongHit()
-          rarityDramatic()
-        } else {
+          if rarityDie5 == rarityAction
+            raritySubtle()   
+        else
           weakHit()
-          if (actionWithRarity == (5 + modifiers)) {
+          if rarityDie5 == rarityAction
             raritySubtle()
-          }
-          if (momentum > firstChallengeDie) {
-            if (momentum > secondChallengeDie) {
-              burnMomentum('Strong Hit')
-            }
-          }
-        }
-      } else {
-        if (actionWithRarity == (6 + modifiers)) {
-          strongHit()
-          rarityDramatic()
-        } else {
+    else
+      if challenge1 == challenge2
+        complication()
+        if rarityDie1 == rarityAction
+          rarityFail()
+      else
+        if rarityAction > challenge2
+          weakHit()
+          if rarityDie5 == rarityAction
+            raritySubtle()
+        else
           miss()
-          if (actionWithRarity == (1 + modifiers)) {
-            rarityMiss()
-          }
-          if (momentum > firstChallengeDie) {
-            if (momentum > secondChallengeDie) {
-              burnMomentum('Strong Hit')
-              if (actionWithRarity == (5 + modifiers)) {
-                raritySubtle()
-              }
-            } else {
-              burnMomentum('Weak Hit')
-              if (actionWithRarity == (5 + modifiers)) {
-                raritySubtle()
-              }
-            }
-          } else {
-            if (momentum > secondChallengeDie) {
-              burnMomentum('Weak Hit')
-              if (actionWithRarity == (5 + modifiers)) {
-                raritySubtle()
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
+          if rarityDie1 == rarityAction
+            rarityFail()
 ```
+Roll with momentum
+```js
+if rarityDie6 == rarityAction
+  if challenge1 == challenge2
+    opportunity()
+  else
+    strongHit()
+  if rarityDie6 == rarityAction
+    rarityDramatic()
+else
+  if rarityAction > 10
+    if challenge1 == 10
+      if challenge2 == 10
+        complication()
+        if rarityDie1 == rarityAction
+          rarityFail()
+      else
+        weakHit()
+        if rarityDie5 == rarityAction
+          raritySubtle()
+    else
+      if challenge2 == 10
+        weakHit
+        if rarityDie5 == rarityAction
+          raritySubtle()
+      else
+        strongHit
+        if rarityDie5 == rarityAction
+          raritySubtle()
+  else
+    if rarityAction > challenge1
+      if challenge1 == challenge2
+        opportunity()
+        if rarityDie5 == rarityAction
+          raritySubtle()
+      else
+        if rarityAction > challenge2
+          strongHit()
+          if rarityDie5 == rarityAction
+            raritySubtle()
+        else
+          weakHit()
+          if rarityDie5 == rarityAction
+            raritySubtle()
+          if momentum > challenge2
+            momentumStrongHit()
+    else
+      if challenge1 == challenge2
+        complication()
+        if rarityDie1 == rarityAction
+          rarityFail()
+        if momentum > challenge1
+          momentumStrongHit()
+          if rarityDie5 == rarityAction
+            raritySubtle()
+      else
+        if rarityAction > challenge2
+          weakHit()
+          if rarityDie5 == rarityAction
+            raritySubtle()
+          if momentum > challenge1
+            momentumStrongHit()
+        else
+          miss()
+          if rarityDie1 == rarityAction
+            rarityFail()
+          if momentum > challenge1
+            if momentum > challenge2
+              momentumStrongHit()
+              if rarityDie5 == rarityAction
+                raritySubtle()
+            else
+              momentumWeakHit()
+              if rarityDie5 == rarityAction
+                raritySubtle()
+          else
+            if momentum > challenge2
+              momentumWeakHit()
+              if rarityDie5 == rarityAction
+                raritySubtle()
+```
\ No newline at end of file
diff --git a/Ironsworn/src/components/moves/mixins/container.pug b/Ironsworn/src/components/moves/mixins/container.pug
index 7c6f05458c..e68f850699 100644
--- a/Ironsworn/src/components/moves/mixins/container.pug
+++ b/Ironsworn/src/components/moves/mixins/container.pug
@@ -42,7 +42,7 @@ mixin owlRoll(opts, visibility)
     title=`${translations[opts.title]} Move`
     class=visibility
     name=`roll${opts.name}`
-    value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=${translations[opts.title]}}} {{action=[[d6+${opts.stat}+(?{Modifier|0})]]}} {{owl=[[?{Owl Companion|No&#44;0|Yes&#44;?{Owl's Health&amp;#124;0&amp;#125;&#125;]]}} {{negate1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate2=[[2+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate3=[[3+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate4=[[4+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}+(?{Owl Companion})]]}} {{modifiers=[[${opts.stat_repeat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[${opts.stat_repeat}]]}}`
+    value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=${translations[opts.title]}}} {{action=[[{d6+${opts.stat}+(?{Modifier|0}),{10}}kl1]]}} {{owl=[[?{Owl Companion|No&#44;0|Yes&#44;?{Owl's Health&amp;#124;0&amp;#125;&#125;]]}} {{negate1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate2=[[2+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate3=[[3+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate4=[[4+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}+(?{Owl Companion})]]}} {{modifiers=[[${opts.stat_repeat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[${opts.stat_repeat}]]}}`
   )
 
 mixin movesRoll(opts, visibility)
@@ -51,7 +51,7 @@ mixin movesRoll(opts, visibility)
     title=`${translations[opts.title]} Move`
     class=visibility
     name=`roll${opts.name}`
-    value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=${translations[opts.title]}}} {{action=[[d6+${opts.stat}+(?{Modifier|0})]]}} {{negate1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate2=[[2+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate3=[[3+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate4=[[4+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[${opts.stat_repeat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[${opts.stat_repeat}]]}}`
+    value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=${translations[opts.title]}}} {{action=[[{d6+${opts.stat}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate2=[[2+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate3=[[3+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate4=[[4+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[${opts.stat_repeat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[${opts.stat_repeat}]]}}`
   )
 
 mixin rollLabel
diff --git a/Ironsworn/src/components/resources/resources.pug b/Ironsworn/src/components/resources/resources.pug
index 851dec492f..7d441181b0 100644
--- a/Ironsworn/src/components/resources/resources.pug
+++ b/Ironsworn/src/components/resources/resources.pug
@@ -17,7 +17,7 @@ mixin dropdowns(resource)
         title=`@{roll${resource}}`
         class='hide'
         name=`roll${resource}`
-        value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +${resource}}} {{action=[[d6+@{${resource}}+(?{Modifier|0})]]}} {{negate1=[[1+@{${resource}}+(?{Modifier|0})]]}} {{negate2=[[2+@{${resource}}+(?{Modifier|0})]]}} {{negate3=[[3+@{${resource}}+(?{Modifier|0})]]}} {{negate4=[[4+@{${resource}}+(?{Modifier|0})]]}} {{negate5=[[5+@{${resource}}+(?{Modifier|0})]]}} {{negate6=[[6+@{${resource}}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{${resource}}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{${resource}}]]}}`
+        value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=roll +${resource}}} {{action=[[{d6+@{${resource}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{${resource}}+(?{Modifier|0})]]}} {{negate2=[[2+@{${resource}}+(?{Modifier|0})]]}} {{negate3=[[3+@{${resource}}+(?{Modifier|0})]]}} {{negate4=[[4+@{${resource}}+(?{Modifier|0})]]}} {{negate5=[[5+@{${resource}}+(?{Modifier|0})]]}} {{negate6=[[6+@{${resource}}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{${resource}}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{${resource}}]]}}`
       )
       div(data-i18n=`resource-${resource}`)=translations[`resource-${resource}`]
     select(class="resource-value" name=`attr_${resource}`)
diff --git a/Ironsworn/src/components/stats/mixins/stats.pug b/Ironsworn/src/components/stats/mixins/stats.pug
index 12d258f109..77b36bf38e 100644
--- a/Ironsworn/src/components/stats/mixins/stats.pug
+++ b/Ironsworn/src/components/stats/mixins/stats.pug
@@ -22,6 +22,6 @@ mixin statStatic()
         class='hide'
         title=`Roll +${stat.capital}`
         name=`roll${stat.capital}`
-        value=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +${stat.lower}}} {{action=[[d6+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate1=[[1+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate2=[[2+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate3=[[3+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate4=[[4+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate5=[[5+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate6=[[6+@{${stat.lower}}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{${stat.lower}}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{${stat.lower}}]]}}`
+        value=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=Roll +${stat.lower}}} {{action=[[{d6+@{${stat.lower}}+(?{Modifier|0}),{10}}kl1]]}} {{negate1=[[1+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate2=[[2+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate3=[[3+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate4=[[4+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate5=[[5+@{${stat.lower}}+(?{Modifier|0})]]}} {{negate6=[[6+@{${stat.lower}}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[@{${stat.lower}}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[@{${stat.lower}}]]}}`
       )
       
\ No newline at end of file
diff --git a/Ironsworn/src/roll-templates/mixins/actions.pug b/Ironsworn/src/roll-templates/mixins/actions.pug
index 0ba63b56c9..acb2c61d42 100644
--- a/Ironsworn/src/roll-templates/mixins/actions.pug
+++ b/Ironsworn/src/roll-templates/mixins/actions.pug
@@ -12,6 +12,46 @@ mixin rarity(value)
       +rarityFail
   | {{/rollTotal() rarityDie#{value} rarityAction}}
 
+mixin raritySixLogic()
+  | {{#rollTotal() rarityDie6 rarityAction}}
+  | {{#rollTotal() challenge1 challenge2}}
+  +opportunity
+  | {{/rollTotal() challenge1 challenge2}}
+  +strongHit
+  | {{#^rollTotal() challenge1 challenge2}}
+  +rarity('6')
+  | {{/^rollTotal() challenge1 challenge2}}
+  | {{/rollTotal() rarityDie6 rarityAction}}
+  | {{#^rollTotal() rarityDie6 rarityAction}}
+  block
+  | {{/^rollTotal() rarityDie6 rarityAction}}
+
+mixin rollLimits()
+  | {{#rollGreater() rarityAction 10}}
+  | {{#rollTotal() challenge1 10}}
+  | {{#rollTotal() challenge2 10}}
+  +complication
+  +rarity('1')
+  | {{/rollTotal() challenge2 10}} 
+  | {{#^rollTotal() challenge2 10}}
+  +weakHit
+  +rarity('5')
+  | {{/^rollTotal() challenge2 10}}
+  | {{/rollTotal() challenge1 10}}
+  | {{#^rollTotal() challenge1 10}}
+  | {{#rollTotal() challenge2 10}}
+  +weakHit
+  +rarity('5')
+  | {{/rollTotal() challenge2 10}}
+  | {{#^rollTotal() challenge2 10}}
+  +strongHit
+  +rarity('5')
+  | {{/^rollTotal() challenge2 10}}
+  | {{/^rollTotal() challenge1 10}}
+  | {{/rollGreater() rarityAction 10}}
+  | {{#^rollGreater() rarityAction 10}}
+  block
+  | {{/^rollGreater() rarityAction 10}}
 
 mixin standardAction(type)
   if type == 'rarityAction'
@@ -98,117 +138,99 @@ mixin standardActionWithMomentum(type)
     | {{/^rollGreater() #{type} challenge1}}
 
 mixin rarityMove
-  | {{#rollTotal() rarityDie6 rarityAction}}
-  | {{#rollTotal() challenge1 challenge2}}
-  +opportunity
-  | {{/rollTotal() challenge1 challenge2}}
-  +strongHit
-  | {{#^rollTotal() challenge1 challenge2}}
-  +rarity('6')
-  | {{/^rollTotal() challenge1 challenge2}}
-  | {{/rollTotal() rarityDie6 rarityAction}}
-  | {{#^rollTotal() rarityDie6 rarityAction}}
-  | {{#rollGreater() rarityAction challenge1}}
-  | {{#rollTotal() challenge1 challenge2}}
-  +opportunity
-  +rarity('5')
-  | {{/rollTotal() challenge1 challenge2}}
-  | {{#^rollTotal() challenge1 challenge2}}
-  | {{#rollGreater() rarityAction challenge2}}
-  +strongHit
-  +rarity('5')
-  | {{/rollGreater() rarityAction challenge2}}
-  | {{#^rollGreater() rarityAction challenge2}}
-  +weakHit
-  +rarity('5')
-  | {{/^rollGreater() rarityAction challenge2}}
-  | {{/^rollTotal() challenge1 challenge2}}
-  | {{/rollGreater() rarityAction challenge1}}
-  | {{#^rollGreater() rarityAction challenge1}}
-  | {{#rollTotal() challenge1 challenge2}}
-  +complication
-  +rarity('1')
-  | {{/rollTotal() challenge1 challenge2}}
-  | {{#^rollTotal() challenge1 challenge2}}
-  | {{#rollGreater() rarityAction challenge2}}
-  +weakHit
-  +rarity('5')
-  | {{/rollGreater() rarityAction challenge2}}
-  | {{#^rollGreater() rarityAction challenge2}}
-  +miss
-  +rarity('1')
-  | {{/^rollGreater() rarityAction challenge2}}
-  | {{/^rollTotal() challenge1 challenge2}}
-  | {{/^rollGreater() rarityAction challenge1}}
-  | {{/^rollTotal() rarityDie6 rarityAction}}
+  +raritySixLogic
+    +rollLimits
+      | {{#rollGreater() rarityAction challenge1}}
+      | {{#rollTotal() challenge1 challenge2}}
+      +opportunity
+      +rarity('5')
+      | {{/rollTotal() challenge1 challenge2}}
+      | {{#^rollTotal() challenge1 challenge2}}
+      | {{#rollGreater() rarityAction challenge2}}
+      +strongHit
+      +rarity('5')
+      | {{/rollGreater() rarityAction challenge2}}
+      | {{#^rollGreater() rarityAction challenge2}}
+      +weakHit
+      +rarity('5')
+      | {{/^rollGreater() rarityAction challenge2}}
+      | {{/^rollTotal() challenge1 challenge2}}
+      | {{/rollGreater() rarityAction challenge1}}
+      | {{#^rollGreater() rarityAction challenge1}}
+      | {{#rollTotal() challenge1 challenge2}}
+      +complication
+      +rarity('1')
+      | {{/rollTotal() challenge1 challenge2}}
+      | {{#^rollTotal() challenge1 challenge2}}
+      | {{#rollGreater() rarityAction challenge2}}
+      +weakHit
+      +rarity('5')
+      | {{/rollGreater() rarityAction challenge2}}
+      | {{#^rollGreater() rarityAction challenge2}}
+      +miss
+      +rarity('1')
+      | {{/^rollGreater() rarityAction challenge2}}
+      | {{/^rollTotal() challenge1 challenge2}}
+      | {{/^rollGreater() rarityAction challenge1}}
 
 mixin rarityMoveWithMomentum
-  | {{#rollTotal() rarityDie6 rarityAction}}
-  | {{#rollTotal() challenge1 challenge2}}
-  +opportunity
-  | {{/rollTotal() challenge1 challenge2}}
-  +strongHit
-  | {{#^rollTotal() challenge1 challenge2}}
-  +rarity('6')
-  | {{/^rollTotal() challenge1 challenge2}}
-  | {{/rollTotal() rarityDie6 rarityAction}}
-  | {{#^rollTotal() rarityDie6 rarityAction}}
-  | {{#rollGreater() rarityAction challenge1}}
-  | {{#rollTotal() challenge1 challenge2}}
-  +opportunity
-  +rarity('5')
-  | {{/rollTotal() challenge1 challenge2}}
-  | {{#^rollTotal() challenge1 challenge2}}
-  | {{#rollGreater() rarityAction challenge2}}
-  +strongHit
-  +rarity('5')
-  | {{/rollGreater() rarityAction challenge2}}
-  | {{#^rollGreater() rarityAction challenge2}}
-  +weakHit
-  +rarity('5')
-  | {{#rollGreater() momentum challenge2}}
-  +momentumStrongHit
-  | {{/rollGreater() momentum challenge2}}
-  | {{/^rollGreater() rarityAction challenge2}}
-  | {{/^rollTotal() challenge1 challenge2}}
-  | {{/rollGreater() rarityAction challenge1}}
-  | {{#^rollGreater() rarityAction challenge1}}
-  | {{#rollTotal() challenge1 challenge2}}
-  +complication
-  +rarity('1')
-  | {{#rollGreater() momentum challenge1}}
-  +momentumStrongHit
-  +rarity('5')
-  | {{/rollGreater() momentum challenge1}}
-  | {{/rollTotal() challenge1 challenge2}}
-  | {{#^rollTotal() challenge1 challenge2}}
-  | {{#rollGreater() rarityAction challenge2}}
-  +weakHit
-  +rarity('5')
-  | {{#rollGreater() momentum challenge1}}
-  +momentumStrongHit
-  | {{/rollGreater() momentum challenge1}}
-  | {{/rollGreater() rarityAction challenge2}}
-  | {{#^rollGreater() rarityAction challenge2}}
-  +miss
-  +rarity('1')
-  | {{#rollGreater() momentum challenge1}}
-  | {{#rollGreater() momentum challenge2}}
-  +momentumStrongHit
-  +rarity('5')
-  | {{/rollGreater() momentum challenge2}}
-  | {{#^rollGreater() momentum challenge2}}
-  +momentumWeakHit
-  +rarity('5')
-  | {{/^rollGreater() momentum challenge2}}
-  | {{/rollGreater() momentum challenge1}}
-  | {{#^rollGreater() momentum challenge1}}
-  | {{#rollGreater() momentum challenge2}}
-  +momentumWeakHit
-  +rarity('5')
-  | {{/rollGreater() momentum challenge2}}
-  | {{/^rollGreater() momentum challenge1}}
-  | {{/^rollGreater() rarityAction challenge2}}
-  | {{/^rollTotal() challenge1 challenge2}}
-  | {{/^rollGreater() rarityAction challenge1}}
-  | {{/^rollTotal() rarityDie6 rarityAction}}
+  +raritySixLogic
+    +rollLimits
+      | {{#rollGreater() rarityAction challenge1}}
+      | {{#rollTotal() challenge1 challenge2}}
+      +opportunity
+      +rarity('5')
+      | {{/rollTotal() challenge1 challenge2}}
+      | {{#^rollTotal() challenge1 challenge2}}
+      | {{#rollGreater() rarityAction challenge2}}
+      +strongHit
+      +rarity('5')
+      | {{/rollGreater() rarityAction challenge2}}
+      | {{#^rollGreater() rarityAction challenge2}}
+      +weakHit
+      +rarity('5')
+      | {{#rollGreater() momentum challenge2}}
+      +momentumStrongHit
+      | {{/rollGreater() momentum challenge2}}
+      | {{/^rollGreater() rarityAction challenge2}}
+      | {{/^rollTotal() challenge1 challenge2}}
+      | {{/rollGreater() rarityAction challenge1}}
+      | {{#^rollGreater() rarityAction challenge1}}
+      | {{#rollTotal() challenge1 challenge2}}
+      +complication
+      +rarity('1')
+      | {{#rollGreater() momentum challenge1}}
+      +momentumStrongHit
+      +rarity('5')
+      | {{/rollGreater() momentum challenge1}}
+      | {{/rollTotal() challenge1 challenge2}}
+      | {{#^rollTotal() challenge1 challenge2}}
+      | {{#rollGreater() rarityAction challenge2}}
+      +weakHit
+      +rarity('5')
+      | {{#rollGreater() momentum challenge1}}
+      +momentumStrongHit
+      | {{/rollGreater() momentum challenge1}}
+      | {{/rollGreater() rarityAction challenge2}}
+      | {{#^rollGreater() rarityAction challenge2}}
+      +miss
+      +rarity('1')
+      | {{#rollGreater() momentum challenge1}}
+      | {{#rollGreater() momentum challenge2}}
+      +momentumStrongHit
+      +rarity('5')
+      | {{/rollGreater() momentum challenge2}}
+      | {{#^rollGreater() momentum challenge2}}
+      +momentumWeakHit
+      +rarity('5')
+      | {{/^rollGreater() momentum challenge2}}
+      | {{/rollGreater() momentum challenge1}}
+      | {{#^rollGreater() momentum challenge1}}
+      | {{#rollGreater() momentum challenge2}}
+      +momentumWeakHit
+      +rarity('5')
+      | {{/rollGreater() momentum challenge2}}
+      | {{/^rollGreater() momentum challenge1}}
+      | {{/^rollGreater() rarityAction challenge2}}
+      | {{/^rollTotal() challenge1 challenge2}}
+      | {{/^rollGreater() rarityAction challenge1}}
diff --git a/Ironsworn/src/roll-templates/mixins/oracles.pug b/Ironsworn/src/roll-templates/mixins/oracles.pug
deleted file mode 100644
index 652db3b57f..0000000000
--- a/Ironsworn/src/roll-templates/mixins/oracles.pug
+++ /dev/null
@@ -1,27 +0,0 @@
-//- include ../../../data/oracles
-
-//- rolltemplate.sheet-rolltemplate-ironcrunch_oracles
-//-   .sheet-roll-container
-//-     .sheet-subheader {{header}}
-//-     | {{#custom-oracle}}
-//-     .sheet-result-row
-//-       .sheet-oracle-table-text {{custom-oracle}}
-//-     | {{/custom-oracle}}
-//-     each group in oracles.ironcrunch
-//-       each oracle in group.oracles
-//-         |
-//-         | {{##{oracle.roll_id}}}
-//-         .sheet-result-row
-//-           .sheet-oracle-dice
-//-             span {{#{oracle.roll_id}}}
-//-           .sheet-oracle-table-text
-//-             each row in oracle.rows
-//-               - var rollValues = row.roll.match(/(\d+-\d*)|(\d+)/gm)[0].replace('-', ' ')
-//-               | 
-//-               | {{#roll#{row.type}() #{oracle.roll_id} #{rollValues}}}
-//-               | 
-//-               span!=row.result
-//-               | 
-//-               | {{/roll#{row.type}() #{oracle.roll_id} #{rollValues}}}
-//-         |
-//-         | {{/#{oracle.roll_id}}}
\ No newline at end of file