diff --git a/Tales from the Loop Official/src/js/sheetworkers.js b/Tales from the Loop Official/src/js/sheetworkers.js
index 7334b7f65f..bd0986c742 100644
--- a/Tales from the Loop Official/src/js/sheetworkers.js	
+++ b/Tales from the Loop Official/src/js/sheetworkers.js	
@@ -1,17 +1,18 @@
 on("sheet:opened", eventInfo => {
-    getAttrs(["sheet_version"], values => {
-        if (values["sheet_version"] !== "1") {
+    getAttrs(["sheet_version",], values => {
+        if (+values["sheet_version"] < 1) {
             getAttrs(["song", "iconic", "totalluck"], values => {
-                const set_attrs = {};
-
-                set_attrs["favourite_song"] = values["song"];
-                set_attrs["iconic_item"] = values["iconic"];
-                set_attrs["luck_max"] = values["totalluck"];
-                set_attrs["sheet_version"] = 1;
-
-                setAttrs(set_attrs);
+                const {song, iconic, totalluck} = values || false;
+                const updateAttrs = {};
+                if (song && iconic && totalluck) {
+                    updateAttrs["favourite_song"] = values["song"];
+                    updateAttrs["iconic_item"] = values["iconic"];
+                    updateAttrs["luck_max"] = values["totalluck"];
+                }
+                updateAttrs["sheet_version"] = "1";
+                setAttrs(updateAttrs);
             })
 
         }
-    })
+    });
 });
\ No newline at end of file
diff --git a/Tales from the Loop Official/src/pug/rolltemplates.pug b/Tales from the Loop Official/src/pug/rolltemplates.pug
index 59dce708c4..8f7147d7c2 100644
--- a/Tales from the Loop Official/src/pug/rolltemplates.pug	
+++ b/Tales from the Loop Official/src/pug/rolltemplates.pug	
@@ -62,9 +62,16 @@ rolltemplate.sheet-rolltemplate-tftl
                 span ({{broken}}) 
             | {{/rollGreater() broken 0}}
         .sheet-tftl-roll
+            | {{#rollGreater() pool_size 0}}
             span {{roll}}
             span Successes
+            | {{/rollGreater() pool_size 0}}
+            | {{#^rollGreater() pool_size 0}}
+            span {{min1}}
+            span Successes
+            | {{/^rollGreater() pool_size 0}}
         .sheet-tftl-buttons
+            | {{#rollGreater() pool_size 0}}
             | {{#reroll1}}
             each number in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
                 | {{#rollTotal() roll #{number}}}
@@ -72,4 +79,8 @@ rolltemplate.sheet-rolltemplate-tftl
                 | {{/rollTotal() roll #{number}}}
             .sheet-tftl-buttontext(data-i18n="Spend a point of luck, or take a condition") Spend a point of luck, or take a condition
             | {{/reroll1}}
+            | {{/rollGreater() pool_size 0}}
+            | {{#^rollGreater() pool_size 0}}
+            | {{reroll_only1}}
+            | {{/^rollGreater() pool_size 0}}
         .sheet-tftl-footer
\ No newline at end of file
diff --git a/Tales from the Loop Official/src/pug/tftl.pug b/Tales from the Loop Official/src/pug/tftl.pug
index 02812441bd..59e6a84e15 100644
--- a/Tales from the Loop Official/src/pug/tftl.pug	
+++ b/Tales from the Loop Official/src/pug/tftl.pug	
@@ -5,12 +5,23 @@ each number in [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
             `{{name=Reroll}}`,
             `{{character_name=@{character_name}}}`,
             `{{reroll_dice=${number}}}`,
+            `{{pool_size=[[${number}+0]]}}`,
             `{{roll=[[${number}d6>6]]}}`,
             ].join(" ");
-    button.hidden(name=`roll_reroll${number}`, type="roll", value=reroll)
+    button.sheet-hidden(name=`roll_reroll${number}`, type="roll", value=reroll)
+- 
+    const reroll1 = [
+        `&{template:tftl}`,
+        `{{name=Reroll}}`,
+        `{{character_name=@{character_name}}}`,
+        `{{reroll_dice=1}}`,
+        `{{pool_size=[[1]]}}`,
+        `{{roll=[[1d6>6]]}}`,
+        ].join(" ");
+button.sheet-hidden(name=`roll_rerollonly1`, type="roll", value=reroll1)
 input(data-i18n-value="Reroll", name="attr_translation_luck", type="hidden", value="Reroll")
 
-input(name="attr_sheet_version", type="hidden")
+input(name="attr_sheet_version", type="hidden", value="1")
 
 .tftl-wrapper
     .tftl-logo
@@ -27,6 +38,8 @@ input(name="attr_sheet_version", type="hidden")
                         `{{name=${attribute}}}`,
                         `{{character_name=@{character_name}}}`,
                         `{{roll=[[[[@{${attribute.toLowerCase()}}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6>6]]}}`,
+                        `{{pool_size=[[@{${attribute.toLowerCase()}}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}}`,
+                        `{{min1=[[1d6>6]]}}`,
                         `{{stat_value=@{${attribute.toLowerCase()}}}}`,
                         `{{stat_title=${attribute.toLowerCase()}}}`,
                         `{{bonus_dice=?{Bonus Dice|0}}}`,
@@ -35,6 +48,7 @@ input(name="attr_sheet_version", type="hidden")
                         `{{exhausted=[[@{exhausted}]]}}`,
                         `{{injured=[[@{injured}]]}}`,
                         `{{broken=[[@{broken}]]}}`,
+                        `{{reroll_only1=[@{translation_luck}](~@{character_id}|rerollonly1)}}`,
                         ],...button_array].join(" ");
                 .tftl-panel__row(class=`background-rand-${Math.floor(Math.random() * 10)+1}`)
                     button.tftl-panel__label--button(data-i18n=attribute, type="roll", value=roll)=attribute
@@ -58,6 +72,8 @@ input(name="attr_sheet_version", type="hidden")
                         `{{name=${skill.name}}}`,
                         `{{character_name=@{character_name}}}`,
                         `{{roll=[[[[@{${skill.stat.toLowerCase()}}+@{${skill.name.toLowerCase()}}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6>6]]}}`,
+                        `{{pool_size=[[@{${skill.stat.toLowerCase()}}+@{${skill.name.toLowerCase()}}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}}`,
+                        `{{min1=[[1d6>6]]}}`,
                         `{{stat_value=@{${skill.stat.toLowerCase()}}}}`,
                         `{{stat_title=${skill.stat.toLowerCase()}}}`,
                         `{{skill_value=@{${skill.name.toLowerCase()}}}}`,
diff --git a/Tales from the Loop Official/tftl.css b/Tales from the Loop Official/tftl.css
index 37d1112fbc..50d6df83c2 100644
--- a/Tales from the Loop Official/tftl.css	
+++ b/Tales from the Loop Official/tftl.css	
@@ -1,4 +1,5 @@
 @import url("https://fonts.googleapis.com/css?family=Catamaran:800|Montserrat:700|Baltimore%20Typewriter:400|&display=swap");
+
 .sheet-hidden {
   display: none;
 }
diff --git a/Tales from the Loop Official/tftl.html b/Tales from the Loop Official/tftl.html
index f3c61455de..54349c464b 100644
--- a/Tales from the Loop Official/tftl.html	
+++ b/Tales from the Loop Official/tftl.html	
@@ -1,126 +1,127 @@
 
-<button class="hidden" name="roll_reroll0" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=0}} {{roll=[[0d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll1" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=1}} {{roll=[[1d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll2" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=2}} {{roll=[[2d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll3" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=3}} {{roll=[[3d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll4" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=4}} {{roll=[[4d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll5" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=5}} {{roll=[[5d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll6" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=6}} {{roll=[[6d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll7" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=7}} {{roll=[[7d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll8" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=8}} {{roll=[[8d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll9" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=9}} {{roll=[[9d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll10" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=10}} {{roll=[[10d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll11" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=11}} {{roll=[[11d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll12" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=12}} {{roll=[[12d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll13" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=13}} {{roll=[[13d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll14" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=14}} {{roll=[[14d6&gt;6]]}}"></button>
-<button class="hidden" name="roll_reroll15" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=15}} {{roll=[[15d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll0" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=0}} {{pool_size=[[0+0]]}} {{roll=[[0d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll1" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=1}} {{pool_size=[[1+0]]}} {{roll=[[1d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll2" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=2}} {{pool_size=[[2+0]]}} {{roll=[[2d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll3" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=3}} {{pool_size=[[3+0]]}} {{roll=[[3d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll4" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=4}} {{pool_size=[[4+0]]}} {{roll=[[4d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll5" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=5}} {{pool_size=[[5+0]]}} {{roll=[[5d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll6" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=6}} {{pool_size=[[6+0]]}} {{roll=[[6d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll7" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=7}} {{pool_size=[[7+0]]}} {{roll=[[7d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll8" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=8}} {{pool_size=[[8+0]]}} {{roll=[[8d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll9" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=9}} {{pool_size=[[9+0]]}} {{roll=[[9d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll10" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=10}} {{pool_size=[[10+0]]}} {{roll=[[10d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll11" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=11}} {{pool_size=[[11+0]]}} {{roll=[[11d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll12" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=12}} {{pool_size=[[12+0]]}} {{roll=[[12d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll13" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=13}} {{pool_size=[[13+0]]}} {{roll=[[13d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll14" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=14}} {{pool_size=[[14+0]]}} {{roll=[[14d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_reroll15" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=15}} {{pool_size=[[15+0]]}} {{roll=[[15d6&gt;6]]}}"></button>
+<button class="sheet-hidden" name="roll_rerollonly1" type="roll" value="&amp;{template:tftl} {{name=Reroll}} {{character_name=@{character_name}}} {{reroll_dice=1}} {{pool_size=[[1]]}} {{roll=[[1d6&gt;6]]}}"></button>
 <input data-i18n-value="Reroll" name="attr_translation_luck" type="hidden" value="Reroll"/>
-<input name="attr_sheet_version" type="hidden"/>
+<input name="attr_sheet_version" type="hidden" value="1"/>
 <div class="tftl-wrapper">
   <div class="tftl-logo"><img src="https://s3.amazonaws.com/files.d20.io/images/134821648/zsgtTwHGN6Ooki4IZQtc6g/max.png?1589569230"/></div>
   <div class="tftl-leftcol">
     <div class="tftl-attributes tftl-panel--alternate">
-      <div class="tftl-panel__header background-rand-2" data-i18n="Attributes">Attributes</div>
+      <div class="tftl-panel__header background-rand-6" data-i18n="Attributes">Attributes</div>
       <div class="tftl-panel__row background-rand-6">
-        <button class="tftl-panel__label--button" data-i18n="Body" type="roll" value="&amp;{template:tftl} {{name=Body}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Body</button>
+        <button class="tftl-panel__label--button" data-i18n="Body" type="roll" value="&amp;{template:tftl} {{name=Body}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll_only1=[@{translation_luck}](~@{character_id}|rerollonly1)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Body</button>
         <input class="tftl-panel__input--small" name="attr_body" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-9">
-        <button class="tftl-panel__label--button" data-i18n="Tech" type="roll" value="&amp;{template:tftl} {{name=Tech}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Tech</button>
+      <div class="tftl-panel__row background-rand-8">
+        <button class="tftl-panel__label--button" data-i18n="Tech" type="roll" value="&amp;{template:tftl} {{name=Tech}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll_only1=[@{translation_luck}](~@{character_id}|rerollonly1)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Tech</button>
         <input class="tftl-panel__input--small" name="attr_tech" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-9">
-        <button class="tftl-panel__label--button" data-i18n="Heart" type="roll" value="&amp;{template:tftl} {{name=Heart}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Heart</button>
+      <div class="tftl-panel__row background-rand-6">
+        <button class="tftl-panel__label--button" data-i18n="Heart" type="roll" value="&amp;{template:tftl} {{name=Heart}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll_only1=[@{translation_luck}](~@{character_id}|rerollonly1)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Heart</button>
         <input class="tftl-panel__input--small" name="attr_heart" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-6">
-        <button class="tftl-panel__label--button" data-i18n="Mind" type="roll" value="&amp;{template:tftl} {{name=Mind}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Mind</button>
+      <div class="tftl-panel__row background-rand-9">
+        <button class="tftl-panel__label--button" data-i18n="Mind" type="roll" value="&amp;{template:tftl} {{name=Mind}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll_only1=[@{translation_luck}](~@{character_id}|rerollonly1)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Mind</button>
         <input class="tftl-panel__input--small" name="attr_mind" type="number" value="0"/>
       </div>
     </div>
     <div class="tftl-conditions tftl-panel--alternate">
-      <div class="tftl-panel__header background-rand-2" data-i18n="Conditions">Conditions</div>
-      <div class="tftl-panel__row background-rand-4"><strong class="tftl-panel__label" data-i18n="Upset">Upset</strong>
+      <div class="tftl-panel__header background-rand-9" data-i18n="Conditions">Conditions</div>
+      <div class="tftl-panel__row background-rand-2"><strong class="tftl-panel__label" data-i18n="Upset">Upset</strong>
         <label class="tftl-checkbox">
           <input class="tftl-checkbox__hide" name="attr_upset" type="checkbox" value="1"/><span class="tftl-checkbox__show"></span>
         </label>
       </div>
-      <div class="tftl-panel__row background-rand-4"><strong class="tftl-panel__label" data-i18n="Scared">Scared</strong>
+      <div class="tftl-panel__row background-rand-7"><strong class="tftl-panel__label" data-i18n="Scared">Scared</strong>
         <label class="tftl-checkbox">
           <input class="tftl-checkbox__hide" name="attr_scared" type="checkbox" value="1"/><span class="tftl-checkbox__show"></span>
         </label>
       </div>
-      <div class="tftl-panel__row background-rand-6"><strong class="tftl-panel__label" data-i18n="Exhausted">Exhausted</strong>
+      <div class="tftl-panel__row background-rand-3"><strong class="tftl-panel__label" data-i18n="Exhausted">Exhausted</strong>
         <label class="tftl-checkbox">
           <input class="tftl-checkbox__hide" name="attr_exhausted" type="checkbox" value="1"/><span class="tftl-checkbox__show"></span>
         </label>
       </div>
-      <div class="tftl-panel__row background-rand-7"><strong class="tftl-panel__label" data-i18n="Injured">Injured</strong>
+      <div class="tftl-panel__row background-rand-4"><strong class="tftl-panel__label" data-i18n="Injured">Injured</strong>
         <label class="tftl-checkbox">
           <input class="tftl-checkbox__hide" name="attr_injured" type="checkbox" value="1"/><span class="tftl-checkbox__show"></span>
         </label>
       </div>
-      <div class="tftl-panel__row background-rand-6"><strong class="tftl-panel__label" data-i18n="Broken">Broken</strong>
+      <div class="tftl-panel__row background-rand-9"><strong class="tftl-panel__label" data-i18n="Broken">Broken</strong>
         <label class="tftl-checkbox">
           <input class="tftl-checkbox__hide" name="attr_broken" type="checkbox" value="1"/><span class="tftl-checkbox__show"></span>
         </label>
       </div>
     </div>
     <div class="tftl-attributes tftl-panel--alternate">
-      <div class="tftl-panel__header background-rand-8" data-i18n="Skills">Skills</div>
-      <div class="tftl-panel__row background-rand-3">
-        <button class="tftl-panel__label--button" data-i18n="Sneak (Body)" type="roll" value="&amp;{template:tftl} {{name=Sneak}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{skill_value=@{sneak}}} {{skill_title=sneak}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Sneak (Body)</button>
+      <div class="tftl-panel__header background-rand-1" data-i18n="Skills">Skills</div>
+      <div class="tftl-panel__row background-rand-2">
+        <button class="tftl-panel__label--button" data-i18n="Sneak (Body)" type="roll" value="&amp;{template:tftl} {{name=Sneak}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{skill_value=@{sneak}}} {{skill_title=sneak}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{sneak}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Sneak (Body)</button>
         <input class="tftl-panel__input--small" name="attr_sneak" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-10">
-        <button class="tftl-panel__label--button" data-i18n="Force (Body)" type="roll" value="&amp;{template:tftl} {{name=Force}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{skill_value=@{force}}} {{skill_title=force}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Force (Body)</button>
+      <div class="tftl-panel__row background-rand-2">
+        <button class="tftl-panel__label--button" data-i18n="Force (Body)" type="roll" value="&amp;{template:tftl} {{name=Force}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{skill_value=@{force}}} {{skill_title=force}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{force}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Force (Body)</button>
         <input class="tftl-panel__input--small" name="attr_force" type="number" value="0"/>
       </div>
       <div class="tftl-panel__row background-rand-10">
-        <button class="tftl-panel__label--button" data-i18n="Move (Body)" type="roll" value="&amp;{template:tftl} {{name=Move}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{skill_value=@{move}}} {{skill_title=move}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Move (Body)</button>
+        <button class="tftl-panel__label--button" data-i18n="Move (Body)" type="roll" value="&amp;{template:tftl} {{name=Move}} {{character_name=@{character_name}}} {{roll=[[[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{body}}} {{stat_title=body}} {{skill_value=@{move}}} {{skill_title=move}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{body}+@{move}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Move (Body)</button>
         <input class="tftl-panel__input--small" name="attr_move" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-9">
-        <button class="tftl-panel__label--button" data-i18n="Tinker (Tech)" type="roll" value="&amp;{template:tftl} {{name=Tinker}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{skill_value=@{tinker}}} {{skill_title=tinker}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Tinker (Tech)</button>
+      <div class="tftl-panel__row background-rand-4">
+        <button class="tftl-panel__label--button" data-i18n="Tinker (Tech)" type="roll" value="&amp;{template:tftl} {{name=Tinker}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{skill_value=@{tinker}}} {{skill_title=tinker}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{tinker}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Tinker (Tech)</button>
         <input class="tftl-panel__input--small" name="attr_tinker" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-2">
-        <button class="tftl-panel__label--button" data-i18n="Program (Tech)" type="roll" value="&amp;{template:tftl} {{name=Program}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{skill_value=@{program}}} {{skill_title=program}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Program (Tech)</button>
+      <div class="tftl-panel__row background-rand-7">
+        <button class="tftl-panel__label--button" data-i18n="Program (Tech)" type="roll" value="&amp;{template:tftl} {{name=Program}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{skill_value=@{program}}} {{skill_title=program}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{program}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Program (Tech)</button>
         <input class="tftl-panel__input--small" name="attr_program" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-4">
-        <button class="tftl-panel__label--button" data-i18n="Calculate (Tech)" type="roll" value="&amp;{template:tftl} {{name=Calculate}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{skill_value=@{calculate}}} {{skill_title=calculate}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Calculate (Tech)</button>
+      <div class="tftl-panel__row background-rand-10">
+        <button class="tftl-panel__label--button" data-i18n="Calculate (Tech)" type="roll" value="&amp;{template:tftl} {{name=Calculate}} {{character_name=@{character_name}}} {{roll=[[[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{tech}}} {{stat_title=tech}} {{skill_value=@{calculate}}} {{skill_title=calculate}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{tech}+@{calculate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Calculate (Tech)</button>
         <input class="tftl-panel__input--small" name="attr_calculate" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-7">
-        <button class="tftl-panel__label--button" data-i18n="Contact (Heart)" type="roll" value="&amp;{template:tftl} {{name=Contact}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{skill_value=@{contact}}} {{skill_title=contact}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Contact (Heart)</button>
+      <div class="tftl-panel__row background-rand-5">
+        <button class="tftl-panel__label--button" data-i18n="Contact (Heart)" type="roll" value="&amp;{template:tftl} {{name=Contact}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{skill_value=@{contact}}} {{skill_title=contact}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{contact}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Contact (Heart)</button>
         <input class="tftl-panel__input--small" name="attr_contact" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-5">
-        <button class="tftl-panel__label--button" data-i18n="Charm (Heart)" type="roll" value="&amp;{template:tftl} {{name=Charm}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{skill_value=@{charm}}} {{skill_title=charm}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Charm (Heart)</button>
+      <div class="tftl-panel__row background-rand-1">
+        <button class="tftl-panel__label--button" data-i18n="Charm (Heart)" type="roll" value="&amp;{template:tftl} {{name=Charm}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{skill_value=@{charm}}} {{skill_title=charm}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{charm}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Charm (Heart)</button>
         <input class="tftl-panel__input--small" name="attr_charm" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-8">
-        <button class="tftl-panel__label--button" data-i18n="Lead (Heart)" type="roll" value="&amp;{template:tftl} {{name=Lead}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{skill_value=@{lead}}} {{skill_title=lead}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Lead (Heart)</button>
+      <div class="tftl-panel__row background-rand-4">
+        <button class="tftl-panel__label--button" data-i18n="Lead (Heart)" type="roll" value="&amp;{template:tftl} {{name=Lead}} {{character_name=@{character_name}}} {{roll=[[[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{heart}}} {{stat_title=heart}} {{skill_value=@{lead}}} {{skill_title=lead}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{heart}+@{lead}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Lead (Heart)</button>
         <input class="tftl-panel__input--small" name="attr_lead" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-3">
-        <button class="tftl-panel__label--button" data-i18n="Investigate (Mind)" type="roll" value="&amp;{template:tftl} {{name=Investigate}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{skill_value=@{investigate}}} {{skill_title=investigate}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Investigate (Mind)</button>
+      <div class="tftl-panel__row background-rand-9">
+        <button class="tftl-panel__label--button" data-i18n="Investigate (Mind)" type="roll" value="&amp;{template:tftl} {{name=Investigate}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{skill_value=@{investigate}}} {{skill_title=investigate}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{investigate}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Investigate (Mind)</button>
         <input class="tftl-panel__input--small" name="attr_investigate" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-8">
-        <button class="tftl-panel__label--button" data-i18n="Comprehend (Mind)" type="roll" value="&amp;{template:tftl} {{name=Comprehend}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{skill_value=@{comprehend}}} {{skill_title=comprehend}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Comprehend (Mind)</button>
+      <div class="tftl-panel__row background-rand-3">
+        <button class="tftl-panel__label--button" data-i18n="Comprehend (Mind)" type="roll" value="&amp;{template:tftl} {{name=Comprehend}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{skill_value=@{comprehend}}} {{skill_title=comprehend}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{comprehend}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Comprehend (Mind)</button>
         <input class="tftl-panel__input--small" name="attr_comprehend" type="number" value="0"/>
       </div>
-      <div class="tftl-panel__row background-rand-1">
-        <button class="tftl-panel__label--button" data-i18n="Empathize (Mind)" type="roll" value="&amp;{template:tftl} {{name=Empathize}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{skill_value=@{empathize}}} {{skill_title=empathize}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Empathize (Mind)</button>
+      <div class="tftl-panel__row background-rand-8">
+        <button class="tftl-panel__label--button" data-i18n="Empathize (Mind)" type="roll" value="&amp;{template:tftl} {{name=Empathize}} {{character_name=@{character_name}}} {{roll=[[[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]d6&gt;6]]}} {{pool_size=[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}]]}} {{min1=[[1d6&gt;6]]}} {{stat_value=@{mind}}} {{stat_title=mind}} {{skill_value=@{empathize}}} {{skill_title=empathize}} {{bonus_dice=?{Bonus Dice|0}}} {{upset=[[@{upset}]]}} {{scared=[[@{scared}]]}} {{exhausted=[[@{exhausted}]]}} {{injured=[[@{injured}]]}} {{broken=[[@{broken}]]}} {{reroll=[@{translation_luck}](~@{character_id}|reroll)}} {{reroll0=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-0]])}} {{reroll1=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-1]])}} {{reroll2=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-2]])}} {{reroll3=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-3]])}} {{reroll4=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-4]])}} {{reroll5=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-5]])}} {{reroll6=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-6]])}} {{reroll7=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-7]])}} {{reroll8=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-8]])}} {{reroll9=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-9]])}} {{reroll10=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-10]])}} {{reroll11=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-11]])}} {{reroll12=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-12]])}} {{reroll13=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-13]])}} {{reroll14=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-14]])}} {{reroll15=[@{translation_luck}](~@{character_id}|reroll[[@{mind}+@{empathize}+?{Bonus Dice|0}-@{upset}-@{scared}-@{exhausted}-@{injured}-@{broken}-15]])}}">Empathize (Mind)</button>
         <input class="tftl-panel__input--small" name="attr_empathize" type="number" value="0"/>
       </div>
     </div>
     <div class="tftl-attributes tftl-panel--alternate">
       <div class="tftl-panel__header background-rand-10" data-i18n="Experience">Experience</div>
-      <div class="tftl-panel__row tftl-experience background-rand-1"> 
+      <div class="tftl-panel__row tftl-experience background-rand-3"> 
         <label class="tftl-checkbox">
           <input class="tftl-checkbox__hide" name="attr_experience_1" type="checkbox"/><span class="tftl-checkbox__show"></span>
         </label>
@@ -156,16 +157,16 @@
   </div>
   <div class="tftl-rightcol">
     <div class="tftl-panel--full tftl-character">
-      <div class="tftl-panel__row--span1 tftl-panel__row--name background-rand-10"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Name">Name</strong>
+      <div class="tftl-panel__row--span1 tftl-panel__row--name background-rand-3"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Name">Name</strong>
         <input class="tftl-panel__input--hide" name="attr_character_name" type="text"/>
       </div>
-      <div class="tftl-panel__row--span1 tftl-panel__row--type background-rand-3"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Type">Type</strong>
+      <div class="tftl-panel__row--span1 tftl-panel__row--type background-rand-8"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Type">Type</strong>
         <input class="tftl-panel__input--hide" name="attr_type" type="text"/>
       </div>
-      <div class="tftl-panel__row--span1 tftl-panel__row--age background-rand-9"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Age">Age</strong>
+      <div class="tftl-panel__row--span1 tftl-panel__row--age background-rand-2"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Age">Age</strong>
         <input class="tftl-panel__input--hide" name="attr_age" type="number"/>
       </div>
-      <div class="tftl-panel__row--span1 tftl-panel__row--luck background-rand-4"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Luck">Luck</strong>
+      <div class="tftl-panel__row--span1 tftl-panel__row--luck background-rand-10"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Luck">Luck</strong>
         <input class="tftl-panel__input--hide" name="attr_luck_max" type="number"/>
         <div class="tftl-checks">
           <label class="tftl-checkbox">
@@ -185,13 +186,13 @@
           </label>
         </div>
       </div>
-      <div class="tftl-panel__row--span2 tftl-panel__row--drive background-rand-10"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Drive">Drive</strong>
+      <div class="tftl-panel__row--span2 tftl-panel__row--drive background-rand-6"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Drive">Drive</strong>
         <input class="tftl-panel__input--hide" name="attr_drive" type="text"/>
       </div>
       <div class="tftl-panel__row--span2 tftl-panel__row--problem background-rand-1"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Problem">Problem</strong>
         <input class="tftl-panel__input--hide" name="attr_problem" type="text"/>
       </div>
-      <div class="tftl-panel__row--span2 tftl-panel__row--pride background-rand-2"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Pride">Pride</strong>
+      <div class="tftl-panel__row--span2 tftl-panel__row--pride background-rand-10"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Pride">Pride</strong>
         <input class="tftl-panel__input--hide" name="attr_pride" type="text"/>
         <label class="tftl-checkbox">
           <input class="tftl-checkbox__hide" name="attr_pride_check" type="checkbox" value="1"/><span class="tftl-checkbox__show"> </span>
@@ -200,17 +201,17 @@
       <div class="tftl-panel__row--span2 tftl-panel__row--description background-rand-3"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Description">Description</strong>
         <input class="tftl-panel__input--hide" name="attr_description" type="text"/>
       </div>
-      <div class="tftl-panel__row--span1 tftl-panel__row--favourite_song background-rand-5"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Favourite Song">Favourite Song</strong>
+      <div class="tftl-panel__row--span1 tftl-panel__row--favourite_song background-rand-6"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Favourite Song">Favourite Song</strong>
         <input class="tftl-panel__input--hide" name="attr_favourite_song" type="text"/>
       </div>
-      <div class="tftl-panel__row--span1 tftl-panel__row--anchor background-rand-10"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Anchor">Anchor</strong>
+      <div class="tftl-panel__row--span1 tftl-panel__row--anchor background-rand-3"><strong class="tftl-panel__label--small tftl-panel__label" data-i18n="Anchor">Anchor</strong>
         <input class="tftl-panel__input--hide" name="attr_anchor" type="text"/>
       </div>
     </div>
     <div class="tftl-panel--full">
-      <div class="tftl-panel__header background-rand-5" data-i18n="Relationships">Relationships</div>
+      <div class="tftl-panel__header background-rand-1" data-i18n="Relationships">Relationships</div>
       <fieldset class="repeating_relationships">
-        <div class="tftl-panel__row--relationship background-rand-5">
+        <div class="tftl-panel__row--relationship background-rand-8">
           <select class="tftl-panel__label--select" name="attr_relationship_type">
             <option data-i18n="PC">PC</option>
             <option data-i18n="NPC">NPC</option>
@@ -220,26 +221,26 @@
       </fieldset>
     </div>
     <div class="tftl-panel">
-      <div class="tftl-panel__header background-rand-9"><span class="tftl-panel__left" data-i18n="Items">Items</span><span class="tftl-panel__right" data-i18n="Bonus">Bonus</span></div>
-      <div class="tftl-panel__row--iconic background-rand-6"><span class="tftl-panel__label--small" data-i18n="Iconic Item">Iconic Item</span>
+      <div class="tftl-panel__header background-rand-1"><span class="tftl-panel__left" data-i18n="Items">Items</span><span class="tftl-panel__right" data-i18n="Bonus">Bonus</span></div>
+      <div class="tftl-panel__row--iconic background-rand-7"><span class="tftl-panel__label--small" data-i18n="Iconic Item">Iconic Item</span>
         <input class="tftl-panel__input--hide" name="attr_iconic_item" type="text"/><span class="tftl-panel__label--value">+2</span>
       </div>
       <fieldset class="repeating_item">
-        <div class="tftl-panel__row--item background-rand-3">
+        <div class="tftl-panel__row--item background-rand-4">
           <input class="tftl-panel__input--hide" name="attr_item_name" type="text"/><span class="tftl-panel__label--plus">+</span>
           <input class="tftl-panel__input--item" name="attr_item_bonus" type="number" value="0"/>
         </div>
       </fieldset>
     </div>
     <div class="tftl-panel--fullheight">
-      <div class="tftl-panel__header background-rand-1" data-i18n="Hideout">Hideout</div>
-      <div class="tftl-panel__row--textarea background-rand-1">
+      <div class="tftl-panel__header background-rand-10" data-i18n="Hideout">Hideout</div>
+      <div class="tftl-panel__row--textarea background-rand-4">
         <textarea class="tftl-panel__textarea--full" name="attr_hideout"></textarea>
       </div>
     </div>
     <div class="tftl-panel--full">
-      <div class="tftl-panel__header background-rand-9" data-i18n="Notes">Notes</div>
-      <div class="tftl-panel__row--textarea background-rand-6">
+      <div class="tftl-panel__header background-rand-4" data-i18n="Notes">Notes</div>
+      <div class="tftl-panel__row--textarea background-rand-8">
         <textarea class="tftl-panel__textarea--full" name="attr_notes"></textarea>
       </div>
     </div>
@@ -269,8 +270,12 @@
       {{#rollGreater() broken 0}}
       <div class="sheet-tftl-roll-row"><span>-</span><span data-i18n="Broken">Broken</span><span>({{broken}}) </span></div>{{/rollGreater() broken 0}}
     </div>
-    <div class="sheet-tftl-roll"><span>{{roll}}</span><span>Successes</span></div>
-    <div class="sheet-tftl-buttons">{{#reroll1}}{{#rollTotal() roll 0}}
+    <div class="sheet-tftl-roll">{{#rollGreater() pool_size 0}}<span>{{roll}}</span><span>Successes</span>{{/rollGreater() pool_size 0}}
+      {{#^rollGreater() pool_size 0}}<span>{{min1}}</span><span>Successes</span>{{/^rollGreater() pool_size 0}}
+    </div>
+    <div class="sheet-tftl-buttons">
+      {{#rollGreater() pool_size 0}}
+      {{#reroll1}}{{#rollTotal() roll 0}}
       {{reroll0}}
       {{/rollTotal() roll 0}}{{#rollTotal() roll 1}}
       {{reroll1}}
@@ -304,25 +309,30 @@
       {{reroll15}}
       {{/rollTotal() roll 15}}
       <div class="sheet-tftl-buttontext" data-i18n="Spend a point of luck, or take a condition">Spend a point of luck, or take a condition</div>{{/reroll1}}
+      {{/rollGreater() pool_size 0}}
+      {{#^rollGreater() pool_size 0}}
+      {{reroll_only1}}
+      {{/^rollGreater() pool_size 0}}
     </div>
     <div class="sheet-tftl-footer"></div>
   </div>
 </rolltemplate>
 <script type="text/worker">on("sheet:opened", eventInfo => {
-    getAttrs(["sheet_version"], values => {
-        if (values["sheet_version"] !== "1") {
+    getAttrs(["sheet_version",], values => {
+        if (+values["sheet_version"] < 1) {
             getAttrs(["song", "iconic", "totalluck"], values => {
-                const set_attrs = {};
-
-                set_attrs["favourite_song"] = values["song"];
-                set_attrs["iconic_item"] = values["iconic"];
-                set_attrs["luck_max"] = values["totalluck"];
-                set_attrs["sheet_version"] = 1;
-
-                setAttrs(set_attrs);
+                const {song, iconic, totalluck} = values || false;
+                const updateAttrs = {};
+                if (song && iconic && totalluck) {
+                    updateAttrs["favourite_song"] = values["song"];
+                    updateAttrs["iconic_item"] = values["iconic"];
+                    updateAttrs["luck_max"] = values["totalluck"];
+                }
+                updateAttrs["sheet_version"] = "1";
+                setAttrs(updateAttrs);
             })
 
         }
-    })
+    });
 });
 </script>
\ No newline at end of file