diff --git a/Alien Roleplaying Game/Alien-Roleplaying-Game.css b/Alien Roleplaying Game/Alien-Roleplaying-Game.css
index a8f798a045..a7886db75a 100644
--- a/Alien Roleplaying Game/Alien-Roleplaying-Game.css	
+++ b/Alien Roleplaying Game/Alien-Roleplaying-Game.css	
@@ -1,4 +1,5 @@
-@import url('https://fonts.googleapis.com/css?family=Montserrat|Graduate|Courier+Prime|Roboto|Share+Tech+Mono&display=swap');
+@import url('https://fonts.googleapis.com/css?family=Montserrat|Graduate|Courier+Prime|Roboto|Share+Tech+Mono|Material+Icons&display=swap');
+/* @import url('https://fonts.googleapis.com/css?family=Material+Icons&display=swap'); */
 /* ORIGINAL */
 
 .sheet-background-wrap{
@@ -436,12 +437,22 @@ input.sheet-tab-sheet[value="Xeno"] ~ .sheet-background-wrap {
 .charsheet div:hover + input.sheet-expand + span::before {
     opacity: 0.85;
 } */
-.charsheet input.sheet-expand + span + span + textarea {
+.charsheet input.sheet-expand + span + span + div.sheet-expandable,
+.charsheet input.sheet-expand + span + span + div + span + span + span + textarea.sheet-expandable {
     display: none;
 }
-.charsheet input.sheet-expand:checked + span + span + textarea {
-    display: inline-block;
+.charsheet input.sheet-expand:checked + span + span + div.sheet-expandable,
+.charsheet input.sheet-expand:checked + span + span + div + span + span + span + textarea.sheet-expandable {
+    display: flex;
+    justify-content: flex-end;
 }
+div.sheet-expandable button[type="action"] {
+    font-family: 'Pictos';
+    border: 0;
+    font-size: 120%;
+    padding: 5px 10px 5px 10px;
+}
+
 
 /* - - - - - - - - - - AUTO EXPAND TEXTAREAS - - - - - - - - - - */
 .sheet-auto-expand {
@@ -521,6 +532,15 @@ input.sheet-tab-sheet[value="Xeno"] ~ .sheet-background-wrap {
     min-width: 100%;
     resize: vertical;
 }
+.sheet-xeno .sheet-xeno-attack div,
+.sheet-xeno .sheet-xeno-attack span,
+.sheet-xeno .sheet-xeno-attack button,
+.sheet-xeno .sheet-xeno-attack input {
+    align-self: baseline;
+}
+.sheet-xeno .sheet-xeno-attack .sheet-expandable button {
+    margin-top: 5px;
+}
 .sheet-xeno .sheet-xeno-attack textarea {
     min-height: 60px;
     font-size: 12px;
@@ -548,7 +568,7 @@ input.sheet-tab-sheet[value="Xeno"] ~ .sheet-background-wrap {
     line-height: inherit;
     border-right: 1px dashed rgba(0, 139, 139, 1); /* Dark Cyan #008b8b */
     padding: 0;
-    margin: 0 5px 0 0;
+    margin: 0 -1px 0 -5px;
 }
 
 .sheet-dotted-underline {
@@ -686,7 +706,7 @@ div.sheet-changelog button.sheet-button-link:focus::before {
     justify-self: center;
 }
 
-button[type="roll"].sheet-button-skill, input[type="checkbox"].sheet-button-skill, .sheet-medium-teal-header, .sheet-dark-teal-header {
+button[type="roll"].sheet-button-skill, button[type="action"].sheet-button-skill, input[type="checkbox"].sheet-button-skill, .sheet-medium-teal-header, .sheet-dark-teal-header {
     color: #008b8b; /* Dark Cyan #008b8b */
     font-family: 'Montserrat';
     text-transform: uppercase; 
@@ -721,7 +741,9 @@ button[type="roll"].sheet-button-skill, input[type="checkbox"].sheet-button-skil
 .sheet-vertical-adjust-two-more {
      margin-top: 12px;
 }
-
+.sheet-vertical-shift-one {
+    margin-top: -5px;
+}
 .sheet-vertical-balance {
      margin-top: 12px;
 }
@@ -1635,6 +1657,32 @@ input.sheet-letter-box:checked + span::before {
     border: solid 1px #808080;
     box-shadow: 0px 0px 10px #008b8b;
 }
+.sheet-darker-rounded-box {
+    display: flex;
+    flex-direction: row;
+    width: fit-content;
+    background-color: rgb(185, 218, 193);
+    background-color: #008b8b; 
+    color: rgb(204, 217, 207);
+    border-radius: 6px;
+    border: 0;
+    margin: 2px 3px 2px 3px;
+}
+.sheet-darker-rounded-box span,
+.sheet-darker-rounded-box select,
+.sheet-darker-rounded-box select option {
+    color: rgb(204, 217, 207);
+    background-color: #008b8b; 
+    border: 0;
+    border-radius: 6px;
+}
+.sheet-darker-rounded-box span {
+    margin: 1px 0px 0px 5px;
+}
+.sheet-darker-rounded-box elect {
+    margin: 1px 5px 0px 0px;
+}
+
 
 /* CHARACTER HEALTH */
 
@@ -1918,7 +1966,7 @@ input.sheet-xenohealth20:checked + label.sheet-xenohealth ~ .sheet-xenohealth {
     height: 14px;
     line-height: 14px;
     width: fit-content;
-    margin: 0px 1px;
+    margin: 4px -1px 0 0;
     padding: 2px 3px;
     background-color: transparent;
     border: 1px solid #008b8b;
@@ -1926,7 +1974,6 @@ input.sheet-xenohealth20:checked + label.sheet-xenohealth ~ .sheet-xenohealth {
     background-image: none;
     display: inline;
     text-shadow: none;
-    margin-top: 0;
     cursor: pointer;
 }
 .sheet-xeno .sheet-roll-buttons input[type="checkbox"].sheet-xenowhisper:checked + label.sheet-xenowhisper {
@@ -1936,6 +1983,7 @@ input.sheet-xenohealth20:checked + label.sheet-xenohealth ~ .sheet-xenohealth {
 .charsheet div.sheet-xeno div.sheet-roll-buttons button[type="roll"].sheet-button-alpha,
 .charsheet div.sheet-xeno div.sheet-roll-buttons button[type="roll"].sheet-button-beta {
     width: fit-content;
+    margin: 4px -1px;
 }
 .sheet-xeno .sheet-armor {
     display: grid;
@@ -2005,11 +2053,14 @@ input.sheet-xenohealth20:checked + label.sheet-xenohealth ~ .sheet-xenohealth {
     float: left; 
     width: 100%;
     height: 1.5em;
-    max-width: calc(100% - 12px);
-    min-width: calc(100% - 12px);
-    margin-right: 5px;
+    max-width: calc(100% - 72px);
+    min-width: calc(100% - 72px);
+    -margin-right: 5px;
     padding: 1px;
 }
+.sheet-button-copy {
+    float: left; 
+}
 
 
 /* WOOHOO BUTTONS */
@@ -2035,6 +2086,7 @@ button[type="roll"].sheet-button-alpha:before, button[type="roll"].sheet-button-
 
 
 label.sheet-button-skill,
+button.sheet-button-skill,
 button[type="roll"].sheet-button-skill {
     height: 14px;
     line-height: 14px;
@@ -2049,6 +2101,7 @@ button[type="roll"].sheet-button-skill {
 }
 
 label.sheet-button-skill:hover,
+button.sheet-button-skill:hover,
 button[type="roll"].sheet-button-skill:hover {
     color: rgb(204, 217, 207); /* Teal Varient */
     background-color: rgba(0, 139, 139, 1); /* Dark Cyan #008b8b */
@@ -2056,6 +2109,7 @@ button[type="roll"].sheet-button-skill:hover {
     text-shadow: none;
 }
 label.sheet-button-skill:active,
+button.sheet-button-skill:active,
 button[type="roll"].sheet-button-skill:active {
     color: rgb(204, 217, 207); /* Teal Varient */
     background-color: #008b8b; /* Dark Cyan #008b8b */
@@ -2074,7 +2128,10 @@ button[type="roll"].sheet-smaller-skill {
 }
 
 label.sheet-button-alpha, label.sheet-button-beta, label.sheet-button-gamma, 
-button[type="roll"].sheet-button-alpha, button[type="roll"].sheet-button-beta, button[type="roll"].sheet-button-gamma {
+button[type="roll"].sheet-button-alpha, 
+button[type="roll"].sheet-button-beta, 
+button[type="action"].sheet-button-gamma, 
+button[type="roll"].sheet-button-gamma {
     margin-top: 0px;
     margin-bottom: 0px;
     border: 1px solid #008b8b;
@@ -2086,6 +2143,7 @@ button[type="roll"].sheet-button-alpha {
    text-transform: lowercase;  /* Exception because common usage of 1d6 is more important than consistency with theme. */
 }
 label.sheet-button-skill:focus,
+button.sheet-button-skill:focus,
 button[type="roll"].sheet-button-skill:focus { 
     outline:0;
 }
@@ -2199,6 +2257,17 @@ button[type="roll"].sheet-attribute-button:active {
     grid-template-columns: 15.75% 15.75% 15.75% 15.75% 15.75% 15.75%;
 }
 
+.sheet-template-xeno .sheet-template-flex,
+.sheet-rolltemplate-alien .sheet-template-background .sheet-template-grid .sheet-template-flex {
+    width: 100%;
+    display: flex;
+    grid-gap: 3px;
+    background-color: transparent;
+    justify-content: center;
+    -justify-items: stretch;
+    -justify-self: stretch;
+}
+
 .sheet-template-xeno .sheet-template-grid-item,
 .sheet-rolltemplate-alien .sheet-template-grid-item {
     background-color: rgba(259, 259, 259, 0.05);
@@ -2210,6 +2279,26 @@ button[type="roll"].sheet-attribute-button:active {
     text-align: center;
 }
 
+.sheet-template-xeno .sheet-template-flex-item,
+.sheet-rolltemplate-alien .sheet-template-flex-item {
+    -display: flex;
+    width: 100%;
+    background-color: rgba(259, 259, 259, 0.05);
+    color: #ffffff;
+    border: none;
+    border-radius: 5px;
+    padding: 3px;
+    text-align: center;
+    justify-content: center;
+    -justify-items: stretch;
+    -justify-self: stretch;
+}
+
+.sheet-rolltemplate-alien .sheet-flex-column { 
+    display: flex; 
+    flex-direction: column; 
+}
+
 .sheet-template-xeno .sheet-template-die,
 .sheet-rolltemplate-alien .sheet-template-die {
     display: inline-block;
diff --git a/Alien Roleplaying Game/Alien-Roleplaying-Game.html b/Alien Roleplaying Game/Alien-Roleplaying-Game.html
index 92bd59785e..8eb965a043 100644
--- a/Alien Roleplaying Game/Alien-Roleplaying-Game.html	
+++ b/Alien Roleplaying Game/Alien-Roleplaying-Game.html	
@@ -12,7 +12,7 @@
         v4.00 Richard W: Added the Hostile tab for use with Xenos and such, including signature attacks, speed, and armor specific to xenos
 -->
 
-<input type="hidden" name="attr_sheetversion" value="4.03">
+<input type="hidden" name="attr_sheetversion" value="4.04">
 <input type="hidden" name="attr_version" value="0">
 <input type="hidden" name="attr_newchar" value="1">
 <input class="tab-sheet" type="hidden" name="attr_tab_sheet" value="Character">
@@ -21,6 +21,9 @@
 <input class="squareinput" type="checkbox" hidden name="attr_config_squareinput">
 <input class="spacebackground" type="checkbox" hidden name="attr_config_spacebackground">
 <input class="optionalspinners" type="checkbox" hidden name="attr_config_optionalspinners">
+<input class="" type="hidden" hidden name="attr_roll_command" value="">
+<input class="" type="hidden" hidden name="attr_roll_command_api" value="!alienr">
+
 
 <div class="background-wrap">
     <div class="grid-container contains-fourteen-columns">
@@ -1126,8 +1129,12 @@
         </div> <!-- END OF ROW 15 -->
     </div>
 
+
+
     <!-------------------------------------------------------------------------------- SHIP TAB ----------------------------------------------------------------------------------------------------->
 
+
+
     <div class="grid-container ship contains-fourteen-columns">
         <!-- START OF ROW 1-5 --> 
         <div class="grid-item span-one-thru-four span-modules clip-edges no-border">
@@ -1763,8 +1770,12 @@
 
     </div>
 
+
+
     <!----------------------------------------------------------------------------- XENO TAB --------------------------------------------------------------------------------------------------->
 
+
+
     <div class="grid-container xeno contains-eight-columns">
         <div class="span-row1 span-three-thru-six darkest-teal-header xeno-header xeno-header-name flex-self-center flex-content-center" -data-i18n="species-name">SPECIES</div>
         <div class="grid-item span-row1 span-three-thru-six flex-column clip-edges ship-attribute clip-edges xeno-header-attribute">            
@@ -1909,16 +1920,16 @@
 
         <div class="span-row3 span-five-thru-eight grid-item clip-edges no-border">
             <div class="black-floating-header-clipped no-border">
-                <span class="teal-header no-border" data-i18n="dice" >DICE</span>
+                <span class="teal-header no-border" data-i18n="roll-buttons-u" >ROLL BUTTONS</span>
             </div>
-            <div class="vertical-adjust-one">
+            <div>
                 <div class="roll-buttons">
                 <!-- <div class="cover-15 flex-column flex-self-right flex-self-align-start flex-content-center flex-wrap"> -->
                     <input type="checkbox" id="xenowhisper" class="button-skill button-beta xenowhisper" value="1" name="attr_secret_roll" hidden>
                     <label for="xenowhisper" class="button-skill button-beta xenowhisper">Secret</label>
-                    <span class="dotted-separator">&nbsp;</span>
+                    <!-- <span class="dotted-separator">&nbsp;</span> -->
                     <button type="roll" class="button-skill button-alpha" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 1d6 )* }} {{roll-dice=[[ 1d6 ]] }}" name="one_die_six" ><span data-i18n="1d6-u">1d6</span></button>
-                    <span class="dotted-separator">&nbsp;</span>
+                    <!-- <span class="dotted-separator">&nbsp;</span> -->
                     <button type="roll" class="button-skill button-beta" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Initiative: *Card Value* }} {{roll-dice=[[ ?{Card Number|0} &{tracker} ]] }}" name="initiative_card" data-i18n-title="initiative-card-desc" ><span data-i18n="initiative-card-u">Initiative: Card</span></button>
                     <button type="roll" class="button-skill button-beta" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Initiative: *Dice Roll* }} {{roll-dice=[[ @{config_initiativedice} &{tracker} ]] }}" name="initiative_dice" data-i18n-title="initiative-card-desc" ><span data-i18n="initiative-dice-u">Initiative: Dice</span></button>
                     </div>
@@ -1967,51 +1978,436 @@
                 <button type="action" name="act_expandattacks" class="dark-teal-header attack-control-label text-underline" title="Expand all" data-i18n-title="expand-all">Exp.</button>
                 &nbsp;<span class="dark-teal-header">/</span>&nbsp;
                 <button type="action" name="act_collapseattacks" class="dark-teal-header attack-control-label text-underline" title="Collapse all" data-i18n-title="collapse-all">Col.</button>             
-                <button type="roll" class="button-skill button-gamma span-four signatureattack" value="/w gm &{template:xeno} {{character-name=@{character_name} }} {{result=[[1d6]] }} {{result1name=@{xenoattack1_name} }} {{result1desc=@{xenoattack1_desc} }} {{result2name=@{xenoattack2_name} }} {{result2desc=@{xenoattack2_desc} }} {{result3name=@{xenoattack3_name} }} {{result3desc=@{xenoattack3_desc} }} {{result4name=@{xenoattack4_name} }} {{result4desc=@{xenoattack4_desc} }} {{result5name=@{xenoattack5_name} }} {{result5desc=@{xenoattack5_desc} }} {{result6name=@{xenoattack6_name} }} {{result6desc=@{xenoattack6_desc} }} " name="xenoattackroll" data-i18n="attack-u" data-i18n-title="signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Attack</button>
+                <button type="action" class="button-skill button-gamma span-four signatureattack" name="act_randomizeattack" data-i18n="random-attack-u" data-i18n-title="random-signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Random Attack</button>
             </div>
             <div class="align-right vertical-adjust-two-more flexlist xeno-attack xeno-textfield">
+
+                <!-- Signature attack 1 -->
                 <span class="dark-teal-header condition-title xeno-attack-number">1</span>
-                <input type="text" name="attr_xenoattack1_name" class="xeno-attack-input xeno-attack-name">
+                <span>
+                    <input type="text" name="attr_xenoattack1_name" class="xeno-attack-input xeno-attack-name">
+                    <button type="roll" class="button-skill button-gamma span-four signatureattack sheet-left sheet-w60" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{xenoattack1_name} }} {{roll-type=1}} {{current-comment=@{xenoattack1_desc} }} {{current-damage=@{xenoattack1_dmg} }} {{roll-dice-cmd=@{xenoattack1_dice} }} {{roll-dice=[[@{xenoattack1_dice}]] }} {{current-dice=@{xenoattack1_base} }} {{base-dice=[[@{xenoattack1_base}]] }} {{base-roll-one=[[1d6]] }} {{base-roll-two=[[1d6]] }} {{base-roll-three=[[1d6]] }} {{base-roll-four=[[1d6]] }} {{base-roll-five=[[1d6]] }}  {{base-roll-six=[[1d6]] }} {{base-roll-seven=[[1d6]] }} {{base-roll-eight=[[1d6]] }} {{base-roll-nine=[[1d6]] }} {{base-roll-ten=[[1d6]] }} {{base-roll-eleven=[[1d6]] }} {{base-roll-twelve=[[1d6]] }} {{base-roll-thirteen=[[1d6]] }} {{base-roll-fourteen=[[1d6]] }} {{base-roll-fifteen=[[1d6]] }} {{base-roll-sixteen=[[1d6]] }} {{base-roll-seventeen=[[1d6]] }} {{base-roll-eighteen=[[1d6]] }}" name="xenoattackroll1" data-i18n="attack-u" data-i18n-title="signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Attack</button>
+                </span>
+                
                 <input class="expand" name="attr_xenoattack1_check" type="checkbox" data-i18n-title="show-hide" title="show/hide" value="1" checked />
                 <span></span>
+
                 <span></span>
-                <textarea name="attr_xenoattack1_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield"></textarea>
+                <div class="sheet-expandable">
+                    <!-- <button type="action" class="button-skill button-gamma button-copy" data-i18n="copy" data-i18n-title="Copy the fields from the entry above.">Copy</button> -->
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="dice" title="Dice. This will make a separate roll with D6 that will be summed up." data-i18n-title="xeno-signature-dice">Dice</span>
+                        <select name="attr_xenoattack1_dice" class="sheet-select-input sheet-w50 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1d6">1d6</option>
+                            <option value="2d6">2d6</option>
+                            <option value="3d6">3d6</option>
+                            <option value="4d6">4d6</option>
+                            <option value="5d6">5d6</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="base" data-i18n-title="xeno-signature-base" title="Base dice. This will make a roll using base dice, and count the successes (6s or Crosshair icons)." >Base</span>
+                        <select name="attr_xenoattack1_base" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                            <option value="16">16</option>
+                            <option value="17">17</option>
+                            <option value="18">18</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="damage-u" data-i18n-title="xeno-signature-dmg" title="Base damage. This is the base damage of the attack. It may be increased by achieving stunts in the Base dice roll.">Damage</span>
+                        <select name="attr_xenoattack1_dmg" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                        </select>
+                    </div>                    
+                </div>
+                <span></span>
+                <span></span>
+
+                <span></span>
+                <textarea name="attr_xenoattack1_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield sheet-expandable"></textarea>
+                <span></span>
+
+                
                 <hr class="dotted-line span-one-thru-four">
+
+                <!-- Signature attack 2 -->
                 <span class="dark-teal-header condition-title xeno-attack-number">2</span>
-                <input type="text" name="attr_xenoattack2_name" class="xeno-attack-input xeno-attack-name">
+                <span>
+                    <input type="text" name="attr_xenoattack2_name" class="xeno-attack-input xeno-attack-name">
+                    <button type="roll" class="button-skill button-gamma span-four signatureattack sheet-left sheet-w60" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{xenoattack2_name} }} {{roll-type=2}} {{current-comment=@{xenoattack2_desc} }} {{current-damage=@{xenoattack2_dmg} }} {{roll-dice-cmd=@{xenoattack2_dice} }} {{roll-dice=[[@{xenoattack2_dice}]] }} {{current-dice=@{xenoattack2_base} }} {{base-dice=[[@{xenoattack2_base}]] }} {{base-roll-one=[[1d6]] }} {{base-roll-two=[[1d6]] }} {{base-roll-three=[[1d6]] }} {{base-roll-four=[[1d6]] }} {{base-roll-five=[[1d6]] }}  {{base-roll-six=[[1d6]] }} {{base-roll-seven=[[1d6]] }} {{base-roll-eight=[[1d6]] }} {{base-roll-nine=[[1d6]] }} {{base-roll-ten=[[1d6]] }} {{base-roll-eleven=[[1d6]] }} {{base-roll-twelve=[[1d6]] }} {{base-roll-thirteen=[[1d6]] }} {{base-roll-fourteen=[[1d6]] }} {{base-roll-fifteen=[[1d6]] }} {{base-roll-sixteen=[[1d6]] }} {{base-roll-seventeen=[[1d6]] }} {{base-roll-eighteen=[[1d6]] }}" name="xenoattackroll2" data-i18n="attack-u" data-i18n-title="signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Attack</button>
+                </span>
+                
                 <input class="expand" name="attr_xenoattack2_check" type="checkbox" data-i18n-title="show-hide" title="show/hide" value="1" checked />
                 <span></span>
+
                 <span></span>
-                <textarea name="attr_xenoattack2_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield"></textarea>
+                <div class="sheet-expandable">
+                    <button type="action" name="act_attackcopy1" class="button-skill button-gamma button-copy" data-i18n-title="Copy the fields from the entry above.">|</button>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="dice" title="Dice. This will make a separate roll with D6 that will be summed up." data-i18n-title="xeno-signature-dice">Dice</span>
+                        <select name="attr_xenoattack2_dice" class="sheet-select-input sheet-w50 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1d6">1d6</option>
+                            <option value="2d6">2d6</option>
+                            <option value="3d6">3d6</option>
+                            <option value="4d6">4d6</option>
+                            <option value="5d6">5d6</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="base" data-i18n-title="xeno-signature-base" title="Base dice. This will make a roll using base dice, and count the successes (6s or Crosshair icons)." >Base</span>
+                        <select name="attr_xenoattack2_base" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                            <option value="16">16</option>
+                            <option value="17">17</option>
+                            <option value="18">18</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="damage-u" data-i18n-title="xeno-signature-dmg" title="Base damage. This is the base damage of the attack. It may be increased by achieving stunts in the Base dice roll.">Damage</span>
+                        <select name="attr_xenoattack2_dmg" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                        </select>
+                    </div>  
+                </div>
+                <span></span>
+                <span></span>
+
+                <span></span>
+                <textarea name="attr_xenoattack2_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield sheet-expandable"></textarea>
+                <span></span>
+                
                 <hr class="dotted-line span-one-thru-four">
+                
+
+                <!-- Signature attack 3 -->
                 <span class="dark-teal-header condition-title xeno-attack-number">3</span>
-                <input type="text" name="attr_xenoattack3_name" class="xeno-attack-input xeno-attack-name">
+                <span>
+                    <input type="text" name="attr_xenoattack3_name" class="xeno-attack-input xeno-attack-name">
+                    <button type="roll" class="button-skill button-gamma span-four signatureattack sheet-left sheet-w60" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{xenoattack3_name} }} {{roll-type=3}} {{current-comment=@{xenoattack3_desc} }} {{current-damage=@{xenoattack3_dmg} }} {{roll-dice-cmd=@{xenoattack3_dice} }} {{roll-dice=[[@{xenoattack3_dice}]] }} {{current-dice=@{xenoattack3_base} }} {{base-dice=[[@{xenoattack3_base}]] }} {{base-roll-one=[[1d6]] }} {{base-roll-two=[[1d6]] }} {{base-roll-three=[[1d6]] }} {{base-roll-four=[[1d6]] }} {{base-roll-five=[[1d6]] }}  {{base-roll-six=[[1d6]] }} {{base-roll-seven=[[1d6]] }} {{base-roll-eight=[[1d6]] }} {{base-roll-nine=[[1d6]] }} {{base-roll-ten=[[1d6]] }} {{base-roll-eleven=[[1d6]] }} {{base-roll-twelve=[[1d6]] }} {{base-roll-thirteen=[[1d6]] }} {{base-roll-fourteen=[[1d6]] }} {{base-roll-fifteen=[[1d6]] }} {{base-roll-sixteen=[[1d6]] }} {{base-roll-seventeen=[[1d6]] }} {{base-roll-eighteen=[[1d6]] }}" name="xenoattackroll3" data-i18n="attack-u" data-i18n-title="signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Attack</button>
+                </span>
+                
                 <input class="expand" name="attr_xenoattack3_check" type="checkbox" data-i18n-title="show-hide" title="show/hide" value="1" checked />
                 <span></span>
+
                 <span></span>
-                <textarea name="attr_xenoattack3_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield"></textarea>
+                <div class="sheet-expandable">
+                    <button type="action" name="act_attackcopy2" class="button-skill button-gamma button-copy" data-i18n-title="Copy the fields from the entry above.">|</button>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="dice" title="Dice. This will make a separate roll with D6 that will be summed up." data-i18n-title="xeno-signature-dice">Dice</span>
+                        <select name="attr_xenoattack3_dice" class="sheet-select-input sheet-w50 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1d6">1d6</option>
+                            <option value="2d6">2d6</option>
+                            <option value="3d6">3d6</option>
+                            <option value="4d6">4d6</option>
+                            <option value="5d6">5d6</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="base" data-i18n-title="xeno-signature-base" title="Base dice. This will make a roll using base dice, and count the successes (6s or Crosshair icons)." >Base</span>
+                        <select name="attr_xenoattack3_base" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                            <option value="16">16</option>
+                            <option value="17">17</option>
+                            <option value="18">18</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="damage-u" data-i18n-title="xeno-signature-dmg" title="Base damage. This is the base damage of the attack. It may be increased by achieving stunts in the Base dice roll.">Damage</span>
+                        <select name="attr_xenoattack3_dmg" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                        </select>
+                    </div>  
+                </div>
+                <span></span>
+                <span></span>
+                
+                <span></span>
+                <textarea name="attr_xenoattack3_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield sheet-expandable"></textarea>
+                <span></span>
+                
                 <hr class="dotted-line span-one-thru-four">
+
+                
+                <!-- Signature attack 4 -->
                 <span class="dark-teal-header condition-title xeno-attack-number">4</span>
-                <input type="text" name="attr_xenoattack4_name" class="xeno-attack-input xeno-attack-name">
+                <span>
+                    <input type="text" name="attr_xenoattack4_name" class="xeno-attack-input xeno-attack-name">
+                    <button type="roll" class="button-skill button-gamma span-four signatureattack sheet-left sheet-w60" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{xenoattack4_name} }} {{roll-type=4}} {{current-comment=@{xenoattack4_desc} }} {{current-damage=@{xenoattack4_dmg} }} {{roll-dice-cmd=@{xenoattack4_dice} }} {{roll-dice=[[@{xenoattack4_dice}]] }} {{current-dice=@{xenoattack4_base} }} {{base-dice=[[@{xenoattack4_base}]] }} {{base-roll-one=[[1d6]] }} {{base-roll-two=[[1d6]] }} {{base-roll-three=[[1d6]] }} {{base-roll-four=[[1d6]] }} {{base-roll-five=[[1d6]] }}  {{base-roll-six=[[1d6]] }} {{base-roll-seven=[[1d6]] }} {{base-roll-eight=[[1d6]] }} {{base-roll-nine=[[1d6]] }} {{base-roll-ten=[[1d6]] }} {{base-roll-eleven=[[1d6]] }} {{base-roll-twelve=[[1d6]] }} {{base-roll-thirteen=[[1d6]] }} {{base-roll-fourteen=[[1d6]] }} {{base-roll-fifteen=[[1d6]] }} {{base-roll-sixteen=[[1d6]] }} {{base-roll-seventeen=[[1d6]] }} {{base-roll-eighteen=[[1d6]] }}" name="xenoattackroll4" data-i18n="attack-u" data-i18n-title="signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Attack</button>
+                </span>
+                
                 <input class="expand" name="attr_xenoattack4_check" type="checkbox" data-i18n-title="show-hide" title="show/hide" value="1" checked />
                 <span></span>
+
                 <span></span>
-                <textarea name="attr_xenoattack4_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield"></textarea>
+                <div class="sheet-expandable">
+                    <button type="action" name="act_attackcopy3" class="button-skill button-gamma button-copy" data-i18n-title="Copy the fields from the entry above.">|</button>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="dice" title="Dice. This will make a separate roll with D6 that will be summed up." data-i18n-title="xeno-signature-dice">Dice</span>
+                        <select name="attr_xenoattack4_dice" class="sheet-select-input sheet-w50 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1d6">1d6</option>
+                            <option value="2d6">2d6</option>
+                            <option value="3d6">3d6</option>
+                            <option value="4d6">4d6</option>
+                            <option value="5d6">5d6</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="base" data-i18n-title="xeno-signature-base" title="Base dice. This will make a roll using base dice, and count the successes (6s or Crosshair icons)." >Base</span>
+                        <select name="attr_xenoattack4_base" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                            <option value="16">16</option>
+                            <option value="17">17</option>
+                            <option value="18">18</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="damage-u" data-i18n-title="xeno-signature-dmg" title="Base damage. This is the base damage of the attack. It may be increased by achieving stunts in the Base dice roll.">Damage</span>
+                        <select name="attr_xenoattack4_dmg" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                        </select>
+                    </div>  
+                </div>
+                <span></span>
+                <span></span>
+
+                <span></span>
+                <textarea name="attr_xenoattack4_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield sheet-expandable"></textarea>
+                <span></span>
+                
                 <hr class="dotted-line span-one-thru-four">
+
+                
+                <!-- Signature attack 5 -->
                 <span class="dark-teal-header condition-title xeno-attack-number">5</span>
-                <input type="text" name="attr_xenoattack5_name" class="xeno-attack-input xeno-attack-name">
+                <span>
+                    <input type="text" name="attr_xenoattack5_name" class="xeno-attack-input xeno-attack-name">
+                    <button type="roll" class="button-skill button-gamma span-four signatureattack sheet-left sheet-w60" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{xenoattack5_name} }} {{roll-type=5}} {{current-comment=@{xenoattack5_desc} }} {{current-damage=@{xenoattack5_dmg} }} {{roll-dice-cmd=@{xenoattack5_dice} }} {{roll-dice=[[@{xenoattack5_dice}]] }} {{current-dice=@{xenoattack5_base} }} {{base-dice=[[@{xenoattack5_base}]] }} {{base-roll-one=[[1d6]] }} {{base-roll-two=[[1d6]] }} {{base-roll-three=[[1d6]] }} {{base-roll-four=[[1d6]] }} {{base-roll-five=[[1d6]] }}  {{base-roll-six=[[1d6]] }} {{base-roll-seven=[[1d6]] }} {{base-roll-eight=[[1d6]] }} {{base-roll-nine=[[1d6]] }} {{base-roll-ten=[[1d6]] }} {{base-roll-eleven=[[1d6]] }} {{base-roll-twelve=[[1d6]] }} {{base-roll-thirteen=[[1d6]] }} {{base-roll-fourteen=[[1d6]] }} {{base-roll-fifteen=[[1d6]] }} {{base-roll-sixteen=[[1d6]] }} {{base-roll-seventeen=[[1d6]] }} {{base-roll-eighteen=[[1d6]] }}" name="xenoattackroll5" data-i18n="attack-u" data-i18n-title="signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Attack</button>
+                </span>
+                
                 <input class="expand" name="attr_xenoattack5_check" type="checkbox" data-i18n-title="show-hide" title="show/hide" value="1" checked />
                 <span></span>
+
                 <span></span>
-                <textarea name="attr_xenoattack5_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield"></textarea>
+                <div class="sheet-expandable">
+                    <button type="action" name="act_attackcopy4" class="button-skill button-gamma button-copy" data-i18n-title="Copy the fields from the entry above.">|</button>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="dice" title="Dice. This will make a separate roll with D6 that will be summed up." data-i18n-title="xeno-signature-dice">Dice</span>
+                        <select name="attr_xenoattack5_dice" class="sheet-select-input sheet-w50 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1d6">1d6</option>
+                            <option value="2d6">2d6</option>
+                            <option value="3d6">3d6</option>
+                            <option value="4d6">4d6</option>
+                            <option value="5d6">5d6</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="base" data-i18n-title="xeno-signature-base" title="Base dice. This will make a roll using base dice, and count the successes (6s or Crosshair icons)." >Base</span>
+                        <select name="attr_xenoattack5_base" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                            <option value="16">16</option>
+                            <option value="17">17</option>
+                            <option value="18">18</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="damage-u" data-i18n-title="xeno-signature-dmg" title="Base damage. This is the base damage of the attack. It may be increased by achieving stunts in the Base dice roll.">Damage</span>
+                        <select name="attr_xenoattack5_dmg" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                        </select>
+                    </div>  
+                </div>
+                <span></span>
+                <span></span>
+                
+                <span></span>
+                <textarea name="attr_xenoattack5_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield sheet-expandable"></textarea>
+                <span></span>
+                
                 <hr class="dotted-line span-one-thru-four">
+
+
+                <!-- Signature attack 6 -->
                 <span class="dark-teal-header condition-title xeno-attack-number">6</span>
-                <input type="text" name="attr_xenoattack6_name" class="xeno-attack-input xeno-attack-name">
+                <span>
+                    <input type="text" name="attr_xenoattack6_name" class="xeno-attack-input xeno-attack-name">
+                    <button type="roll" class="button-skill button-gamma span-four signatureattack sheet-left sheet-w60" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{xenoattack6_name} }} {{roll-type=6}} {{current-comment=@{xenoattack6_desc} }} {{current-damage=@{xenoattack6_dmg} }} {{roll-dice-cmd=@{xenoattack6_dice} }} {{roll-dice=[[@{xenoattack6_dice}]] }} {{current-dice=@{xenoattack6_base} }} {{base-dice=[[@{xenoattack6_base}]] }} {{base-roll-one=[[1d6]] }} {{base-roll-two=[[1d6]] }} {{base-roll-three=[[1d6]] }} {{base-roll-four=[[1d6]] }} {{base-roll-five=[[1d6]] }}  {{base-roll-six=[[1d6]] }} {{base-roll-seven=[[1d6]] }} {{base-roll-eight=[[1d6]] }} {{base-roll-nine=[[1d6]] }} {{base-roll-ten=[[1d6]] }} {{base-roll-eleven=[[1d6]] }} {{base-roll-twelve=[[1d6]] }} {{base-roll-thirteen=[[1d6]] }} {{base-roll-fourteen=[[1d6]] }} {{base-roll-fifteen=[[1d6]] }} {{base-roll-sixteen=[[1d6]] }} {{base-roll-seventeen=[[1d6]] }} {{base-roll-eighteen=[[1d6]] }}" name="xenoattackroll6" data-i18n="attack-u" data-i18n-title="signature-attack-desc" title="Signature attacks are always whispered to the GM, to be played out in combat.">Attack</button>
+                </span>
+                
                 <input class="expand" name="attr_xenoattack6_check" type="checkbox" data-i18n-title="show-hide" title="show/hide" value="1" checked />
                 <span></span>
+
                 <span></span>
-                <textarea name="attr_xenoattack6_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield"></textarea>
+                <div class="sheet-expandable">
+                    <button type="action" name="act_attackcopy5" class="button-skill button-gamma button-copy" data-i18n-title="Copy the fields from the entry above.">|</button>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="dice" title="Dice. This will make a separate roll with D6 that will be summed up." data-i18n-title="xeno-signature-dice">Dice</span>
+                        <select name="attr_xenoattack6_dice" class="sheet-select-input sheet-w50 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1d6">1d6</option>
+                            <option value="2d6">2d6</option>
+                            <option value="3d6">3d6</option>
+                            <option value="4d6">4d6</option>
+                            <option value="5d6">5d6</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="base" data-i18n-title="xeno-signature-base" title="Base dice. This will make a roll using base dice, and count the successes (6s or Crosshair icons)." >Base</span>
+                        <select name="attr_xenoattack6_base" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                            <option value="7">7</option>
+                            <option value="8">8</option>
+                            <option value="9">9</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                            <option value="16">16</option>
+                            <option value="17">17</option>
+                            <option value="18">18</option>
+                        </select>
+                    </div>
+                    <div class="darker-rounded-box">
+                        <span class="sheet-left" data-i18n="damage-u" data-i18n-title="xeno-signature-dmg" title="Base damage. This is the base damage of the attack. It may be increased by achieving stunts in the Base dice roll.">Damage</span>
+                        <select name="attr_xenoattack6_dmg" class="sheet-select-input sheet-w40 sheet-left">
+                            <option value="0" selected default>0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                            <option value="6">6</option>
+                        </select>
+                    </div>  
+                </div>
+                <span></span>
+                <span></span>
+                
+                <span></span>
+                <textarea name="attr_xenoattack6_desc" class="xeno-attack-input xeno-attack-desc span-two-three xeno-textfield sheet-expandable"></textarea>
+                <span></span>
+                
                 <hr class="dotted-line span-one-thru-four">
+
+               
             </div>
         </div> 
 
@@ -2145,6 +2541,25 @@
                 </div> 
             </div>
              -->
+            <div class="grid-item-black span-one-thru-six cover-100-flex flex-content-right">
+                <div class="grid-item clip-edges w120 h-fit marg-right">
+                    <span class="centered bold">v4.04 <br/>(2022-05-04)</span>
+                </div>  
+                <div class="cover-75 flex-content-right flex-column">               
+                    <div class="grid-item clip-edges align-left marg-right pad-left pad-right">
+                        <span class="text-input cover-100 align-left" title="">Fixed roll commands error caused by attribute for handling secret rolls not being initiatilised. </span>
+                    </div>                                                       
+                    <div class="grid-item clip-edges align-left marg-right pad-left pad-right shift-down-5">
+                        <span class="text-input cover-100 align-left" title="">Added a randomzier button, individual roll buttons and additional options for Hostile's Signature attacks. The options include D6 dice, Base attack dice and Base damage. </span>
+                    </div>                                                        
+                    <div class="grid-item clip-edges align-left marg-right pad-left pad-right shift-down-5">
+                        <span class="text-input cover-100 align-left" title="">Added a "Copy above" button, [ <span style="font-family: 'Pictos';">|</span> ] , in Signature attacks to make it easier to configure same outcome on a second roll result, e.g. "The hostile will attack with 6 dice on roll 1-2", can be achieved by using the Copy button on Signature attack 2.  </span>
+                    </div>                                                         
+                    <div class="grid-item clip-edges align-left marg-right pad-left pad-right shift-down-5">
+                        <span class="text-input cover-100 align-left" title="">Renamed Damage to Base Damage in Rolltemplate, and moved the roll information Bonus, Base damage and Range to above the dice output. This hopefully makes it clearer what is the static information for the roll and the resulting output, i.e. Successes and Panic. </span>
+                    </div>                                           
+                </div> 
+            </div>
              <div class="grid-item-black span-one-thru-six cover-100-flex flex-content-right">
                 <div class="grid-item clip-edges w120 h-fit marg-right">
                     <span class="centered bold">v4.03 <br/>(2022-04-05)</span>
@@ -2363,11 +2778,13 @@
                 </div>
                 
                 {{#roll-dice}}
-                <div class="template-grid-item template-span-six template-to-the-center">
-                    <div class="template-yellow">
-                        {{roll-dice}}
+                    {{#rollGreater() roll-dice 0}}
+                    <div class="template-grid-item template-span-six template-to-the-center">
+                        <div class="template-yellow">
+                            {{roll-dice}}
+                        </div>
                     </div>
-                </div>
+                    {{/ rollGreater() roll-dice 0}}
                 {{/roll-dice}}
                 
                 <!-- PANIC ROLL -->
@@ -2427,432 +2844,530 @@
                     CATATONIC. You collapse to the floor and can’t talk or move, staring blankly into oblivion.
                 </div>
                 {{/rollGreater() panic-roll 14}}
+
+                <!-- ROLL INFO -->
+
+                <div class="template-flex template-span-six ">
+                    {{#current-bonus}}
+                        <!-- {{#rollGreater() current-bonus 0}} -->
+                        <div class="template-flex-item">
+                        {{#current-damage}}{{#current-range}}<div class="flex-column">{{/current-range}}{{/current-damage}}
+                            <span data-i18n="template-bonus">Bonus:&nbsp; </span> <span data-i18n-title="bonus-desc" title="Bonus dice"> {{current-bonus}} </span>
+                        {{#current-damage}}{{#current-range}}</div>{{/current-range}}{{/current-damage}}
+                        </div>
+                        <!-- {{/rollGreater() current-bonus 0}} -->
+                    {{/current-bonus}}
+                    {{#current-dice}}
+                        <!-- {{#rollGreater() current-dice 0}} -->
+                        <div class="template-flex-item">
+                            {{#current-damage}}{{#current-range}}<div class="flex-column">{{/current-range}}{{/current-damage}}
+                            <span data-i18n="template-dice">Dice:&nbsp;  </span> <span data-i18n-title="bonus-desc" title="Bonus dice"> {{current-dice}} </span>
+                            {{#current-damage}}{{#current-range}}</div>{{/current-range}}{{/current-damage}}
+                        </div>
+                        <!-- {{/rollGreater() current-dice 0}} -->
+                    {{/current-dice}}
+                    {{#current-damage}}
+                        <!-- {{#rollGreater() current-damage 0}} -->
+                        <div class="template-flex-item">
+                            {{#current-bonus}}{{#current-range}}<div class="flex-column">{{/current-range}}{{/current-bonus}}
+                            {{#current-dice}}{{#current-range}}<div class="flex-column">{{/current-range}}{{/current-dice}}
+                            <span data-i18n="template-base-damage" data-i18n-title="base-damage-desc" title="Base damage">Base dmg:&nbsp; </span> <span data-i18n-title="base-damage-desc" title="Base damage"> {{current-damage}} </span>
+                            {{#current-bonus}}{{#current-range}}</div>{{/current-range}}{{/current-bonus}}
+                            {{#current-dice}}{{#current-range}}</div>{{/current-range}}{{/current-dice}}
+                        </div>
+                        <!-- {{/rollGreater() current-damage 0}} -->
+                    {{/current-damage}}
+                    {{#current-range}}
+                        <div class="template-flex-item">{{current-range}} {{#current-bonus}}{{#current-damage}}<br />{{/current-damage}}{{/current-bonus}} range</div>
+                    {{/current-range}}
+                </div>
+            
                 
                 <!-- Begin Testing New Roll Template Logic-->
-                
                 <div  class="template-grid-item template-grid template-span-six temaplate-transparent-bg">
-                {{#rollGreater() base-dice 0}} <!-- BASE DIE ONE -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-one 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-one 1 5}}
-                    {{#rollWasCrit() base-roll-one}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-one}}
-                </div>
-                {{/rollGreater() base-dice 0}}
-                
-                {{#rollGreater() base-dice 1}} <!-- BASE DIE TWO -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-two 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-two 1 5}}
-                    {{#rollWasCrit() base-roll-two}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-two}}
-                </div>
-                {{/rollGreater() base-dice 1}}
-                
-                {{#rollGreater() base-dice 2}} <!-- BASE DIE THREE -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-three 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-three 1 5}}
-                    {{#rollWasCrit() base-roll-three}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-three}}
-                </div>
-                {{/rollGreater() base-dice 2}}
-                
-                {{#rollGreater() base-dice 3}} <!-- BASE DIE FOUR -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-four 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-four 1 5}}
-                    {{#rollWasCrit() base-roll-four}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-four}}
-                </div>
-                {{/rollGreater() base-dice 3}}
-                
-                {{#rollGreater() base-dice 4}} <!-- BASE DIE FIVE -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-five 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-five 1 5}}
-                    {{#rollWasCrit() base-roll-five}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-five}}
-                </div>
-                {{/rollGreater() base-dice 4}}
-                
-                {{#rollGreater() base-dice 5}} <!-- BASE DIE SIX -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-six 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-six 1 5}}
-                    {{#rollWasCrit() base-roll-six}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-six}}
-                </div>
-                {{/rollGreater() base-dice 5}}
-                
-                {{#rollGreater() base-dice 6}} <!-- BASE DIE SEVEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-seven 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-seven 1 5}}
-                    {{#rollWasCrit() base-roll-seven}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-seven}}
-                </div>
-                {{/rollGreater() base-dice 6}}
-                
-                {{#rollGreater() base-dice 7}} <!-- BASE DIE EIGHT -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-eight 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-eight 1 5}}
-                    {{#rollWasCrit() base-roll-eight}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-eight}}
-                </div>
-                {{/rollGreater() base-dice 7}}
-                
-                {{#rollGreater() base-dice 8}} <!-- BASE DIE NINE -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-nine 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-nine 1 5}}
-                    {{#rollWasCrit() base-roll-nine}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-nine}}
-                </div>
-                {{/rollGreater() base-dice 8}}
-                
-                {{#rollGreater() base-dice 9}} <!-- BASE DIE TEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-ten 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-ten 1 5}}
-                    {{#rollWasCrit() base-roll-ten}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-ten}}
-                </div>
-                {{/rollGreater() base-dice 9}}
-                
-                {{#rollGreater() base-dice 10}} <!-- BASE DIE ELEVEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-eleven 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-eleven 1 5}}
-                    {{#rollWasCrit() base-roll-eleven}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-eleven}}
-                </div>
-                {{/rollGreater() base-dice 10}}
-                
-                {{#rollGreater() base-dice 11}} <!-- BASE DIE TWELVE -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-twelve 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-twelve 1 5}}
-                    {{#rollWasCrit() base-roll-twelve}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-twelve}}
-                </div>
-                {{/rollGreater() base-dice 11}}
-                
-                {{#rollGreater() base-dice 12}} <!-- BASE DIE THIRTEEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-thirteen 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-thirteen 1 5}}
-                    {{#rollWasCrit() base-roll-thirteen}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-thirteen}}
-                </div>
-                {{/rollGreater() base-dice 12}}
-                
-                {{#rollGreater() base-dice 13}} <!-- BASE DIE FOURTEEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-fourteen 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-fourteen 1 5}}
-                    {{#rollWasCrit() base-roll-fourteen}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-fourteen}}
-                </div>
-                {{/rollGreater() base-dice 13}}
-                
-                {{#rollGreater() base-dice 14}} <!-- BASE DIE FIFTEEN -->
-                <div class="template-die ">
-                    {{#rollBetween() base-roll-fifteen 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-fifteen 1 5}}
-                    {{#rollWasCrit() base-roll-fifteen}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-fifteen}}
-                </div>
-                {{/rollGreater() base-dice 14}}
-                
-                {{#rollGreater() base-dice 15}} <!-- BASE DIE SIXTEEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-sixteen 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-sixteen 1 5}}
-                    {{#rollWasCrit() base-roll-sixteen}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-sixteen}}
-                </div>
-                {{/rollGreater() base-dice 15}}
-                
-                {{#rollGreater() base-dice 16}} <!-- BASE DIE SEVENTEEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-seventeen 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-seventeen 1 5}}
-                    {{#rollWasCrit() base-roll-seventeen}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-seventeen}}
-                </div>
-                {{/rollGreater() base-dice 16}}
-                
-                {{#rollGreater() base-dice 17}} <!-- BASE DIE EIGHTEEN -->
-                <div class="template-die">
-                    {{#rollBetween() base-roll-eighteen 1 5}}
-                        <div class="template-base-between"></div>
-                    {{/rollBetween() base-roll-eighteen 1 5}}
-                    {{#rollWasCrit() base-roll-eighteen}}
-                        <div class="template-base-success hit"></div>
-                    {{/rollWasCrit() base-roll-eighteen}}
-                </div>
-                {{/rollGreater() base-dice 17}}
-                
-                {{#rollGreater() stress-dice 0}} <!-- STRESS DIE ONE -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-one}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-one}}
-                    {{#rollBetween() stress-roll-one 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-one 2 5}}
-                    {{#rollWasCrit() stress-roll-one}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-one}}
-                </div>
-                {{/rollGreater() stress-dice 0}}
-                
-                {{#rollGreater() stress-dice 1}} <!-- STRESS DIE TWO -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-two}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-two}}
-                    {{#rollBetween() stress-roll-two 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-two 2 5}}
-                    {{#rollWasCrit() stress-roll-two}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-two}}
-                </div>
-                {{/rollGreater() stress-dice 1}}
-                
-                {{#rollGreater() stress-dice 2}} <!-- STRESS DIE THREE -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-three}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-three}}
-                    {{#rollBetween() stress-roll-three 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-three 2 5}}
-                    {{#rollWasCrit() stress-roll-three}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-three}}
-                </div>
-                {{/rollGreater() stress-dice 2}}
-                
-                {{#rollGreater() stress-dice 3}} <!-- STRESS DIE FOUR -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-four}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-four}}
-                    {{#rollBetween() stress-roll-four 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-four 2 5}}
-                    {{#rollWasCrit() stress-roll-four}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-four}}
-                </div>
-                {{/rollGreater() stress-dice 3}}
-                
-                {{#rollGreater() stress-dice 4}} <!-- STRESS DIE FIVE -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-five}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-five}}
-                    {{#rollBetween() stress-roll-five 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-five 2 5}}
-                    {{#rollWasCrit() stress-roll-five}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-five}}
-                </div>
-                {{/rollGreater() stress-dice 4}}
-                
-                {{#rollGreater() stress-dice 5}} <!-- STRESS DIE SIX -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-six}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-six}}
-                    {{#rollBetween() stress-roll-six 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-six 2 5}}
-                    {{#rollWasCrit() stress-roll-six}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-six}}
-                </div>
-                {{/rollGreater() stress-dice 5}}
-                
-                {{#rollGreater() stress-dice 6}} <!-- STRESS DIE SEVEN -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-seven}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-seven}}
-                    {{#rollBetween() stress-roll-seven 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-seven 2 5}}
-                    {{#rollWasCrit() stress-roll-seven}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-seven}}
-                </div>
-                {{/rollGreater() stress-dice 6}}
-                
-                {{#rollGreater() stress-dice 7}} <!-- STRESS DIE EIGHT -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-eight}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-eight}}
-                    {{#rollBetween() stress-roll-eight 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-eight 2 5}}
-                    {{#rollWasCrit() stress-roll-eight}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-eight}}
-                </div>
-                {{/rollGreater() stress-dice 7}}
-                
-                {{#rollGreater() stress-dice 8}} <!-- STRESS DIE NINE -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-nine}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-nine}}
-                    {{#rollBetween() stress-roll-nine 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-nine 2 5}}
-                    {{#rollWasCrit() stress-roll-nine}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-nine}}
-                </div>
-                {{/rollGreater() stress-dice 8}}
-                
-                {{#rollGreater() stress-dice 9}} <!-- STRESS DIE TEN -->
-                <div class="template-die">
-                    {{#rollWasFumble() stress-roll-ten}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() stress-roll-ten}}
-                    {{#rollBetween() stress-roll-ten 2 5}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() stress-roll-ten 2 5}}
-                    {{#rollWasCrit() stress-roll-ten}}
-                        <div class="template-stress-success hit"></div>
-                    {{/rollWasCrit() stress-roll-ten}}
-                </div>
-                {{/rollGreater() stress-dice 9}}
-                
-                {{#rollGreater() supply-dice 0}} <!-- SUPPLY DIE ONE -->
-                <div class="template-die template-span-one">
-                    {{#rollWasFumble() supply-roll-one}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() supply-roll-one}}
-                    {{#rollBetween() supply-roll-one 2 6}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() supply-roll-one 2 6}}
-                </div>
-                {{/rollGreater() supply-dice 0}}
-                
-                {{#rollGreater() supply-dice 1}} <!-- SUPPLY DIE TWO -->
-                <div class="template-die">
-                    {{#rollWasFumble() supply-roll-two}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() supply-roll-two}}
-                    {{#rollBetween() supply-roll-two 2 6}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() supply-roll-two 2 6}}
-                </div>
-                {{/rollGreater() supply-dice 1}}
-                
-                {{#rollGreater() supply-dice 2}} <!-- SUPPLY DIE THREE -->
-                <div class="template-die">
-                    {{#rollWasFumble() supply-roll-three}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() supply-roll-three}}
-                    {{#rollBetween() supply-roll-three 2 6}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() supply-roll-three 2 6}}
-                </div>
-                {{/rollGreater() supply-dice 2}}
-                
-                {{#rollGreater() supply-dice 3}} <!-- SUPPLY DIE FOUR -->
-                <div class="template-die">
-                    {{#rollWasFumble() supply-roll-four}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() supply-roll-four}}
-                    {{#rollBetween() supply-roll-four 2 6}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() supply-roll-four 2 6}}
-                </div>
-                {{/rollGreater() supply-dice 3}}
-                
-                {{#rollGreater() supply-dice 4}} <!-- SUPPLY DIE FIVE -->
-                <div class="template-die">
-                    {{#rollWasFumble() supply-roll-five}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() supply-roll-five}}
-                    {{#rollBetween() supply-roll-five 2 6}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() supply-roll-five 2 6}}
-                </div>
-                {{/rollGreater() supply-dice 4}}
-                
-                {{#rollGreater() supply-dice 5}} <!-- SUPPLY DIE SIX -->
-                <div class="template-die">
-                    {{#rollWasFumble() supply-roll-six}}
-                        <div class="template-stress-fail stress"></div>
-                    {{/rollWasFumble() supply-roll-six}}
-                    {{#rollBetween() supply-roll-six 2 6}}
-                        <div class="template-stress-between"></div>
-                    {{/rollBetween() supply-roll-six 2 6}}
-                </div>
-                {{/rollGreater() supply-dice 5}}
-                <!-- End Testing New Roll Template Logic-->
+                    {{#rollGreater() base-dice 0}} <!-- BASE DIE ONE -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-one 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-one 1 5}}
+                        {{#rollWasCrit() base-roll-one}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-one}}
+                    </div>
+                    {{/rollGreater() base-dice 0}}
+                    
+                    {{#rollGreater() base-dice 1}} <!-- BASE DIE TWO -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-two 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-two 1 5}}
+                        {{#rollWasCrit() base-roll-two}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-two}}
+                    </div>
+                    {{/rollGreater() base-dice 1}}
+                    
+                    {{#rollGreater() base-dice 2}} <!-- BASE DIE THREE -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-three 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-three 1 5}}
+                        {{#rollWasCrit() base-roll-three}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-three}}
+                    </div>
+                    {{/rollGreater() base-dice 2}}
+                    
+                    {{#rollGreater() base-dice 3}} <!-- BASE DIE FOUR -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-four 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-four 1 5}}
+                        {{#rollWasCrit() base-roll-four}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-four}}
+                    </div>
+                    {{/rollGreater() base-dice 3}}
+                    
+                    {{#rollGreater() base-dice 4}} <!-- BASE DIE FIVE -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-five 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-five 1 5}}
+                        {{#rollWasCrit() base-roll-five}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-five}}
+                    </div>
+                    {{/rollGreater() base-dice 4}}
+                    
+                    {{#rollGreater() base-dice 5}} <!-- BASE DIE SIX -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-six 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-six 1 5}}
+                        {{#rollWasCrit() base-roll-six}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-six}}
+                    </div>
+                    {{/rollGreater() base-dice 5}}
+                    
+                    {{#rollGreater() base-dice 6}} <!-- BASE DIE SEVEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-seven 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-seven 1 5}}
+                        {{#rollWasCrit() base-roll-seven}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-seven}}
+                    </div>
+                    {{/rollGreater() base-dice 6}}
+                    
+                    {{#rollGreater() base-dice 7}} <!-- BASE DIE EIGHT -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-eight 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-eight 1 5}}
+                        {{#rollWasCrit() base-roll-eight}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-eight}}
+                    </div>
+                    {{/rollGreater() base-dice 7}}
+                    
+                    {{#rollGreater() base-dice 8}} <!-- BASE DIE NINE -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-nine 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-nine 1 5}}
+                        {{#rollWasCrit() base-roll-nine}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-nine}}
+                    </div>
+                    {{/rollGreater() base-dice 8}}
+                    
+                    {{#rollGreater() base-dice 9}} <!-- BASE DIE TEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-ten 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-ten 1 5}}
+                        {{#rollWasCrit() base-roll-ten}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-ten}}
+                    </div>
+                    {{/rollGreater() base-dice 9}}
+                    
+                    {{#rollGreater() base-dice 10}} <!-- BASE DIE ELEVEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-eleven 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-eleven 1 5}}
+                        {{#rollWasCrit() base-roll-eleven}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-eleven}}
+                    </div>
+                    {{/rollGreater() base-dice 10}}
+                    
+                    {{#rollGreater() base-dice 11}} <!-- BASE DIE TWELVE -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-twelve 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-twelve 1 5}}
+                        {{#rollWasCrit() base-roll-twelve}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-twelve}}
+                    </div>
+                    {{/rollGreater() base-dice 11}}
+                    
+                    {{#rollGreater() base-dice 12}} <!-- BASE DIE THIRTEEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-thirteen 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-thirteen 1 5}}
+                        {{#rollWasCrit() base-roll-thirteen}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-thirteen}}
+                    </div>
+                    {{/rollGreater() base-dice 12}}
+                    
+                    {{#rollGreater() base-dice 13}} <!-- BASE DIE FOURTEEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-fourteen 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-fourteen 1 5}}
+                        {{#rollWasCrit() base-roll-fourteen}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-fourteen}}
+                    </div>
+                    {{/rollGreater() base-dice 13}}
+                    
+                    {{#rollGreater() base-dice 14}} <!-- BASE DIE FIFTEEN -->
+                    <div class="template-die ">
+                        {{#rollBetween() base-roll-fifteen 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-fifteen 1 5}}
+                        {{#rollWasCrit() base-roll-fifteen}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-fifteen}}
+                    </div>
+                    {{/rollGreater() base-dice 14}}
+                    
+                    {{#rollGreater() base-dice 15}} <!-- BASE DIE SIXTEEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-sixteen 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-sixteen 1 5}}
+                        {{#rollWasCrit() base-roll-sixteen}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-sixteen}}
+                    </div>
+                    {{/rollGreater() base-dice 15}}
+                    
+                    {{#rollGreater() base-dice 16}} <!-- BASE DIE SEVENTEEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-seventeen 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-seventeen 1 5}}
+                        {{#rollWasCrit() base-roll-seventeen}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-seventeen}}
+                    </div>
+                    {{/rollGreater() base-dice 16}}
+                    
+                    {{#rollGreater() base-dice 17}} <!-- BASE DIE EIGHTEEN -->
+                    <div class="template-die">
+                        {{#rollBetween() base-roll-eighteen 1 5}}
+                            <div class="template-base-between"></div>
+                        {{/rollBetween() base-roll-eighteen 1 5}}
+                        {{#rollWasCrit() base-roll-eighteen}}
+                            <div class="template-base-success hit"></div>
+                        {{/rollWasCrit() base-roll-eighteen}}
+                    </div>
+                    {{/rollGreater() base-dice 17}}
+                    
+                    {{#rollGreater() stress-dice 0}} <!-- STRESS DIE ONE -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-one}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-one}}
+                        {{#rollBetween() stress-roll-one 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-one 2 5}}
+                        {{#rollWasCrit() stress-roll-one}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-one}}
+                    </div>
+                    {{/rollGreater() stress-dice 0}}
+                    
+                    {{#rollGreater() stress-dice 1}} <!-- STRESS DIE TWO -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-two}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-two}}
+                        {{#rollBetween() stress-roll-two 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-two 2 5}}
+                        {{#rollWasCrit() stress-roll-two}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-two}}
+                    </div>
+                    {{/rollGreater() stress-dice 1}}
+                    
+                    {{#rollGreater() stress-dice 2}} <!-- STRESS DIE THREE -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-three}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-three}}
+                        {{#rollBetween() stress-roll-three 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-three 2 5}}
+                        {{#rollWasCrit() stress-roll-three}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-three}}
+                    </div>
+                    {{/rollGreater() stress-dice 2}}
+                    
+                    {{#rollGreater() stress-dice 3}} <!-- STRESS DIE FOUR -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-four}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-four}}
+                        {{#rollBetween() stress-roll-four 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-four 2 5}}
+                        {{#rollWasCrit() stress-roll-four}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-four}}
+                    </div>
+                    {{/rollGreater() stress-dice 3}}
+                    
+                    {{#rollGreater() stress-dice 4}} <!-- STRESS DIE FIVE -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-five}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-five}}
+                        {{#rollBetween() stress-roll-five 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-five 2 5}}
+                        {{#rollWasCrit() stress-roll-five}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-five}}
+                    </div>
+                    {{/rollGreater() stress-dice 4}}
+                    
+                    {{#rollGreater() stress-dice 5}} <!-- STRESS DIE SIX -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-six}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-six}}
+                        {{#rollBetween() stress-roll-six 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-six 2 5}}
+                        {{#rollWasCrit() stress-roll-six}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-six}}
+                    </div>
+                    {{/rollGreater() stress-dice 5}}
+                    
+                    {{#rollGreater() stress-dice 6}} <!-- STRESS DIE SEVEN -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-seven}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-seven}}
+                        {{#rollBetween() stress-roll-seven 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-seven 2 5}}
+                        {{#rollWasCrit() stress-roll-seven}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-seven}}
+                    </div>
+                    {{/rollGreater() stress-dice 6}}
+                    
+                    {{#rollGreater() stress-dice 7}} <!-- STRESS DIE EIGHT -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-eight}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-eight}}
+                        {{#rollBetween() stress-roll-eight 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-eight 2 5}}
+                        {{#rollWasCrit() stress-roll-eight}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-eight}}
+                    </div>
+                    {{/rollGreater() stress-dice 7}}
+                    
+                    {{#rollGreater() stress-dice 8}} <!-- STRESS DIE NINE -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-nine}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-nine}}
+                        {{#rollBetween() stress-roll-nine 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-nine 2 5}}
+                        {{#rollWasCrit() stress-roll-nine}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-nine}}
+                    </div>
+                    {{/rollGreater() stress-dice 8}}
+                    
+                    {{#rollGreater() stress-dice 9}} <!-- STRESS DIE TEN -->
+                    <div class="template-die">
+                        {{#rollWasFumble() stress-roll-ten}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() stress-roll-ten}}
+                        {{#rollBetween() stress-roll-ten 2 5}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() stress-roll-ten 2 5}}
+                        {{#rollWasCrit() stress-roll-ten}}
+                            <div class="template-stress-success hit"></div>
+                        {{/rollWasCrit() stress-roll-ten}}
+                    </div>
+                    {{/rollGreater() stress-dice 9}}
+                    
+                    {{#rollGreater() regular-dice 0}} <!-- regular DIE ONE -->
+                    <div class="template-grid-item template-span-six template-to-the-center">
+                        <div class="template-yellow">
+                            {{regular-dice-one}}
+                        </div>
+                    </div>
+                    {{/rollGreater() regular-dice 0}}
+                    
+                    {{#rollGreater() regular-dice 1}} <!-- regular DIE TWO -->
+                    <div class="template-grid-item template-span-six template-to-the-center">
+                        <div class="template-yellow">
+                            {{regular-dice-two}}
+                        </div>
+                    </div>
+                    {{/rollGreater() regular-dice 1}}
+                    
+                    {{#rollGreater() regular-dice 2}} <!-- regular DIE THREE -->
+                    <div class="template-grid-item template-span-six template-to-the-center">
+                        <div class="template-yellow">
+                            {{regular-dice-three}}
+                        </div>
+                    </div>
+                    {{/rollGreater() regular-dice 2}}
+                    
+                    {{#rollGreater() regular-dice 3}} <!-- regular DIE FOUR -->
+                    <div class="template-grid-item template-span-six template-to-the-center">
+                        <div class="template-yellow">
+                            {{regular-dice-four}}
+                        </div>
+                    </div>
+                    {{/rollGreater() regular-dice 3}}
+                    
+                    {{#rollGreater() regular-dice 4}} <!-- regular DIE FIVE -->
+                    <div class="template-grid-item template-span-six template-to-the-center">
+                        <div class="template-yellow">
+                            {{regular-dice-five}}
+                        </div>
+                    </div>
+                    {{/rollGreater() regular-dice 4}}
+                    
+                    {{#rollGreater() regular-dice 5}} <!-- regular DIE SIX -->
+                    <div class="template-grid-item template-span-six template-to-the-center">
+                        <div class="template-yellow">
+                            {{regular-dice-six}}
+                        </div>
+                    </div>
+                    {{/rollGreater() regular-dice 5}}
+
+                    <!--  -->                    
+                    {{#rollGreater() supply-dice 0}} <!-- SUPPLY DIE ONE -->
+                    <div class="template-die template-span-one">
+                        {{#rollWasFumble() supply-roll-one}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() supply-roll-one}}
+                        {{#rollBetween() supply-roll-one 2 6}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() supply-roll-one 2 6}}
+                    </div>
+                    {{/rollGreater() supply-dice 0}}
+                    
+                    {{#rollGreater() supply-dice 1}} <!-- SUPPLY DIE TWO -->
+                    <div class="template-die">
+                        {{#rollWasFumble() supply-roll-two}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() supply-roll-two}}
+                        {{#rollBetween() supply-roll-two 2 6}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() supply-roll-two 2 6}}
+                    </div>
+                    {{/rollGreater() supply-dice 1}}
+                    
+                    {{#rollGreater() supply-dice 2}} <!-- SUPPLY DIE THREE -->
+                    <div class="template-die">
+                        {{#rollWasFumble() supply-roll-three}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() supply-roll-three}}
+                        {{#rollBetween() supply-roll-three 2 6}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() supply-roll-three 2 6}}
+                    </div>
+                    {{/rollGreater() supply-dice 2}}
+                    
+                    {{#rollGreater() supply-dice 3}} <!-- SUPPLY DIE FOUR -->
+                    <div class="template-die">
+                        {{#rollWasFumble() supply-roll-four}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() supply-roll-four}}
+                        {{#rollBetween() supply-roll-four 2 6}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() supply-roll-four 2 6}}
+                    </div>
+                    {{/rollGreater() supply-dice 3}}
+                    
+                    {{#rollGreater() supply-dice 4}} <!-- SUPPLY DIE FIVE -->
+                    <div class="template-die">
+                        {{#rollWasFumble() supply-roll-five}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() supply-roll-five}}
+                        {{#rollBetween() supply-roll-five 2 6}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() supply-roll-five 2 6}}
+                    </div>
+                    {{/rollGreater() supply-dice 4}}
+                    
+                    {{#rollGreater() supply-dice 5}} <!-- SUPPLY DIE SIX -->
+                    <div class="template-die">
+                        {{#rollWasFumble() supply-roll-six}}
+                            <div class="template-stress-fail stress"></div>
+                        {{/rollWasFumble() supply-roll-six}}
+                        {{#rollBetween() supply-roll-six 2 6}}
+                            <div class="template-stress-between"></div>
+                        {{/rollBetween() supply-roll-six 2 6}}
+                    </div>
+                    {{/rollGreater() supply-dice 5}}
+                    <!-- End Testing New Roll Template Logic-->
 
                 </div>
 
-                {{#base-dice}} 
-                    {{#stress-dice}}
+                {{#rollGreater() base-dice 0}} 
+                    {{#rollGreater() stress-dice 0}}
                     <div class="template-grid-item template-span-half1">
                         <span data-i18n="template-success" class="template-success">Success: </span>
                     </div>                    
                     <div class="template-grid-item template-span-half2">
-                        <span data-i18n="template-stress" class="template-stress">Panic: </span>
+                        <span data-i18n="template-panic" class="template-stress">Panic: </span>
                     </div>
-                    {{/stress-dice}}
+                    {{/rollGreater() stress-dice 0}}
                     {{^stress-dice}}
                     <div class="template-grid-item template-span-six">
                         <span data-i18n="template-success" class="template-success">Success: </span>
                     </div> 
                     {{/stress-dice}}
-                {{/base-dice}} 
+                {{/rollGreater() base-dice 0}} 
+
+                {{^base-dice}}
+                    {{#stress-dice}}
+                    <div class="template-grid-item template-span-half1">
+                        <span data-i18n="template-success" class="template-success">Success: </span>
+                    </div>                    
+                    <div class="template-grid-item template-span-half2">
+                        <span data-i18n="template-panic" class="template-stress">Panic: </span>
+                    </div>   
+                    {{/stress-dice}}
+                {{/base-dice}}            
+                
 <!--
                 {{#base-dice}}
                 <div class="">
@@ -2875,61 +3390,20 @@
                 <div class="sheet-outcome" style="color: blue; background-color: whitesmoke;">
                     {{computed::message}}
                 </div>
-                {{/showoutcome}}
+                {{/showoutcome}}   
 
-                {{^base-dice}}
-                    {{#stress-dice}}
-                    <div class="template-grid-item template-span-half1">
-                        <span data-i18n="template-success" class="template-success">Success: </span>
-                    </div>                    
-                    <div class="template-grid-item template-span-half2">
-                        <span data-i18n="template-stress" class="template-stress">Panic: </span>
-                    </div>   
-                    {{/stress-dice}}
-                {{/base-dice}}
-                
-
-<!--            {{#rollLess() base-dice 1}} 
-                <div class="template-grid-item template-span-half1">
-                    <span class="template-success">&nbsp;</span>
-                </div>
-                {{/rollLess() base-dice 1}} 
-
-                {{#rollGreater() stress-dice 0}}
-                <div class="template-grid-item template-span-half2">
-                    <span data-i18n="template-stress" class="template-stress">Panic: </span>
-                </div>
-                {{/rollGreater() stress-dice 0}}
-                {{#rollLess() stress-dice 1}}
-                <div class="template-grid-item template-span-half2">
-                    <span class="template-stress">&nbsp;</span>
-                </div>
-                {{/rollLess() stress-dice 1}} -->
-               
-                {{#current-bonus}}
-                    <div class="template-grid-item template-span-left">
-                        <span data-i18n="template-bonus">Bonus: </span><br/>{{current-bonus}}
-                    </div>
-                {{/current-bonus}}
-                {{#current-damage}}
-                    <div class="template-grid-item template-span-center">
-                        <span data-i18n="template-damage">Damage: </span><br/><span data-i18n-title="base-damage-desc" title="Base damage">{{current-damage}} </span>(+<span data-i18n-title="extra-damage-desc" title="Additional damage based on stunts (option)" class="template-damage"></span>)
-                    </div>
-                {{/current-damage}}
-                {{#current-range}}
-                    <div class="template-grid-item template-span-right">{{current-range}} <br/>range</div>
-                {{/current-range}}
+                <!-- Roll Comments -->
                 {{#current-comment}}
                     <div class="template-grid-item template-span-six template-to-the-left">
                         {{current-comment}}
                     </div>
                 {{/current-comment}}
         
-               {{#allprops() buttonlabel buttonlink passthroughdata character-name roll-name roll-type roll-dice base-dice base-roll-one base-roll-two base-roll-three base-roll-four base-roll-five base-roll-six base-roll-seven base-roll-eight base-roll-nine base-roll-ten base-roll-eleven base-roll-twelve base-roll-thirteen base-roll-fourteen base-roll-fifteen base-roll-sixteen base-roll-seventeen base-roll-eighteen stress-dice stress-roll-one stress-roll-two stress-roll-three stress-roll-four stress-roll-five stress-roll-six stress-roll-seven stress-roll-eight stress-roll-nine stress-roll-ten supply-dice supply-roll-one supply-roll-two supply-roll-three supply-roll-four supply-roll-five supply-roll-six show-weapon current-bonus current-damage current-range current-comment panic-roll }}
+               {{#allprops() buttonlabel buttonlink passthroughdata character-name roll-name roll-type roll-dice roll-dice-cmd base-dice result base-roll-one base-roll-two base-roll-three base-roll-four base-roll-five base-roll-six base-roll-seven base-roll-eight base-roll-nine base-roll-ten base-roll-eleven base-roll-twelve base-roll-thirteen base-roll-fourteen base-roll-fifteen base-roll-sixteen base-roll-seventeen base-roll-eighteen stress-dice stress-roll-one stress-roll-two stress-roll-three stress-roll-four stress-roll-five stress-roll-six stress-roll-seven stress-roll-eight stress-roll-nine stress-roll-ten supply-dice supply-roll-one supply-roll-two supply-roll-three supply-roll-four supply-roll-five supply-roll-six show-weapon current-bonus current-dice current-damage current-range current-comment panic-roll }}
                     <div class="template-grid-item template-span-six">
                         {{key}} {{value}}
                     </div>
-                {{/allprops() buttonlabel buttonlink passthroughdata character-name roll-name roll-type roll-dice base-dice base-roll-one base-roll-two base-roll-three base-roll-four base-roll-five base-roll-six base-roll-seven base-roll-eight base-roll-nine base-roll-ten base-roll-eleven base-roll-twelve base-roll-thirteen base-roll-fourteen base-roll-fifteen base-roll-sixteen base-roll-seventeen base-roll-eighteen stress-dice stress-roll-one stress-roll-two stress-roll-three stress-roll-four stress-roll-five stress-roll-six stress-roll-seven stress-roll-eight stress-roll-nine stress-roll-ten supply-dice supply-roll-one supply-roll-two supply-roll-three supply-roll-four supply-roll-five supply-roll-six show-weapon current-bonus current-damage current-range current-comment panic-roll }}
+                {{/allprops() buttonlabel buttonlink passthroughdata character-name roll-name roll-type roll-dice roll-dice-cmd base-dice result base-roll-one base-roll-two base-roll-three base-roll-four base-roll-five base-roll-six base-roll-seven base-roll-eight base-roll-nine base-roll-ten base-roll-eleven base-roll-twelve base-roll-thirteen base-roll-fourteen base-roll-fifteen base-roll-sixteen base-roll-seventeen base-roll-eighteen stress-dice stress-roll-one stress-roll-two stress-roll-three stress-roll-four stress-roll-five stress-roll-six stress-roll-seven stress-roll-eight stress-roll-nine stress-roll-ten supply-dice supply-roll-one supply-roll-two supply-roll-three supply-roll-four supply-roll-five supply-roll-six show-weapon current-bonus current-dice current-damage current-range current-comment panic-roll }}
         </div>
     </div>
 </rolltemplate>    
@@ -3051,7 +3525,7 @@
                             <span data-i18n="template-success" class="template-success">Success: </span>
                         </div>                    
                         <div class="template-grid-item template-span-half2">
-                            <span data-i18n="template-stress" class="template-stress">Panic: </span>
+                            <span data-i18n="template-panic" class="template-stress">Panic: </span>
                         </div>
                         {{/stress-dice}}
                         {{^stress-dice}}
@@ -3356,7 +3830,62 @@
             });
         });  
     }
+
+    // SIGNATURE ATTACKS
+    // Randomize attack button
+    on('clicked:randomizeattack', async (ev) => {
+        clog(`Starting randomized signature attack parsed roll`);
+        await signatureAttack(ev);
+        clog(`Completed randomized signature attack parsed roll`);
+    });
+    // Randimze signature attacks
+    const signatureAttack = async (ev) => {
+        
+        //clog(`First event: ${JSON.stringify(ev)}`);
+        //clog(`Event name: ${ev.htmlAttributes.name}`);
+
+        const attackId = Math.ceil(Math.random()*6); 
+
+        const attrs = await asw.getAttrs(["character_name"]);
+        const rollBase = `@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{xenoattack${attackId}_name} }} {{roll-type=${attackId}}} {{current-comment=@{xenoattack${attackId}_desc} }} {{current-damage=@{xenoattack${attackId}_dmg} }} {{roll-dice-cmd=@{xenoattack${attackId}_dice} }} {{roll-dice=[[@{xenoattack${attackId}_dice}]] }} {{current-dice=@{xenoattack${attackId}_base} }} {{base-dice=[[@{xenoattack${attackId}_base}]] }} {{base-roll-one=[[1d6]] }} {{base-roll-two=[[1d6]] }} {{base-roll-three=[[1d6]] }} {{base-roll-four=[[1d6]] }} {{base-roll-five=[[1d6]] }}  {{base-roll-six=[[1d6]] }} {{base-roll-seven=[[1d6]] }} {{base-roll-eight=[[1d6]] }} {{base-roll-nine=[[1d6]] }} {{base-roll-ten=[[1d6]] }} {{base-roll-eleven=[[1d6]] }} {{base-roll-twelve=[[1d6]] }} {{base-roll-thirteen=[[1d6]] }} {{base-roll-fourteen=[[1d6]] }} {{base-roll-fifteen=[[1d6]] }} {{base-roll-sixteen=[[1d6]] }} {{base-roll-seventeen=[[1d6]] }} {{base-roll-eighteen=[[1d6]] }}`;
+        // Removed range from the command since it isnt sure it is needed: {{current-range=@{xenoattack${attackId}_range} }}
+        const firstRoll = await startRoll(rollBase);
+        //clog(`First roll data: ${JSON.stringify(firstRoll)}`);
+        //clog(`First roll data: ${JSON.stringify(firstRoll.rolls)}`);
+
+        finishRoll(firstRoll.rollId);
+    }
+    // Copy a signature attack, with a popup alert to ensure data is not overwritten by mistake.
+    const copybuttons = ["attackcopy1","attackcopy2","attackcopy3","attackcopy4","attackcopy5",];
+    copybuttons.forEach( async (button) => {
+        on(`clicked:${button}`, async (eventInfo) => {
+            //clog(`Button eventinfo: ${JSON.stringify(eventInfo)}`);
+            let id = eventInfo.triggerName.slice(-1);
+            let newId = int(id)+1; 
+            clog(`Button id: ${id}, new id: ${newId}`);
+            const confirm = await getQuery(`?{Are you sure you want to replace the attack ${id} with the data from ${id-1}? This action cannot be undone. |Yes,1|No,0}`);
+            clog(`Copy confirmed? ${confirm}`);
+            if ( confirm == 1 ) {
+                const attrs = await asw.getAttrs([`xenoattack${id}_name`, `xenoattack${id}_desc`, `xenoattack${id}_dice`, `xenoattack${id}_base`, `xenoattack${id}_dmg`, `xenoattack${newId}_name`, `xenoattack${newId}_desc`, `xenoattack${newId}_dice`, `xenoattack${newId}_base`, `xenoattack${newId}_dmg`]);
+                //clog(JSON.stringify(attrs));
+                clog("Data before copy - name: "+attrs[`xenoattack${newId}_name`]+", dice: "+attrs[`xenoattack${newId}_dice`]+", base: "+attrs[`xenoattack${newId}_base`]+", damage: "+attrs[`xenoattack${newId}_dmg`]+", description: "+attrs[`xenoattack${newId}_desc`]);
+                //clog(JSON.stringify(attrs[`xenoattack${newId}_desc`]));
+                //clog(JSON.stringify(attrs[`xenoattack${newId}_dice`]));
+                //clog(JSON.stringify(attrs[`xenoattack${newId}_base`]));
+                //clog(JSON.stringify(attrs[`xenoattack${newId}_dmg`]));
+                /* Set attributes for new attack */
+                await asw.setAttrs({
+                    [`xenoattack${newId}_name`]: attrs[`xenoattack${id}_name`],
+                    [`xenoattack${newId}_desc`]: attrs[`xenoattack${id}_desc`],
+                    [`xenoattack${newId}_dice`]: attrs[`xenoattack${id}_dice`],
+                    [`xenoattack${newId}_base`]: attrs[`xenoattack${id}_base`],
+                    [`xenoattack${newId}_dmg`]: attrs[`xenoattack${id}_dmg`],
+                });                
+            }
+        }); 
+    });
     
+    // EXPERIMENTAL SPACE
     // Parsed Roll, triggered from sheet. Need to add logic and attributes for pushing rolls, keeping this for future additions. 
     const rollFirst = async (ev) => {
         // We'll pretend we've done a getAttrs on the attacker's weapon for all the required values
@@ -3428,8 +3957,10 @@
         clog(`Completed push roll`);
     });
     */
+    // END EXPERIMENTAL SPACE
 
-    on('change:secret_roll', (ev) => {
+    // SET SECRET ROLL 
+    on('change:secret_roll sheet:opened', (ev) => {
         getAttrs(['secret_roll', 'roll_command', 'roll_command_api', ], (values) => {
             clog(`Secret roll update: ${JSON.stringify(ev)}`);
             const s = values.secret_roll;
@@ -3457,14 +3988,14 @@
                 console.log("%c|*** Character Sheet Calculating Attribute Value Change ***|", "color:Black; background-color: LawnGreen");
                 console.log(eventinfo.sourceAttribute + " was activated by " + eventinfo.sourceType);
                 console.log("Previous Value: " + eventinfo.previousValue + " changed to a New Value of: " + eventinfo.newValue);
-                console.log(JSON.stringify(eventinfo));
-                console.log('checkbox names: ' + variableAttributeChecks.join(', '));
+                //console.log(JSON.stringify(eventinfo));
+                //console.log('checkbox names: ' + variableAttributeChecks.join(', '));
                 if (eventinfo.sourceAttribute == variableAttribute) {
                     // stress or health token bar change
                     const newValue = values[variableAttribute]*1||0;
                     const setAttributeValuesAttrs = variableAttributeChecks.reduce((final,item,index) => {
                         final[item] = (index < newValue ? 1: 0);  // index will be 0 to 9, so we use < instead of <=
-                        console.log(`Setting Attribute Values: ${item} = ${index < newValue ? 1: 0}`);
+                        //console.log(`Setting Attribute Values: ${item} = ${index < newValue ? 1: 0}`);
                         return final;
                     },{});
                     setAttrs(setAttributeValuesAttrs, {silent: true});
@@ -3472,7 +4003,7 @@
                     const attributeTotal = variableAttributeChecks.reduce((total,item) => total + values[item] *1||0, 0);
                     const setAttributeFinalAttrs = {};
                     setAttributeFinalAttrs[variableAttribute] = attributeTotal;
-                    console.log("Setting Attribute Values: " + attributeTotal);
+                    //console.log("Setting Attribute Values: " + attributeTotal);
                     setAttrs(setAttributeFinalAttrs, {silent: true});
                 }
             });
diff --git a/Alien Roleplaying Game/translation.json b/Alien Roleplaying Game/translation.json
index 401dce1e2a..ca1bdbddca 100644
--- a/Alien Roleplaying Game/translation.json	
+++ b/Alien Roleplaying Game/translation.json	
@@ -42,6 +42,7 @@
     "initiative-dice-u": "Initiative: Dice",
     "initiative-dice-desc": "Initiative: Dice button to roll for your initiative, the GM may ask you to change the dice rolled in the configuraiton tab. Make sure you select your token before rolling to automatically assign the initivative.",
     "base-dice-u": "Base Dice",
+    "base": "Base",
     "stress-dice-u": "Stress Dice",
     "stress-level-u": "Stress Level",
     "close-combat-u": "Close Combat",
@@ -119,6 +120,7 @@
     "water-u": "Water",
     "building-betterworlds-u": "\"Building Better Worlds\"",
     "template-bonus-u": "Bonus: ",
+    "template-dice-u": "Dice: ",
     "template-damage-u": "Damage: ",
     "none-place": "None",
     "weight-u": "Weight",
@@ -166,7 +168,9 @@
 	"gunner-comment-desc-notes-place": "Gunner name / Comment / Description / Notes...",
 	"template-success": "Success: ",
 	"template-stress": "Stress: ",
+	"template-panic": "Panic: ",
 	"template-bonus": "Bonus: ",
+	"template-dice": "Dice: ",
 	"template-damage": "Damage: ",
     "configuration": "Configuration",
     "config-enable-encumbrance-desc": "Adds fields Wt (weight), # (amount) and Enc (encumbrance) to the Gear list, as well as a Weight option for weapons. Every 4 items of Food or Water in the Consumables section will count as 1 item.",
@@ -203,15 +207,25 @@
     "cont-and-term": "Containment&nbsp;& Termination",
     "notes": "Notes",
     "signature-attacks": "Signature Attacks",
-    "signature-attack-desc": "Signature attacks are always whispered to the GM, to be played out in combat.",
+    "signature-attack-desc": "Signature attacks now follow the Secret rolls button",
+    "random-signature-attack-desc": "Signature attacks now follow the Secret rolls button",
     "armor-vs-fire": "Armor vs Fire",
     "armor-vs": "Armor vs",
     "acid-splash": "Acid splash",
     "dice": "Dice",
     "rolls": "Rolls",
     "signature-attack": "Signature Attack",
+    "random-attack-u": "Random",
     "expand-all": "Expand all",
     "collapse-all": "Collapse all",
-    "base-damage-desc": "Base damage",
-    "extra-damage-desc": "Additional damage based on stunts (optional)" 
+    "template-base-damage": "Base dmg:",
+    "base-damage-desc": "Base damage. Additional damage can be achieved by rolling 6s (aka stunts).",
+    "extra-damage-desc": "Additional damage based on stunts (optional)",
+    "copy": "Copy",
+    "xeno-signature-dice": "Dice. This will make a separate roll with D6 that will be summed up." ,
+    "xeno-signature-base": "Base dice. This will make a roll using base dice, and count the successes (6s or Crosshair icons).",
+    "xeno-signature-dmg": "Base damage. This is the base damage of the attack. It may be increased by achieving stunts in the Base dice roll.",
+    "xeno-abilities.place": "",
+    "xeno-contterm.place": "",
+    "xeno-notes.place": ""
 }