diff --git a/Alien Roleplaying Game/Alien-Roleplaying-Game.html b/Alien Roleplaying Game/Alien-Roleplaying-Game.html
index 9c5812d753..2fe13547bd 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.00">
+<input type="hidden" name="attr_sheetversion" value="4.02">
 <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">
@@ -191,22 +191,22 @@
             </div>
             <div class="vertical-adjust-one">
                 <div class="roll-buttons alpha-buttons">
-                    <button type="roll" class="button-skill button-alpha" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 1d3 )* }} {{roll-dice=[[ round(1d6/2) ]] }}" name="one_die_three" /><span data-i18n="1d3-u">1d3</span></button>
-                    <button type="roll" class="button-skill button-alpha" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 1d6 )* }} {{roll-dice=[[ 1d6 ]] }}" name="one_die_six" /><span data-i18n="1d6-u">1d6</span></button>
-                    <button type="roll" class="button-skill button-alpha" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 2d6 )* }} {{roll-dice=[[ 2d6 ]] }}" name="two_die_six" /><span data-i18n="12d6d3-u">2d6</span></button>
-                    <button type="roll" class="button-skill button-alpha" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 3d6 )* }} {{roll-dice=[[ 3d6 ]] }}" name="three_die_six" /><span data-i18n="3d6-u">3d6</span></button>
-                    <button type="roll" class="button-skill button-alpha" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( d66 )* }} {{roll-dice=[[ (1d6)*10 + 1d6 ]] }}" name="die_sixty_six" /><span data-i18n="d66-u">d66</span></button>
+                    <button type="roll" class="button-skill button-alpha" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 1d3 )* }} {{roll-dice=[[ round(1d6/2) ]] }}" name="one_die_three" /><span data-i18n="1d3-u">1d3</span></button>
+                    <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>
+                    <button type="roll" class="button-skill button-alpha" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 2d6 )* }} {{roll-dice=[[ 2d6 ]] }}" name="two_die_six" /><span data-i18n="12d6d3-u">2d6</span></button>
+                    <button type="roll" class="button-skill button-alpha" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 3d6 )* }} {{roll-dice=[[ 3d6 ]] }}" name="three_die_six" /><span data-i18n="3d6-u">3d6</span></button>
+                    <button type="roll" class="button-skill button-alpha" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( d66 )* }} {{roll-dice=[[ (1d6)*10 + 1d6 ]] }}" name="die_sixty_six" /><span data-i18n="d66-u">d66</span></button>
                 </div>
                 <div class="roll-buttons beta-buttons">
                     <input class="panicdesc" type="checkbox" hidden name="attr_config_panicdesc">
-                    <button type="roll" class="button-skill button-beta panicdesc" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Panic Roll }} {{roll-dice=[[ 1d6 + @{stress} [ Stress ] ]] }}" name="panic" data-i18n-title="panic-desc" /><span data-i18n="panic-u">Panic</span></button>
-                    <button type="roll" class="button-skill button-beta nopanicdesc" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Panic Roll }} {{panic-roll=[[ 1d6 + @{stress} [ Stress ] ]] }}" name="panic" data-i18n-title="panic-desc" /><span data-i18n="panic-u">Panic</span></button>
-                    <button type="roll" class="button-skill button-beta" value="@{secret_roll} &{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="@{secret_roll} &{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>
+                    <button type="roll" class="button-skill button-beta panicdesc" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Panic Roll }} {{roll-dice=[[ 1d6 + @{stress} [ Stress ] ]] }}" name="panic" data-i18n-title="panic-desc" /><span data-i18n="panic-u">Panic</span></button>
+                    <button type="roll" class="button-skill button-beta nopanicdesc" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Panic Roll }} {{panic-roll=[[ 1d6 + @{stress} [ Stress ] ]] }}" name="panic" data-i18n-title="panic-desc" /><span data-i18n="panic-u">Panic</span></button>
+                    <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>
                 <div class="roll-buttons gamma-buttons">
-                    <button type="roll" class="button-skill button-gamma" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Base Dice }} {{base-dice=[[ ?{How Many Base Dice|0} ]] }} {{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="base_dice" /><span data-i18n="base-dice-u">Base Dice</span></button>
-                    <button type="roll" class="button-skill button-gamma" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Stress Dice }} {{stress-dice=[[ ?{How Many Stress Dice|0} ]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" name="stress_dice" /><span data-i18n="stress-dice-u">Stress Dice</span></button>
+                    <button type="roll" class="button-skill button-gamma" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Base Dice }} {{base-dice=[[ ?{How Many Base Dice|0} ]] }} {{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="base_dice" /><span data-i18n="base-dice-u">Base Dice</span></button>
+                    <button type="roll" class="button-skill button-gamma" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Stress Dice }} {{stress-dice=[[ ?{How Many Stress Dice|0} ]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" name="stress_dice" /><span data-i18n="stress-dice-u">Stress Dice</span></button>
                 </div>
             </div>
         </div> <!-- END OF ROW 3 --> 
@@ -239,8 +239,8 @@
             <div class="float-left">
                 <input type="number" name="attr_close_combat" value="0" class="no-spin-input optional-spinner-input" title="@{close_combat}" />
             </div>
-            <button type="roll" name="close_combat" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Close Combat }} {{base-dice=[[@{strength} + @{close_combat} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="close-combat-u" >Close Combat</button>
-            <button type="roll" name="close_combat_api" class="button-skill roll-api" data-i18n="close-combat-u" value="@{roll_command} [Close combat] [[(@{strength}+@{close_combat}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[close_combat_api]">
+            <button type="roll" name="close_combat" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Close Combat }} {{base-dice=[[@{strength} + @{close_combat} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="close-combat-u" >Close Combat</button>
+            <button type="roll" name="close_combat_api" class="button-skill roll-api" data-i18n="close-combat-u" value="@{roll_command_api} [Close combat] [[(@{strength}+@{close_combat}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[close_combat_api]">
                 &nbsp;<span >Close Combat</span>&nbsp;
             </button>
         </div>
@@ -311,24 +311,24 @@
             <div class="float-left">
                 <input type="number" name="attr_heavy_machinery" value="0" class="no-spin-input optional-spinner-input" title="@{heavy_machinery}" />
             </div>
-            <button type="roll" name="heavy_machinery" class="button-skill roll-rolltemplate bigger-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Heavy Machinery }} {{base-dice=[[@{strength} + @{heavy_machinery} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}"  data-i18n="heavy-machinery-u">Heavy Machinery</button>
-            <button type="roll" name="heavy_machinery_api" class="button-skill roll-api bigger-skill" data-i18n="heavy-machinery-u" value="@{roll_command} [Heavy machinery] [[(@{strength}+@{heavy_machinery}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[heavy_machinery]">
+            <button type="roll" name="heavy_machinery" class="button-skill roll-rolltemplate bigger-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Heavy Machinery }} {{base-dice=[[@{strength} + @{heavy_machinery} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}"  data-i18n="heavy-machinery-u">Heavy Machinery</button>
+            <button type="roll" name="heavy_machinery_api" class="button-skill roll-api bigger-skill" data-i18n="heavy-machinery-u" value="@{roll_command_api} [Heavy machinery] [[(@{strength}+@{heavy_machinery}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[heavy_machinery]">
                 &nbsp;<span >Heavy Machinery</span>&nbsp;
             </button>
         </div>
         <div class="grid-item black-item">
-            <button type="roll" name="strength" class="teal-header bold attribute-button roll-nonapi roll-rolltemplate" data-i18n="strength-u" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Strength }} {{base-dice=[[@{strength} + ?{Modifiers|0} ]] }} {{passthroughdata=[[0]]}} {{buttonlabel=Push Roll}} {{buttonlink=pushroll}} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
+            <button type="roll" name="strength" class="teal-header bold attribute-button roll-nonapi roll-rolltemplate" data-i18n="strength-u" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Strength }} {{base-dice=[[@{strength} + ?{Modifiers|0} ]] }} {{passthroughdata=[[0]]}} {{buttonlabel=Push Roll}} {{buttonlink=pushroll}} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
                 Strength
             </button>
             <!-- <button class="roll-rolltemplate" type="action" name="act_strength">Strength</button> -->
-            <button type="roll" name="strength_api" class="teal-header bold attribute-button roll-api" value="@{roll_command} [Strength] [[ (@{strength}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[strength]">
+            <button type="roll" name="strength_api" class="teal-header bold attribute-button roll-api" value="@{roll_command_api} [Strength] [[ (@{strength}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[strength]">
                 &nbsp;<span >Strength</span>&nbsp;
             </button>
                 <!--span class="teal-header bold" data-i18n="strength-u">Strength</span-->
         </div>
         <div class="grid-item span-eight-nine">
-            <button type="roll" name="stamina" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Stamina }} {{base-dice=[[@{strength} + @{stamina} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="stamina-u">Stamina</button>
-            <button type="roll" name="stamina_api" class="button-skill roll-api" data-i18n="stamina-u" value="@{roll_command} [Stamina] [[(@{strength}+@{stamina}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[stamina_api]">
+            <button type="roll" name="stamina" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Stamina }} {{base-dice=[[@{strength} + @{stamina} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="stamina-u">Stamina</button>
+            <button type="roll" name="stamina_api" class="button-skill roll-api" data-i18n="stamina-u" value="@{roll_command_api} [Stamina] [[(@{strength}+@{stamina}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[stamina_api]">
                 &nbsp;<span >Stamina</span>&nbsp;
             </button>
             <div class="float-right">
@@ -340,8 +340,7 @@
                 <span class="small-teal-label" data-i18n="make-roll-secret-u">Make Roll Secret</span>
             </div>
             <div class="vertical-adjust-one">
-                <input type="checkbox" class="numbered-box grey-box roll-rolltemplate" value="/w gm" name="attr_secret_roll"><span class="roll-rolltemplate" title="+" ></span>
-                <input type="checkbox" class="numbered-box grey-box roll-api" value="w" name="attr_secret_roll_api"><span class="roll-api" title="+" ></span>
+                <input type="checkbox" class="numbered-box grey-box" value="1" name="attr_secret_roll"><span class="" title="+" ></span>
             </div>
         </div>
         <div class="grid-item span-twelve-thirteen">
@@ -388,8 +387,8 @@
             <div class="float-left">
                 <input type="number" name="attr_ranged_combat" value="0" class="no-spin-input optional-spinner-input" title="@{ranged_combat}" />
             </div>
-            <button type="roll" name="ranged_combat" class="button-skill roll-rolltemplate bigger-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Ranged Combat }} {{base-dice=[[@{agility} + @{ranged_combat} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="ranged-combat-u">Ranged Combat</button>
-            <button type="roll" name="ranged_combat_api" class="button-skill roll-api bigger-skill" data-i18n="ranged-combat-u" value="@{roll_command} [Ranged combat] [[(@{agility}+@{ranged_combat}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[ranged_combat_api]">
+            <button type="roll" name="ranged_combat" class="button-skill roll-rolltemplate bigger-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Ranged Combat }} {{base-dice=[[@{agility} + @{ranged_combat} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="ranged-combat-u">Ranged Combat</button>
+            <button type="roll" name="ranged_combat_api" class="button-skill roll-api bigger-skill" data-i18n="ranged-combat-u" value="@{roll_command_api} [Ranged combat] [[(@{agility}+@{ranged_combat}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[ranged_combat_api]">
                 &nbsp;<span >Ranged Combat</span>&nbsp;
             </button>
         </div>
@@ -399,8 +398,8 @@
             </div>
         </div>
         <div class="grid-item span-nine-ten">
-            <button type="roll" name="observation" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Observation }} {{base-dice=[[@{wits} + @{observation} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="observation-u">Observation</button>
-            <button type="roll" name="observation_api" class="button-skill roll-api" data-i18n="observation-u" value="@{roll_command} [Observation] [[(@{wits}+@{observation}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[observation_api]">
+            <button type="roll" name="observation" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Observation }} {{base-dice=[[@{wits} + @{observation} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="observation-u">Observation</button>
+            <button type="roll" name="observation_api" class="button-skill roll-api" data-i18n="observation-u" value="@{roll_command_api} [Observation] [[(@{wits}+@{observation}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[observation_api]">
                 &nbsp;<span >Observation</span>&nbsp;
             </button>
             <div class="float-right">
@@ -426,15 +425,15 @@
             <div class="float-left">
                 <input type="number" name="attr_mobility" value="0" class="no-spin-input optional-spinner-input" title="@{mobility}" />
             </div>
-            <button type="roll" name="mobility" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Mobility }} {{base-dice=[[@{agility} + @{mobility} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="mobility-u" >Mobility</button>
-            <button type="roll" name="mobility_api" class="button-skill roll-api" data-i18n="mobility-u" value="@{roll_command} [Mobility] [[(@{agility}+@{mobility}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[mobility_api]">
+            <button type="roll" name="mobility" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Mobility }} {{base-dice=[[@{agility} + @{mobility} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="mobility-u" >Mobility</button>
+            <button type="roll" name="mobility_api" class="button-skill roll-api" data-i18n="mobility-u" value="@{roll_command_api} [Mobility] [[(@{agility}+@{mobility}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[mobility_api]">
                 &nbsp;<span >Mobility</span>&nbsp;
             </button>
         </div>
         <div class="grid-item black-item span-five-six">
-            <button type="roll" name="agility" class="teal-header bold attribute-button roll-rolltemplate" data-i18n="agility-u" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Agility }} {{base-dice=[[@{agility} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
+            <button type="roll" name="agility" class="teal-header bold attribute-button roll-rolltemplate" data-i18n="agility-u" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Agility }} {{base-dice=[[@{agility} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
                 Agility</button>
-            <button type="roll" name="agility_api" class="teal-header bold attribute-button roll-api" value="@{roll_command} [Agility] [[ (@{agility}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[agility_api]">
+            <button type="roll" name="agility_api" class="teal-header bold attribute-button roll-api" value="@{roll_command_api} [Agility] [[ (@{agility}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[agility_api]">
                 &nbsp;<span >Agility</span>&nbsp;
                 </button>
             <!--span class="teal-header bold" data-i18n="agility-u">Agility</span-->
@@ -449,17 +448,17 @@
             <div class="float-left">
                 <input type="number" name="attr_wits" value="0" class="no-spin-input" title="@{wits}" />
             </div>
-            <button type="roll" name="wits" class="teal-header bold attribute-button roll-rolltemplate" data-i18n="wits-u" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Wits }} {{base-dice=[[@{wits} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
+            <button type="roll" name="wits" class="teal-header bold attribute-button roll-rolltemplate" data-i18n="wits-u" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Wits }} {{base-dice=[[@{wits} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
                 Wits</button>
-            <button type="roll" name="wits_api" class="teal-header bold attribute-button roll-api" value="@{roll_command} [Wits] [[ (@{wits}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[wits_api]">
+            <button type="roll" name="wits_api" class="teal-header bold attribute-button roll-api" value="@{roll_command_api} [Wits] [[ (@{wits}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[wits_api]">
                 &nbsp;<span >Wits</span>&nbsp;
             </button>
             
             <!--span class="teal-header bold" data-i18n="wits-u">Wits</span-->
         </div>
         <div class="grid-item span-ten-eleven">
-            <button type="roll" name="survival" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Survival }} {{base-dice=[[@{wits} + @{survival} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="survival-u">Survival</button>
-            <button type="roll" name="survival_api" class="button-skill roll-api" data-i18n="survival-u" value="@{roll_command} [Survival] [[(@{wits}+@{survival}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="{survival_api]">
+            <button type="roll" name="survival" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Survival }} {{base-dice=[[@{wits} + @{survival} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="survival-u">Survival</button>
+            <button type="roll" name="survival_api" class="button-skill roll-api" data-i18n="survival-u" value="@{roll_command_api} [Survival] [[(@{wits}+@{survival}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="{survival_api]">
                 &nbsp;<span >Survival</span>&nbsp;
             </button>
             <div class="float-right">
@@ -481,8 +480,8 @@
             <div class="float-left">
                 <input type="number" name="attr_piloting" value="0" class="no-spin-input optional-spinner-input" title="@{piloting}" />
             </div>
-            <button type="roll" name="piloting" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Piloting }} {{base-dice=[[@{agility} + @{piloting} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="piloting-u">Piloting</button>
-            <button type="roll" name="piloting_api" class="button-skill roll-api" data-i18n="piloting-u" value="@{roll_command} [Piloting] [[(@{agility}+@{piloting}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[piloting_api]">
+            <button type="roll" name="piloting" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Piloting }} {{base-dice=[[@{agility} + @{piloting} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="piloting-u">Piloting</button>
+            <button type="roll" name="piloting_api" class="button-skill roll-api" data-i18n="piloting-u" value="@{roll_command_api} [Piloting] [[(@{agility}+@{piloting}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[piloting_api]">
                 &nbsp;<span >Piloting</span>&nbsp;
             </button>
         </div>
@@ -492,8 +491,8 @@
             </div>
         </div>
         <div class="grid-item span-nine-ten">
-            <button type="roll" name="comtech" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Comtech }} {{base-dice=[[@{wits} + @{comtech} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="comtech-u">Comtech</button>
-            <button type="roll" name="comtech_api" class="button-skill roll-api" data-i18n="comtech-u" value="@{roll_command} [Comtech] [[(@{wits}+@{comtech}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[comtech_api]">
+            <button type="roll" name="comtech" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Comtech }} {{base-dice=[[@{wits} + @{comtech} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="comtech-u">Comtech</button>
+            <button type="roll" name="comtech_api" class="button-skill roll-api" data-i18n="comtech-u" value="@{roll_command_api} [Comtech] [[(@{wits}+@{comtech}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[comtech_api]">
                 &nbsp;<span >Commtect</span>&nbsp;
             </button>
             <div class="float-right">
@@ -517,23 +516,23 @@
             <div class="float-left">
                 <input type="number" name="attr_command" value="0" class="no-spin-input optional-spinner-input" title="@{command}" />
             </div>
-            <button type="roll" name="command" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Command }} {{base-dice=[[@{empathy} + @{command} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="command-u">Command</button>
-            <button type="roll" name="command_api" class="button-skill roll-api" data-i18n="command-u" value="@{roll_command} [Command] [[(@{empathy}+@{command}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[command_api]">
+            <button type="roll" name="command" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Command }} {{base-dice=[[@{empathy} + @{command} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="command-u">Command</button>
+            <button type="roll" name="command_api" class="button-skill roll-api" data-i18n="command-u" value="@{roll_command_api} [Command] [[(@{empathy}+@{command}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[command_api]">
                 &nbsp;<span >Command</span>&nbsp;
             </button>
         </div>
         <div class="grid-item black-item">
-            <button type="roll" name="empathy" class="teal-header bold attribute-button roll-rolltemplate" data-i18n="empathy-u" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Empathy }} {{base-dice=[[@{empathy} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
+            <button type="roll" name="empathy" class="teal-header bold attribute-button roll-rolltemplate" data-i18n="empathy-u" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Empathy }} {{base-dice=[[@{empathy} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}">
                 Empathy</button>
-            <button type="roll" name="empathy_api" class="teal-header bold attribute-button roll-api" data-i18n="empathy-u" value="@{roll_command} [Empathy] [[(@{empathy}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[empathy_api">
+            <button type="roll" name="empathy_api" class="teal-header bold attribute-button roll-api" data-i18n="empathy-u" value="@{roll_command_api} [Empathy] [[(@{empathy}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[empathy_api">
                 &nbsp;<span >Empathy</span>&nbsp;
             </button>
             
             <!--span class="teal-header bold" data-i18n="empathy-u">Empathy</span-->
         </div>
         <div class="grid-item span-eight-nine">
-            <button type="roll" name="medical_aid" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Medical Aid }} {{base-dice=[[@{empathy} + @{medical_aid} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="medical-aid-u" >Medical Aid</button>            
-            <button type="roll" name="medical-aid_api" class="button-skill roll-api" data-i18n="medical-aid-u" value="@{roll_command} [Medical Aid] [[(@{empathy}+@{medical_aid}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[medical-aid_api]">
+            <button type="roll" name="medical_aid" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Medical Aid }} {{base-dice=[[@{empathy} + @{medical_aid} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="medical-aid-u" >Medical Aid</button>            
+            <button type="roll" name="medical-aid_api" class="button-skill roll-api" data-i18n="medical-aid-u" value="@{roll_command_api} [Medical Aid] [[(@{empathy}+@{medical_aid}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[medical-aid_api]">
                 &nbsp;<span >Medical Aid</span>&nbsp;
             </button>
             <div class="float-right">
@@ -548,7 +547,7 @@
                 <span class="teal-header-gear-r gear-header showencumbrance">#</span>
             </div>
             <div class="vertical-adjust-one">
-                <input type="checkbox" name="attr_config_gearrepeatingonly" hidden class="gearrepeatingonly" />
+                <input type="checkbox" name="attr_config_gearrepeatingonly" hidden readonly class="gearrepeatingonly" />
                 <input type="text" name="attr_gear_item_one" value="" class="text-inv" title="@{gear_item_one}" spellcheck="false" data-i18n-placeholder="item-1-place" placeholder="Item 1"/>
 				<input type="number" name="attr_total_wt_item_one" value="(@{num_item_one})*(@{wt_item_one})" class="sheet-spinner-input-total showencumbrance" disabled/>
                 <!-- <input type="number" name="attr_wt_item_one" value="0" class="sheet-spinner-input sheet-spinner-input-wt"/> -->
@@ -705,8 +704,8 @@
             &nbsp;
         </div>
         <div class="grid-item span-six-thru-eight">
-            <button type="roll" name="manipulation" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Manipulation }} {{base-dice=[[@{empathy} + @{manipulation} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="manipulation-u">Manipulation</button>
-            <button type="roll" name="manipulation_api" class="button-skill roll-api" data-i18n="manipulation-u" value="@{roll_command} [Manipulation] [[(@{empathy}+@{manipulation}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[manipulation_api]">
+            <button type="roll" name="manipulation" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Manipulation }} {{base-dice=[[@{empathy} + @{manipulation} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="manipulation-u">Manipulation</button>
+            <button type="roll" name="manipulation_api" class="button-skill roll-api" data-i18n="manipulation-u" value="@{roll_command_api} [Manipulation] [[(@{empathy}+@{manipulation}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name}" title="[manipulation_api]">
                 &nbsp;<span >Manipulation</span>&nbsp;
             </button>
             <div class="float-right">
@@ -723,8 +722,8 @@
         </div> <!-- END OF ROW 11 -->
         
         <div class="grid-item span-five-six"> <!-- START OF ROW 12 -->
-            <button type="roll" name="armor" class="button-skill roll-rolltemplate roll-api" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armor} + ?{Modifiers|0} ]] }} {{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]] }}" data-i18n="armor-u">Armor</button>
-            <!-- <button type="roll" name="armor_api" class="button-skill roll-api" data-i18n="armor-u" value="@{roll_command} [Armor] [[(@{armor}+?{Modifiers|0})d6]] [[0d6]] --runas|@{character_name}" title="[armor_api]">
+            <button type="roll" name="armor" class="button-skill roll-rolltemplate roll-api" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armor} + ?{Modifiers|0} ]] }} {{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]] }}" data-i18n="armor-u">Armor</button>
+            <!-- <button type="roll" name="armor_api" class="button-skill roll-api" data-i18n="armor-u" value="@{roll_command_api} [Armor] [[(@{armor}+?{Modifiers|0})d6]] [[0d6]] --runas|@{character_name}" title="[armor_api]">
                 &nbsp;<span >Armor</span>&nbsp;
             </button> -->
             <div class="float-right">
@@ -780,8 +779,8 @@
             </div>
             <div class="tab-content tab-alpha-contents align-left vertical-adjust-one"> <!--TAB 1 1ST WEAPON -->
                 <input type="text" name="attr_weapon_one_name" value="" class="text-input seventy-seven-percent" title="@{weapon_one_name}" spellcheck="false"  data-i18n-placeholder="weapon-one-name-place" placeholder="Weapon One Name"/>
-                <button type="roll" name="weapon_one" class="button-skill roll-rolltemplate smaller-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_one_name} }} {{base-dice=[[@{weapon_one_skill} + @{weapon_one_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_one_bonus} }} {{current-damage=@{weapon_one_damage} }} {{current-range=@{weapon_one_range} }} {{current-comment=@{weapon_one_comment} }}" data-i18n="attack-u">Attack</button>
-                <button type="roll" name="weapon_one_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command} [@{weapon_one_name}] [[(@{weapon_one_skill}+@{weapon_one_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_one_bonus}, Damage @{weapon_one_damage}, @{weapon_one_range} Range --|@{weapon_one_comment}" title="[weapon_one_api]">
+                <button type="roll" name="weapon_one" class="button-skill roll-rolltemplate smaller-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_one_name} }} {{base-dice=[[@{weapon_one_skill} + @{weapon_one_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_one_bonus} }} {{current-damage=@{weapon_one_damage} }} {{current-range=@{weapon_one_range} }} {{current-comment=@{weapon_one_comment} }}" data-i18n="attack-u">Attack</button>
+                <button type="roll" name="weapon_one_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command_api} [@{weapon_one_name}] [[(@{weapon_one_skill}+@{weapon_one_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_one_bonus}, Damage @{weapon_one_damage}, @{weapon_one_range} Range --|@{weapon_one_comment}" title="[weapon_one_api]">
                     &nbsp;<span >Attack</span>&nbsp;
                 </button>
                 <hr class="dotted-line"/>
@@ -834,8 +833,8 @@
             </div>
             <div class="tab-content tab-beta-contents align-left vertical-adjust-one"> <!--TAB 2 2ND WEAPON -->
                 <input type="text" name="attr_weapon_two_name" value="" class="text-input seventy-seven-percent" title="@{weapon_two_name}" spellcheck="false" data-i18n-placeholder="weapon-two-name-place" placeholder="Weapon Two Name"/>
-                <button type="roll" name="weapon_two" class="button-skill roll-rolltemplate smaller-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_two_name} }} {{base-dice=[[@{weapon_two_skill} + @{weapon_two_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_two_bonus} }} {{current-damage=@{weapon_two_damage} }} {{current-range=@{weapon_two_range} }} {{current-comment=@{weapon_two_comment} }}"  data-i18n="attack-u">Attack</button>
-                <button type="roll" name="weapon_two_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command} [@{weapon_two_name}] [[(@{weapon_two_skill}+@{weapon_two_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_two_bonus}, Damage @{weapon_two_damage}, @{weapon_two_range} Range --|@{weapon_two_comment}" title="[weapon_two_api]">
+                <button type="roll" name="weapon_two" class="button-skill roll-rolltemplate smaller-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_two_name} }} {{base-dice=[[@{weapon_two_skill} + @{weapon_two_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_two_bonus} }} {{current-damage=@{weapon_two_damage} }} {{current-range=@{weapon_two_range} }} {{current-comment=@{weapon_two_comment} }}"  data-i18n="attack-u">Attack</button>
+                <button type="roll" name="weapon_two_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command_api} [@{weapon_two_name}] [[(@{weapon_two_skill}+@{weapon_two_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_two_bonus}, Damage @{weapon_two_damage}, @{weapon_two_range} Range --|@{weapon_two_comment}" title="[weapon_two_api]">
                     &nbsp;<span >Attack</span>&nbsp;
                 </button>
                 <hr class="dotted-line"/>
@@ -887,8 +886,8 @@
             </div>
             <div class="tab-content tab-gamma-contents align-left vertical-adjust-one"> <!--TAB 3 3RD WEAPON -->
                 <input type="text" name="attr_weapon_three_name" value="" class="text-input seventy-seven-percent" title="@{weapon_three_name}" spellcheck="false" data-i18n-placeholder="weapon-three-name-place" placeholder="Weapon Three Name"/>
-                <button type="roll" name="weapon_three" class="button-skill roll-rolltemplate smaller-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_three_name} }} {{base-dice=[[@{weapon_three_skill} + @{weapon_three_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_three_bonus} }} {{current-damage=@{weapon_three_damage} }} {{current-range=@{weapon_three_range} }} {{current-comment=@{weapon_three_comment} }}" data-i18n="attack-u">Attack</button>
-                <button type="roll" name="weapon_three_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command} [@{weapon_three_name}] [[(@{weapon_three_skill}+@{weapon_three_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_three_bonus}, Damage @{weapon_three_damage},@{weapon_three_range} Range  --|@{weapon_three_comment}" title="[weapon_three_api]">
+                <button type="roll" name="weapon_three" class="button-skill roll-rolltemplate smaller-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_three_name} }} {{base-dice=[[@{weapon_three_skill} + @{weapon_three_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_three_bonus} }} {{current-damage=@{weapon_three_damage} }} {{current-range=@{weapon_three_range} }} {{current-comment=@{weapon_three_comment} }}" data-i18n="attack-u">Attack</button>
+                <button type="roll" name="weapon_three_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command_api} [@{weapon_three_name}] [[(@{weapon_three_skill}+@{weapon_three_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_three_bonus}, Damage @{weapon_three_damage},@{weapon_three_range} Range  --|@{weapon_three_comment}" title="[weapon_three_api]">
                     &nbsp;<span >Attack</span>&nbsp;
                 </button>
                 <hr class="dotted-line">
@@ -940,8 +939,8 @@
             </div>
             <div class="tab-content tab-delta-contents align-left vertical-adjust-one"> <!--TAB 4 4TH WEAPON -->
                 <input type="text" name="attr_weapon_four_name" value="" class="text-input seventy-seven-percent" title="@{weapon_four_name}" spellcheck="false" data-i18n-placeholder="weapon-four-name-place" placeholder="Weapon Four Name"/>
-                <button type="roll" name="weapon_four" class="button-skill roll-rolltemplate smaller-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_four_name} }} {{base-dice=[[@{weapon_four_skill} + @{weapon_four_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_four_bonus} }} {{current-damage=@{weapon_four_damage} }} {{current-range=@{weapon_four_range} }} {{current-comment=@{weapon_four_comment} }}" data-i18n="attack-u" >Attack</button>
-                <button type="roll" name="weapon_four_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command} [@{weapon_four_name}] [[(@{weapon_four_skill}+@{weapon_four_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_four_bonus}, Damage @{weapon_four_damage}, @{weapon_four_range} Range --|@{weapon_four_comment}" title="[weapon_four_api]">
+                <button type="roll" name="weapon_four" class="button-skill roll-rolltemplate smaller-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_four_name} }} {{base-dice=[[@{weapon_four_skill} + @{weapon_four_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_four_bonus} }} {{current-damage=@{weapon_four_damage} }} {{current-range=@{weapon_four_range} }} {{current-comment=@{weapon_four_comment} }}" data-i18n="attack-u" >Attack</button>
+                <button type="roll" name="weapon_four_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command_api} [@{weapon_four_name}] [[(@{weapon_four_skill}+@{weapon_four_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_four_bonus}, Damage @{weapon_four_damage}, @{weapon_four_range} Range --|@{weapon_four_comment}" title="[weapon_four_api]">
                     &nbsp;<span >Attack</span>&nbsp;
                 </button>
                 <hr class="dotted-line">
@@ -991,8 +990,8 @@
             </div>
             <div class="tab-content tab-epsilon-contents align-left vertical-adjust-one"> <!--TAB 5 5TH WEAPON -->
                 <input type="text" name="attr_weapon_five_name" value="" class="text-input seventy-seven-percent" title="@{weapon_five_name}" spellcheck="false" data-i18n-placeholder="weapon-five-name-place" placeholder="Weapon Five Name"/>
-                <button type="roll" name="weapon_five" class="button-skill roll-rolltemplate smaller-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_five_name} }} {{base-dice=[[@{weapon_five_skill} + @{weapon_five_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_five_bonus} }} {{current-damage=@{weapon_five_damage} }} {{current-range=@{weapon_five_range} }} {{current-comment=@{weapon_five_comment} }}"  data-i18n="attack-u" >Attack</button>
-                <button type="roll" name="weapon_five_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command} [@{weapon_five_name}] [[(@{weapon_five_skill}+@{weapon_five_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_five_bonus}, Damage @{weapon_fivee_damage}, @{weapon_five_range} Range --|@{weapon_five_comment}" title="[weapon_five_api]">
+                <button type="roll" name="weapon_five" class="button-skill roll-rolltemplate smaller-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_five_name} }} {{base-dice=[[@{weapon_five_skill} + @{weapon_five_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_five_bonus} }} {{current-damage=@{weapon_five_damage} }} {{current-range=@{weapon_five_range} }} {{current-comment=@{weapon_five_comment} }}"  data-i18n="attack-u" >Attack</button>
+                <button type="roll" name="weapon_five_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command_api} [@{weapon_five_name}] [[(@{weapon_five_skill}+@{weapon_five_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_five_bonus}, Damage @{weapon_fivee_damage}, @{weapon_five_range} Range --|@{weapon_five_comment}" title="[weapon_five_api]">
                     &nbsp;<span >Attack</span>&nbsp;
                 </button>
                 <hr class="dotted-line">
@@ -1044,8 +1043,8 @@
             </div>
             <div class="tab-content tab-zeta-contents align-left vertical-adjust-one"> <!--TAB 6 6TH WEAPON -->
                 <input type="text" name="attr_weapon_six_name" value="" class="text-input seventy-seven-percent" title="@{weapon_six_name}" spellcheck="false" data-i18n-placeholder="weapon-six-name-place" placeholder="Weapon Six Name"/>
-                <button type="roll" name="weapon_six" class="button-skill roll-rolltemplate smaller-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_six_name} }} {{base-dice=[[@{weapon_six_skill} + @{weapon_six_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_six_bonus} }} {{current-damage=@{weapon_six_damage} }} {{current-range=@{weapon_six_range} }} {{current-comment=@{weapon_six_comment} }}"  data-i18n="attack-u" >Attack</button>
-                <button type="roll" name="weapon_six_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command} [@{weapon_six_name}] [[(@{weapon_six_skill}+@{weapon_six_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_six_bonus}, Damage @{weapon_six_damage}, @{weapon_six_range} Range --|@{weapon_six_comment}" title="[weapon_six_api]">
+                <button type="roll" name="weapon_six" class="button-skill roll-rolltemplate smaller-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=@{weapon_six_name} }} {{base-dice=[[@{weapon_six_skill} + @{weapon_six_bonus} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{weapon_six_bonus} }} {{current-damage=@{weapon_six_damage} }} {{current-range=@{weapon_six_range} }} {{current-comment=@{weapon_six_comment} }}"  data-i18n="attack-u" >Attack</button>
+                <button type="roll" name="weapon_six_api" class="button-skill roll-api smaller-skill" data-i18n="attack-u" value="@{roll_command_api} [@{weapon_six_name}] [[(@{weapon_six_skill}+@{weapon_six_bonus}+?{Modifiers|0})d6]] [[@{stress}d6]] --runas|@{character_name} --|Bonus @{weapon_six_bonus}, Damage @{weapon_six_damage}, @{weapon_six_range} Range --|@{weapon_six_comment}" title="[weapon_six_api]">
                     &nbsp;<span >Attack</span>&nbsp;
                 </button>
                 <hr class="dotted-line">
@@ -1101,26 +1100,26 @@
             <div class="black-floating-header">
                 <span class="teal-header"  data-i18n="consumables-u" >Consumables</span>
             </div>
-            <button type="roll" name="air" class="button-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Air Supply Roll }} {{supply-dice=[[ @{air} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}" data-i18n="air-u">Air</button>
+            <button type="roll" name="air" class="button-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Air Supply Roll }} {{supply-dice=[[ @{air} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}" data-i18n="air-u">Air</button>
             <div class="float-right">
                 <input type="number" name="attr_air" value="0" class="no-spin-input optional-spinner-input" title="@{air}" />
             </div>
         </div>
         <div class="grid-item span-three-four">
-            <button type="roll" name="food" class="button-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Food Supply Roll }} {{supply-dice=[[ @{food} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}" data-i18n="food-u" >Food</button>
+            <button type="roll" name="food" class="button-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Food Supply Roll }} {{supply-dice=[[ @{food} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}" data-i18n="food-u" >Food</button>
             <div class="float-right">
                 <input type="number" name="attr_food" value="0" class="no-spin-input optional-spinner-input" title="@{food}" />
             </div>
         </div> <!-- END OF ROW 14 -->
         
         <div class="grid-item span-one-two"> <!-- START OF ROW 15 -->
-            <button type="roll" name="power" class="button-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Power Supply Roll }} {{supply-dice=[[ @{power} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}" data-i18n="power-u" >Power</button>
+            <button type="roll" name="power" class="button-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Power Supply Roll }} {{supply-dice=[[ @{power} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}" data-i18n="power-u" >Power</button>
             <div class="float-right">
                 <input type="number" name="attr_power" value="0" class="no-spin-input optional-spinner-input" title="@{power}" />
             </div>
         </div>
         <div class="grid-item span-three-four">
-            <button type="roll" name="water" class="button-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Water Supply Roll }} {{supply-dice=[[ @{water} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}"data-i18n="water-u" >Water</button>
+            <button type="roll" name="water" class="button-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Water Supply Roll }} {{supply-dice=[[ @{water} ]] }} {{supply-roll-one=[[1d6]] }} {{supply-roll-two=[[1d6]] }} {{supply-roll-three=[[1d6]] }} {{supply-roll-four=[[1d6]] }} {{supply-roll-five=[[1d6]] }} {{supply-roll-six=[[1d6]] }}"data-i18n="water-u" >Water</button>
             <div class="float-right">
                 <input type="number" name="attr_water" value="0" class="no-spin-input optional-spinner-input" title="@{water}" />
             </div>
@@ -1240,8 +1239,8 @@
             <div class="dark-teal-header some-padding pad-left" data-i18n="ship-hull-u">Hull</div>
         </div>
         <div class="grid-item span-eight-thru-ten span-row7 flex-row flex-content-end flex-items-align-center clip-edges w50pc">
-            <button type="roll" name="ship_armor" class="button-skill pad-right roll-rolltemplate roll-api" value="@{secret_roll} &{template:alien} {{character-name=@{ship-name} }} {{roll-name=Ship Armor }} {{base-dice=[[@{ship_armor} + ?{Modifiers|0} ]] }} {{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]] }} " data-i18n="ship-armor-u" >Armor</button>
-            <!-- <button type="roll" name="ship_armor_api" class="button-skill pad-right roll-api" data-i18n="ship-armor-u" value="@{roll_command} [Ship Armor] [[(@{ship_armor}+?{Modifiers|0})d6]] [[0d6]] --runas|@{character_name}" title="[ship_armor_api]">
+            <button type="roll" name="ship_armor" class="button-skill pad-right roll-rolltemplate roll-api" value="@{roll_command} &{template:alien} {{character-name=@{ship-name} }} {{roll-name=Ship Armor }} {{base-dice=[[@{ship_armor} + ?{Modifiers|0} ]] }} {{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]] }} " data-i18n="ship-armor-u" >Armor</button>
+            <!-- <button type="roll" name="ship_armor_api" class="button-skill pad-right roll-api" data-i18n="ship-armor-u" value="@{roll_command_api} [Ship Armor] [[(@{ship_armor}+?{Modifiers|0})d6]] [[0d6]] --runas|@{character_name}" title="[ship_armor_api]">
                 &nbsp;<span >Armor</span>&nbsp;
             </button> -->
             <div class="some-padding">
@@ -1504,8 +1503,8 @@
                     </div>
                     <div class="grid-item weapon-item type">
                         <input type="hidden" name="attr_armament1_rangemod" readonly hidden />
-                        <button type="roll" name="armament1" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament1_name}}} {{roll-type=@{armament1_type}}} {{base-dice=[[ @{armament1_bonus} + @{armament1_ranged} + @{armament1_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament1_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament1_bonus} }} {{current-damage=@{armament1_damage} }} {{current-range=@{armament1_targetrange} }} {{current-comment=@{armament1_comment} }}" data-i18n="attack-u">Attack</button>
-                        <button type="roll" name="armament1_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command} [@{armament1_name}] [[(@{armament1_bonus}+@{armament1_ranged}+@{armament1_rangemod}+?{Modifiers|0})d6]] [[@{armament1_stress}d6]] --runas|@{ship-name} --|Skill @{armament1_ranged}+@{armament1_bonus}, Damage @{armament1_damage}, @{armament1_targetrange} Range --|@{armament1_comment}" title="[armament1_api]">
+                        <button type="roll" name="armament1" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament1_name}}} {{roll-type=@{armament1_type}}} {{base-dice=[[ @{armament1_bonus} + @{armament1_ranged} + @{armament1_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament1_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament1_bonus} }} {{current-damage=@{armament1_damage} }} {{current-range=@{armament1_targetrange} }} {{current-comment=@{armament1_comment} }}" data-i18n="attack-u">Attack</button>
+                        <button type="roll" name="armament1_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command_api} [@{armament1_name}] [[(@{armament1_bonus}+@{armament1_ranged}+@{armament1_rangemod}+?{Modifiers|0})d6]] [[@{armament1_stress}d6]] --runas|@{ship-name} --|Skill @{armament1_ranged}+@{armament1_bonus}, Damage @{armament1_damage}, @{armament1_targetrange} Range --|@{armament1_comment}" title="[armament1_api]">
                             &nbsp;<span >Attack</span>&nbsp;
                         </button>
                     </div>
@@ -1565,8 +1564,8 @@
                     </div>
                     <div class="grid-item weapon-item type">
                         <input type="hidden" name="attr_armament2_rangemod" readonly hidden />
-                        <button type="roll" name="armament2" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament2_name}}} {{roll-type=@{armament2_type}}} {{base-dice=[[ @{armament2_bonus} + @{armament2_ranged} + @{armament2_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament2_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament2_bonus} }} {{current-damage=@{armament2_damage} }} {{current-range=@{armament2_targetrange} }} {{current-comment=@{armament2_comment} }}" data-i18n="attack-u">Attack</button>
-                        <button type="roll" name="armament2_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command} [@{armament2_name}] [[(@{armament2_bonus}+@{armament2_ranged}+@{armament2_rangemod}+?{Modifiers|0})d6]] [[@{armament2_stress}d6]] --runas|@{ship-name} --|Skill @{armament2_ranged}+@{armament2_bonus}, Damage @{armament2_damage}, @{armament2_targetrange} Range --|@{armament2_comment}" title="[armament2_api]">
+                        <button type="roll" name="armament2" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament2_name}}} {{roll-type=@{armament2_type}}} {{base-dice=[[ @{armament2_bonus} + @{armament2_ranged} + @{armament2_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament2_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament2_bonus} }} {{current-damage=@{armament2_damage} }} {{current-range=@{armament2_targetrange} }} {{current-comment=@{armament2_comment} }}" data-i18n="attack-u">Attack</button>
+                        <button type="roll" name="armament2_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command_api} [@{armament2_name}] [[(@{armament2_bonus}+@{armament2_ranged}+@{armament2_rangemod}+?{Modifiers|0})d6]] [[@{armament2_stress}d6]] --runas|@{ship-name} --|Skill @{armament2_ranged}+@{armament2_bonus}, Damage @{armament2_damage}, @{armament2_targetrange} Range --|@{armament2_comment}" title="[armament2_api]">
                             &nbsp;<span >Attack</span>&nbsp;
                         </button>
                    </div>
@@ -1626,8 +1625,8 @@
                     </div>
                     <div class="grid-item weapon-item type">
                         <input type="hidden" name="attr_armament3_rangemod" readonly hidden />
-                        <button type="roll" name="armament3" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament3_name}}} {{roll-type=@{armament3_type}}} {{base-dice=[[@{armament3_bonus} + @{armament3_ranged} + @{armament3_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament3_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament3_bonus} }} {{current-damage=@{armament3_damage} }} {{current-range=@{armament3_targetrange} }} {{current-comment=@{armament3_comment} }}" data-i18n="attack-u">Attack</button>
-                        <button type="roll" name="armament3_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command} [@{armament3_name}] [[(@{armament3_bonus}+@{armament3_ranged}+@{armament3_rangemod}+?{Modifiers|0})d6]] [[@{armament3_stress}d6]] --runas|@{ship-name} --|Skill @{armament3_ranged}+@{armament3_bonus}, Damage @{armament3_damage}, @{armament3_targetrange} Range --|@{armament3_comment}" title="[armament3_api]">
+                        <button type="roll" name="armament3" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament3_name}}} {{roll-type=@{armament3_type}}} {{base-dice=[[@{armament3_bonus} + @{armament3_ranged} + @{armament3_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament3_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament3_bonus} }} {{current-damage=@{armament3_damage} }} {{current-range=@{armament3_targetrange} }} {{current-comment=@{armament3_comment} }}" data-i18n="attack-u">Attack</button>
+                        <button type="roll" name="armament3_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command_api} [@{armament3_name}] [[(@{armament3_bonus}+@{armament3_ranged}+@{armament3_rangemod}+?{Modifiers|0})d6]] [[@{armament3_stress}d6]] --runas|@{ship-name} --|Skill @{armament3_ranged}+@{armament3_bonus}, Damage @{armament3_damage}, @{armament3_targetrange} Range --|@{armament3_comment}" title="[armament3_api]">
                             &nbsp;<span >Attack</span>&nbsp;
                         </button>
                    </div>
@@ -1687,8 +1686,8 @@
                     </div>
                     <div class="grid-item weapon-item type">
                         <input type="hidden" name="attr_armament4_rangemod" readonly hidden />
-                        <button type="roll" name="armament4" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament4_name}}} {{roll-type=@{armament4_type}}} {{base-dice=[[@{armament4_bonus} + @{armament4_ranged} + @{armament4_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament4_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament4_bonus} }} {{current-damage=@{armament4_damage} }} {{current-range=@{armament4_targetrange} }} {{current-comment=@{armament4_comment} }}" data-i18n="attack-u">Attack</button>
-                        <button type="roll" name="armament4_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command} [@{armament4_name}] [[(@{armament4_bonus}+@{armament4_ranged}+@{armament4_rangemod}+?{Modifiers|0})d6]] [[@{armament4_stress}d6]] --runas|@{ship-name} --|Skill @{armament4_ranged}+@{armament4_bonus}, Damage @{armament4_damage}, @{armament4_targetrange} Range --|@{armament4_comment}" title="[armament4_api]">
+                        <button type="roll" name="armament4" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament4_name}}} {{roll-type=@{armament4_type}}} {{base-dice=[[@{armament4_bonus} + @{armament4_ranged} + @{armament4_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament4_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament4_bonus} }} {{current-damage=@{armament4_damage} }} {{current-range=@{armament4_targetrange} }} {{current-comment=@{armament4_comment} }}" data-i18n="attack-u">Attack</button>
+                        <button type="roll" name="armament4_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command_api} [@{armament4_name}] [[(@{armament4_bonus}+@{armament4_ranged}+@{armament4_rangemod}+?{Modifiers|0})d6]] [[@{armament4_stress}d6]] --runas|@{ship-name} --|Skill @{armament4_ranged}+@{armament4_bonus}, Damage @{armament4_damage}, @{armament4_targetrange} Range --|@{armament4_comment}" title="[armament4_api]">
                             &nbsp;<span >Attack</span>&nbsp;
                         </button>
                    </div>
@@ -1748,8 +1747,8 @@
                     </div>
                     <div class="grid-item weapon-item type">
                         <input type="hidden" name="attr_armament5_rangemod" readonly hidden />
-                        <button type="roll" name="armament5" class="button-skill roll-rolltemplate" value="@{secret_roll} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament5_name}}} {{roll-type=@{armament5_type}}} {{base-dice=[[@{armament5_bonus} + @{armament5_ranged} + @{armament5_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament5_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament5_bonus} }} {{current-damage=@{armament5_damage} }} {{current-range=@{armament5_targetrange} }} {{current-comment=@{armament5_comment} }}" data-i18n="attack-u">Attack</button>
-                        <button type="roll" name="armament5_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command} [@{armament5_name}] [[(@{armament5_bonus}+@{armament5_ranged}+@{armament5_rangemod}+?{Modifiers|0})d6]] [[@{armament5_stress}d6]] --runas|@{ship-name} --|Skill @{armament5_ranged}+@{armament5_bonus}, Damage @{armament5_damage}, @{armament5_targetrange} Range --|@{armament5_comment}" title="[armament5_api]">
+                        <button type="roll" name="armament5" class="button-skill roll-rolltemplate" value="@{roll_command} &{template:alien} {{character-name=@{ship-name}}} {{roll-name=@{armament5_name}}} {{roll-type=@{armament5_type}}} {{base-dice=[[@{armament5_bonus} + @{armament5_ranged} + @{armament5_rangemod} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{armament5_stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }} {{current-bonus=@{armament5_bonus} }} {{current-damage=@{armament5_damage} }} {{current-range=@{armament5_targetrange} }} {{current-comment=@{armament5_comment} }}" data-i18n="attack-u">Attack</button>
+                        <button type="roll" name="armament5_api" class="button-skill roll-api" data-i18n="attack-u" value="@{roll_command_api} [@{armament5_name}] [[(@{armament5_bonus}+@{armament5_ranged}+@{armament5_rangemod}+?{Modifiers|0})d6]] [[@{armament5_stress}d6]] --runas|@{ship-name} --|Skill @{armament5_ranged}+@{armament5_bonus}, Damage @{armament5_damage}, @{armament5_targetrange} Range --|@{armament5_comment}" title="[armament5_api]">
                             &nbsp;<span >Attack</span>&nbsp;
                         </button>
                    </div>
@@ -1811,12 +1810,12 @@
                 <span class="teal-header" data-i18n="skills">SKILLS</span>
             </div>
             <div class="vertical-adjust-one flexlist">                    
-                <button type="roll" name="observation" class="button-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Observation }} {{base-dice=[[@{wits} + @{observation} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="observation-u" data-i18n-title="skill-xeno-desc">Observation</button>
+                <button type="roll" name="observation" class="button-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Observation }} {{base-dice=[[@{wits} + @{observation} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="observation-u" data-i18n-title="skill-xeno-desc">Observation</button>
 
                 <!-- <span class="dark-teal-header condition-title" data-i18n="observation-u">Observation</span> -->
                 <input type="number" name="attr_observation" value="1" class="no-spin-input optional-spinner-input" title="@{observation}" min="0"/>
                 <hr class="dotted-line">
-                <button type="roll" name="mobility" class="button-skill" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Mobility }} {{base-dice=[[@{agility} + @{mobility} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="mobility-u" data-i18n-title="skill-xeno-desc">Mobility</button>
+                <button type="roll" name="mobility" class="button-skill" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Mobility }} {{base-dice=[[@{agility} + @{mobility} + ?{Modifiers|0} ]] }} {{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]] }}  {{stress-dice=[[@{stress}]] }} {{stress-roll-one=[[1d6]] }} {{stress-roll-two=[[1d6]] }} {{stress-roll-three=[[1d6]] }} {{stress-roll-four=[[1d6]] }} {{stress-roll-five=[[1d6]] }} {{stress-roll-six=[[1d6]] }} {{stress-roll-seven=[[1d6]] }} {{stress-roll-eight=[[1d6]] }} {{stress-roll-nine=[[1d6]] }} {{stress-roll-ten=[[1d6]] }}" data-i18n="mobility-u" data-i18n-title="skill-xeno-desc">Mobility</button>
            <!-- <span class="dark-teal-header condition-title" data-i18n="mobility-u">Mobility</span> -->
                 <input type="number" name="attr_mobility" value="1" class="no-spin-input optional-spinner-input" title="@{mobility}" min="0"/>
                 <hr class="dotted-line">
@@ -1915,13 +1914,13 @@
             <div class="vertical-adjust-one">
                 <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="/w gm" name="attr_secret_roll" hidden>
+                    <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>
-                    <button type="roll" class="button-skill button-alpha" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=*( 1d6 )* }} {{roll-dice=[[ 1d6 ]] }}" name="one_die_six" ><span data-i18n="1d6-u">1d6</span></button>
+                    <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>
-                    <button type="roll" class="button-skill button-beta" value="@{secret_roll} &{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="@{secret_roll} &{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>
+                    <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>
             </div>
         </div>
@@ -1932,12 +1931,12 @@
             </div>
             <div class="armor">
                 <div class="align-right cover-90">
-                    <button type="roll" name="armor" class="button-skill flex-center" data-i18n="armor-u" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armor} + ?{Modifiers|0} ]] }} {{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]] }}">
+                    <button type="roll" name="armor" class="button-skill flex-center" data-i18n="armor-u" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armor} + ?{Modifiers|0} ]] }} {{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]] }}">
                         Armor
                     </button>                   
                     <input type="number" name="attr_armor" value="0" class="no-spin-input optional-spinner-input" title="@{armor}" min="0"/>
                     <hr class="dotted-line">
-                    <button type="roll" name="armor" class="button-skill flex-centeri" data-i18n="armor-vs-fire" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armorvsfire} + ?{Modifiers|0} ]] }} {{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]] }}">
+                    <button type="roll" name="armor" class="button-skill flex-centeri" data-i18n="armor-vs-fire" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armorvsfire} + ?{Modifiers|0} ]] }} {{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]] }}">
                         Armor vs fire
                     </button>  
                     
@@ -1945,13 +1944,13 @@
                     <hr class="dotted-line">
                 </div>
                 <div class="align-right cover-90">
-                    <button type="roll" name="armor" class="button-skill button-armorvs flex-center" data-i18n="armor-vs" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armorvs} + ?{Modifiers|0} ]] }} {{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]] }}">
+                    <button type="roll" name="armor" class="button-skill button-armorvs flex-center" data-i18n="armor-vs" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Armor Roll }} {{base-dice=[[@{armorvs} + ?{Modifiers|0} ]] }} {{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]] }}">
                         Armor vs 
                     </button> 
                     <input type="text" name="attr_armorvsname" placeholder="...">
                     <input type="number" name="attr_armorvs" value="0" class="no-spin-input optional-spinner-input" title="@{armorvs}" min="0"/>
                     <hr class="dotted-line">
-                    <button type="roll" class="button-skill" data-i18n="acid-splash" value="@{secret_roll} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Acid Splash }} {{base-dice=[[@{acidsplash} + ?{Damage taken|0} ]] }} {{current-damage=@{acidsplash} }} {{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="acidsplash_roll" >
+                    <button type="roll" class="button-skill" data-i18n="acid-splash" value="@{roll_command} &{template:alien} {{character-name=@{character_name} }} {{roll-name=Acid Splash }} {{base-dice=[[@{acidsplash} + ?{Damage taken|0} ]] }} {{current-damage=@{acidsplash} }} {{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="acidsplash_roll" >
                         Acid splash
                     </button>   
                     <input type="number" name="attr_acidsplash" value="0" class="no-spin-input optional-spinner-input" title="@{acidsplash}" min="0"/>
@@ -2146,6 +2145,19 @@
                 </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.02 <br/>(2022-03-30)</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 the handling of secret (whispered) rolls so that it works across tabs and different roll types. Also, it no longer resets when opening the sheet. An upgrade function will ensure setting stays same as before. </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="">Please note an upcoming release will fix the Default Sheet Settings, and it seems like there is no way to prevent the game default settings from overriding the local settings for each sheet. This change will be announced later, and will require you to reset your sheet configuraiton if different from the game default. </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.01 <br/>(2022-03-20)</span>
@@ -2875,7 +2887,7 @@
 
                 {{#rollGreater() stress-dice 0}}
                 <div class="template-grid-item template-span-half2">
-                    <span data-i18n="template-stress" class="template-stress">Panic: </span>
+                    <span data-i18n="template-stress" class="template-stress">Stress: </span>
                 </div>
                 {{/rollGreater() stress-dice 0}}
                 {{#rollLess() stress-dice 1}}
@@ -3029,7 +3041,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-stress" class="template-stress">Stress: </span>
                         </div>
                         {{/stress-dice}}
                         {{^stress-dice}}
@@ -3290,10 +3302,13 @@
                         config_notice: 1
                     });
                     break;  
+                case actual < float(4.02) : 
+                    clog(`New version upgrade needed. Sheet version: ${sheet}, actual: ${actual}`);
+                    upg_4_02();
                 case actual < sheet :
                     // This can be use as example of upgrade handling, use specific versions in the case logic to handle version specific upgrade of attributes, e.g. actual < 2.10 :
                     // Any upgrade handling needs to be done above this one, and may set the actual variable to be same as sheet to avoid doing the below setAttrs twice.
-                    clog(`New version identified. New char: ${newchar}, sheet version: ${sheet}, actual: ${actual}`);
+                    clog(`Updating version. Sheet version: ${sheet}, actual: ${actual}`);
                     // Add reference to upgrade function here, if needed, e.g. upgrade_to_2.24() 
                     setAttrs({
                         version: sheet,
@@ -3305,8 +3320,32 @@
             }
         });
     });
-
-
+    const upg_4_02 = () => {
+        //clog("==== Upgrading to version 4.02 ====");
+        getAttrs(['config_apirolls', 'secret_roll_api','secret_roll', 'config_apirolls', 'config_advencumbrance'], (values) => {
+            // // // Secret Rolls // // // 
+            const sa = values.secret_roll_api, 
+                s = values.secret_roll,
+                api = values.config_apirolls; 
+            var val = "";            
+            clog(`upgrading secret rolls. secret api: ${sa}, secret rolls : ${s}, api enabled : ${api}`);
+            clog(`upgrading secret rolls. secret api: ${!!sa}, secret rolls : ${!!s}, api enabled : ${!!api}`);
+            if ( (api == "on" || api == 1) && typeof sa !== "undefined" ) {
+                val = ( sa == "1" || sa == "!alienrw" || sa == "w" ) ? 1 : 0; 
+            } else {
+                val = ( s == "1" || s == "/w gm" ) ? 1 : 0;
+            }
+            clog(`secret roll new : ${val}`);   
+            const r = ( val == 1 || val == "1" ) ? "/w gm" : "", 
+                a = ( val == 1 || val == "1" ) ?"!alienrw" : "!alienr";
+            clog(`Secret roll ${r}, secret api ${a}`);
+            setAttrs({
+                secret_roll: val,
+                roll_command: r,
+                roll_command_api: a
+            });
+        });  
+    }
     
     // Parsed Roll, triggered from sheet. Need to add logic and attributes for pushing rolls, keeping this for future additions. 
     const rollFirst = async (ev) => {
@@ -3327,7 +3366,7 @@
         for(let i = 1; i <= total; i++) { baseStr += "[[1d6]] "; }
         for(let i = 1; i <= stress; i++) { stressStr += "[[1d6]] "; }
         
-        let rollBase = `@{secret_roll} &{template:aliens} {{character-name=${attrs.character_name} }} {{roll-name=${rollName} }} {{base-dice=${baseStr} }} {{stress-dice=${stressStr} }} {{passthroughdata=[[0]]}} {{buttonlabel=Push Roll}} {{buttonlink=pushroll}}`;
+        let rollBase = `@{roll_command} &{template:aliens} {{character-name=${attrs.character_name} }} {{roll-name=${rollName} }} {{base-dice=${baseStr} }} {{stress-dice=${stressStr} }} {{passthroughdata=[[0]]}} {{buttonlabel=Push Roll}} {{buttonlink=pushroll}}`;
         let firstRoll = await startRoll(rollBase);
         //    rollValue = firstRoll.results.roll1.result;
         clog(`First roll data: ${JSON.stringify(firstRoll)}`);
@@ -3380,19 +3419,20 @@
     });
     */
 
-    on('change:secret_roll_api sheet:opened', (ev) => {
-        getAttrs(['secret_roll_api', 'roll_command'], (values) => {
-            var s = values.secret_roll_api; 
-            var r = "";
+    on('change:secret_roll', (ev) => {
+        getAttrs(['secret_roll', 'roll_command', 'roll_command_api', ], (values) => {
+            clog(`Secret roll update: ${JSON.stringify(ev)}`);
+            const s = values.secret_roll;
+            var r = "/w gm", 
+                a = "!alienrw";
+            clog("Testing secret rolls: "+ !( s == "0" || !s ));
             if ( s == "0" || !s ) {
-                s = "!alienr";
-            } else {
-                s = "!alienrw"
-                r = "/w gm"; 
-            }
+                r = "";
+                a = "!alienr";
+            } 
             setAttrs({
-                roll_command: s,
-                secret_roll: r
+                roll_command: r,
+                roll_command_api: a
             });
         });
     });