diff --git a/Mongoose_Traveller2e/MongooseTraveller.css b/Mongoose_Traveller2e/MongooseTraveller.css
index 8d26c92baf..b08357e88d 100644
--- a/Mongoose_Traveller2e/MongooseTraveller.css
+++ b/Mongoose_Traveller2e/MongooseTraveller.css
@@ -402,12 +402,12 @@ input.sheet-skillbox[type="checkbox"]:checked + span {
 }
 
     /*==== Button Reset ====*/
-button[type="roll"]:before {
+button[type="roll"]:before, button[type="action"]:before {
     content: ""!important;
     display: none;
 }
 
-button[type="roll"] {
+button[type="roll"], button[type="action"] {
     width: 95%;
     height:24px;
     padding-bottom: 0;
@@ -436,7 +436,7 @@ button[type="roll"]:hover {
     color:white
 }
 
-button[type="roll"] label, button[type="roll"] input {
+button[type="roll"] label, button[type="roll"] input, button[type="action"] label, button[type="action"] input {
     height:24px;
     line-height: 24px;
     text-align:center;
@@ -466,7 +466,7 @@ button[type="roll"]:hover label, button[type="roll"]:hover input {
 
     /*==== sheet-button Reset ====*/
 
-button.sheet-button[type="roll"] {
+button.sheet-button[type="roll"], button.sheet-button[type="action"] {
     width: 95%;
     height:24px;
     padding-bottom: 0;
@@ -495,7 +495,7 @@ button.sheet-button[type="roll"]:hover {
     color:white
 }
 
-button.sheet-button[type="roll"] label, button[type="roll"] input {
+button.sheet-button[type="roll"] label, button[type="roll"] input, button.sheet-button[type="action"] label, button[type="action"] input {
     height:24px;
     line-height: 24px;
     text-align:center;
@@ -514,6 +514,39 @@ button.sheet-button[type="roll"]:hover label, button[type="roll"]:hover input {
     color: white;
     border: none;
 }
+
+input.sheet-modselect[value="yes"] ~ .sheet-mod_yes,
+input.sheet-modselect[value="no"] ~ .sheet-mod_no,
+input.sheet-rollselect[value="normal"] ~ .sheet-roll_normal,
+input.sheet-rollselect[value="boon"] ~ .sheet-roll_boon,
+input.sheet-rollselect[value="bane"] ~ .sheet-roll_bane {
+    background-color: black;
+    border-color: red;
+    color:white
+}
+
+input.sheet-modselect[value="yes"] ~ .sheet-button:not(.sheet-mod_yes),
+input.sheet-modselect[value="no"] ~ .sheet-button:not(.sheet-mod_no),
+input.sheet-rollselect[value="normal"] ~ .sheet-button:not(.sheet-roll_normal),
+input.sheet-rollselect[value="boon"] ~ .sheet-button:not(.sheet-roll_boon),
+input.sheet-rollselect[value="bane"] ~ .sheet-button:not(.sheet-roll_bane) { 
+    background-color: white;
+    border-color: red;
+    color:black
+}
+
+.sheet-mod-switch[value="1"] ~ .sheet-mod_toggle,
+.sheet-mod-switch[value="2"] ~ .sheet-mod_toggle,
+.sheet-roll-switch[value="1"] ~ .sheet-roll_toggle,
+.sheet-roll-switch[value="2"] ~ .sheet-roll_toggle {
+	display: none
+}
+
+.sheet-mod-switch[value="3"] ~ .sheet-mod_toggle,
+.sheet-roll-switch[value="3"] ~ .sheet-roll_toggle {
+	display: inline
+}
+
 /* ==== sheet 2 colrow ====*/
 
 .charsheet .sheet-2colrow .sheet-col {
diff --git a/Mongoose_Traveller2e/MongooseTraveller.html b/Mongoose_Traveller2e/MongooseTraveller.html
index 828261e8f6..8595a7d2f2 100644
--- a/Mongoose_Traveller2e/MongooseTraveller.html
+++ b/Mongoose_Traveller2e/MongooseTraveller.html
@@ -3,6 +3,45 @@
     <!--    Top Bar -->
     <div class="sheet-topbar">
         <div>
+			<span  data-i18n="settings-u"></span>
+			<input type="checkbox" name="attr_ro_default_show" class="sheet-hider sheet-crate" value="1"/><span></span>
+			<div>
+				<input type="checkbox" name="attr_ro_default_show" class="sheet-hider sheet-hidden" value="1"/>
+				<div class="sheet-body">
+					<span>Roll behaviour: 
+						<select name="attr_ro_default">
+							<option value="1">Legacy</option>
+							<option value="2">Prompt</option>
+							<option value="3">Toggle</option>
+						</select>
+					</span>
+					<span>Ask for Modifier?
+						<select name="attr_mod_default">
+							<option value="1">Yes</option>
+							<option value="2">No</option>
+							<option value="3">Toggle</option>
+						</select>
+					</span>
+				</div>
+			</div>
+			<div>
+				<input type="hidden" name="attr_ro_default" class="sheet-roll-switch">
+				<input type="hidden" name="attr_mod_default" class="sheet-mod-switch">
+				<span class="sheet-roll_toggle">
+					<span data-i18n="rolltype-u"></span>
+					<input type="hidden" class="sheet-rollselect" name="attr_ro_toggle_sel" value="normal" />
+					<button type="action" style="width:100px" class="sheet-button sheet-roll_boon" name="act_boon"><span class="sheet-button_header" data-i18n="boon-u"></span></button>
+					<button type="action" style="width:100px" class="sheet-button sheet-roll_normal" name="act_normal"><span class="sheet-button_header" data-i18n="normal-u"></span></button>
+					<button type="action" style="width:100px" class="sheet-button sheet-roll_bane" name="act_bane"><span class="sheet-button_header" data-i18n="bane-u"</span></button>
+				</span>
+				<span>&nbsp;&nbsp;</span>
+				<span class="sheet-mod_toggle">
+					<span data-i18n="modprompt-u"></span>
+					<input type="hidden" class="sheet-modselect" name="attr_mod_toggle_sel" value="yes"/>
+					<button type="action" style="width:100px" class="sheet-button sheet-mod_yes" name="act_modyes"><span class="sheet-button_header" data-i18n="yes-u"></span></button>
+					<button type="action" style="width:100px" class="sheet-button sheet-mod_no" name="act_modno"><span class="sheet-button_header" data-i18n="no-u"></span></button>
+				</span>
+			</div>
             <!-- <div class="sheet-oval"><h2>Prime</h2></div>-->
             <table class="sheet-characteristics">
                 <tr>
@@ -22,38 +61,38 @@
                     <td data-i18n="mod-u">Mod</td>
                 </tr>
                 <tr>
-                    <td style="width:100px"><button class="sheet-button" name="roll_Strength" type="roll" value='&{template:skill-attrib} {{skill= Strength }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{mod-Strength}[STR]+?{Modifier|0}[Mod])]] }}' ><div class="sheet-button_header" data-i18n="strength-u">Strength</div></button></td>
+                    <td style="width:100px"><button class="sheet-button" name="roll_Strength" type="roll" value='&{template:skill-attrib} {{skill= Strength }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Strength}[STR] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="strength-u">Strength</div></button></td>
                     <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Strength" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Strength" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Strength" value="0" /></td>
                     <td style="width:10px"><input type="hidden" name="attr_calc-Strength" value="0"/></td>
 
-                    <td style="width:100px"><button class="sheet-button" name="roll_Dexterity" type="roll" value='&{template:skill-attrib} {{skill= Dexterity }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{mod-Dexterity}[DEX]+?{Modifier|0}[Mod])]] }}' ><div class="sheet-button_header" data-i18n="dexterity-u">Dexterity</div></button></td>
+                    <td style="width:100px"><button class="sheet-button" name="roll_Dexterity" type="roll" value='&{template:skill-attrib} {{skill= Dexterity }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Dexterity}[DEX] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="dexterity-u">Dexterity</div></button></td>
                     <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Dexterity" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Dexterity" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Dexterity" value="0"/></td>
                     <td style="width:10px"><input type="hidden" name="attr_calc-Dexterity" value="0"/></td>
 
-                    <td style="width:100px"><button class="sheet-button" name="roll_Endurance" type="roll" value='&{template:skill-attrib} {{skill= Endurance }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{mod-Endurance}[END]+?{Modifier|0}[Mod])]] }}' ><div class="sheet-button_header" data-i18n="endurance-u">Endurance</div></button></td>
+                    <td style="width:100px"><button class="sheet-button" name="roll_Endurance" type="roll" value='&{template:skill-attrib} {{skill= Endurance }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Endurance}[END] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="endurance-u">Endurance</div></button></td>
                     <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Endurance" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Endurance" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Endurance" value="0"/></td>
                     <td style="width:10px"><input type="hidden" name="attr_calc-Endurance" value="0"/></td>
                 </tr>
                 <tr>
-                    <td style="width:100px"><button class="sheet-button" name="roll_Intellect" type="roll" value='&{template:skill-attrib} {{skill= Intellect }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{mod-Intellect}[INT]+?{Modifier|0}[Mod])]] }}' ><div class="sheet-button_header" data-i18n="intellect-u">Intellect</div></button></td>
+                    <td style="width:100px"><button class="sheet-button" name="roll_Intellect" type="roll" value='&{template:skill-attrib} {{skill= Intellect }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Intellect}[INT] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="intellect-u">Intellect</div></button></td>
                     <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Intellect" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Intellect" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Intellect" value="0"/></td>
                     <td style="width:10px"><input type="hidden" name="attr_calc-Intellect" value="0"/></td>
 
-                    <td style="width:100px"><button class="sheet-button" name="roll_Education" type="roll" value='&{template:skill-attrib} {{skill= Education }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{mod-Education}[EDU]+?{Modifier|0}[Mod])]] }}' ><div class="sheet-button_header" data-i18n="education-u">Education</div></button></td>
+                    <td style="width:100px"><button class="sheet-button" name="roll_Education" type="roll" value='&{template:skill-attrib} {{skill= Education }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Education}[EDU] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="education-u">Education</div></button></td>
                     <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Education" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Education" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Education" value="0"/></td>
                     <td style="width:10px"><input type="hidden" name="attr_calc-Education" value="0"/></td>
 
-                    <td style="width:100px"><button class="sheet-button" name="roll_Social" type="roll" value='&{template:skill-attrib} {{skill= Social }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{mod-Social}[SOC]+?{Modifier|0}[Mod])]] }}' ><div class="sheet-button_header" data-i18n="social-u">Social</div></button></td>
+                    <td style="width:100px"><button class="sheet-button" name="roll_Social" type="roll" value='&{template:skill-attrib} {{skill= Social }} {{character= @{character_name} }} @{ro_default_rolltype} + @{mod-Social}[SOC] @{ro_default_mod}]] }}  }}' ><div class="sheet-button_header" data-i18n="social-u">Social</div></button></td>
                     <td><input type="number" class="sheet-input sheet-bold" name="attr_base-Social" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-norm" name="attr_injury-Social" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-Social" value="0"/></td>
@@ -337,7 +376,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Admin" type="roll" value='&{template:skill-general} {{skill= Admin }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Admin}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Admin</div></button></th>
+                            <th><button name="roll_Admin" type="roll" value='&{template:skill-general} {{skill= Admin }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Admin}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Admin</div></button></th>
                             <th><select type="text" class="sheet-input"  style="width:95px;"name="attr_skillCharacteristicDM-Admin" value="0" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -371,7 +410,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Advocate" type="roll" value='&{template:skill-general} {{skill= Advocate }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Advocate}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Advocate</div></button></th>
+                            <th><button name="roll_Advocate" type="roll" value='&{template:skill-general} {{skill= Advocate }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Advocate}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Advocate</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Advocate" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -404,7 +443,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Animals" type="roll" value='&{template:skill-general} {{skill= Animals }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Animals}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Animals</div></button></th>
+                            <th><button name="roll_Animals" type="roll" value='&{template:skill-general} {{skill= Animals }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Animals}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Animals</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Animals" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -436,7 +475,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Animalsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Animals }} {{spec= @{skillSpeciality-Animalsspec} }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Animalsspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Animalsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Animals }} {{spec= @{skillSpeciality-Animalsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Animalsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Animalsspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Animalsspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Animalsspec" value="@{skillCharacteristicDM-Animals} + @{skilllevel-Animalsspec} + @{skilllevel-Animals} + @{skillmodifier-Animals}" disabled="true"/></th>
@@ -460,7 +499,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Athletics" type="roll" value='&{template:skill-general} {{skill= Athletics }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Athletics}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Athletics</div></button></th>
+                            <th><button name="roll_Athletics" type="roll" value='&{template:skill-general} {{skill= Athletics }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Athletics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Athletics</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Athletics" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -493,7 +532,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Athleticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Athletics }} {{spec= @{skillSpeciality-Athleticsspec} }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Athleticsspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Athleticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Athletics }} {{spec= @{skillSpeciality-Athleticsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Athleticsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Athleticsspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Athleticsspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Athleticsspec" value="@{skillCharacteristicDM-Athletics} + @{skilllevel-Athleticsspec} + @{skilllevel-Athletics} + @{skillmodifier-Athletics}" disabled="true"/></th>
@@ -517,7 +556,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Art" type="roll" value='&{template:skill-general} {{skill= Art }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Art}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Art</div></button></th>
+                            <th><button name="roll_Art" type="roll" value='&{template:skill-general} {{skill= Art }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Art}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Art</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Art" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -549,7 +588,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Artspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Art }} {{spec= @{skillSpeciality-Artspec} }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Artspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Artspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Art }} {{spec= @{skillSpeciality-Artspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Artspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Artspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Artspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Artspec" value="@{skillCharacteristicDM-Art} + @{skilllevel-Artspec} + @{skilllevel-Art} + @{skillmodifier-Art}" disabled="true"/></th>
@@ -573,7 +612,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Astrogation" type="roll" value='&{template:skill-general} {{skill= Astrogation }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Astrogation}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Astrogation</div></button></th>
+                            <th><button name="roll_Astrogation" type="roll" value='&{template:skill-general} {{skill= Astrogation }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Astrogation}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Astrogation</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Astrogation" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -606,7 +645,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Broker" type="roll" value='&{template:skill-general} {{skill= Broker }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Broker}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Broker</div></button></th>
+                            <th><button name="roll_Broker" type="roll" value='&{template:skill-general} {{skill= Broker }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Broker}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Broker</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Broker" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -639,7 +678,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Carouse" type="roll" value='&{template:skill-general} {{skill= Carouse }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Carouse}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Carouse</div></button></th>
+                            <th><button name="roll_Carouse" type="roll" value='&{template:skill-general} {{skill= Carouse }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Carouse}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Carouse</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Carouse" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -672,7 +711,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Deception" type="roll" value='&{template:skill-general} {{skill= Deception }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Deception}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Deception</div></button></th>
+                            <th><button name="roll_Deception" type="roll" value='&{template:skill-general} {{skill= Deception }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Deception}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Deception</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Deception" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -705,7 +744,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Diplomat" type="roll" value='&{template:skill-general} {{skill= Diplomat }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Diplomat}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Diplomat</div></button></th>
+                            <th><button name="roll_Diplomat" type="roll" value='&{template:skill-general} {{skill= Diplomat }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Diplomat}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Diplomat</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Diplomat" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -738,7 +777,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Drive" type="roll" value='&{template:skill-general} {{skill= Drive }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Drive}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Drive</div></button></th>
+                            <th><button name="roll_Drive" type="roll" value='&{template:skill-general} {{skill= Drive }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Drive}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Drive</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Drive" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -770,7 +809,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Drivespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Drive }} {{spec= @{skillSpeciality-Drivespec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Drivespec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Drivespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Drive }} {{spec= @{skillSpeciality-Drivespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Drivespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Drivespec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Drivespec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Drivespec" value="@{skillCharacteristicDM-Drive} + @{skilllevel-Drivespec} + @{skilllevel-Drive} + @{skillmodifier-Drive}" disabled="true"/></th>
@@ -794,7 +833,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Electronics" type="roll" value='&{template:skill-general} {{skill= Electronics }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Electronics}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Electronics</div></button></th>
+                            <th><button name="roll_Electronics" type="roll" value='&{template:skill-general} {{skill= Electronics }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Electronics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Electronics</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Electronics" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -826,7 +865,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Electronicsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Electronics }} {{spec= @{skillSpeciality-Electronicsspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Electronicsspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Electronicsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Electronics }} {{spec= @{skillSpeciality-Electronicsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Electronicsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Electronicsspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Electronicsspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Electronicsspec" value="@{skillCharacteristicDM-Electronics} + @{skilllevel-Electronicsspec} + @{skilllevel-Electronics} + @{skillmodifier-Electronics}" disabled="true"/></th>
@@ -850,7 +889,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Engineer" type="roll" value='&{template:skill-general} {{skill= Engineer }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Engineer}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Engineer</div></button></th>
+                            <th><button name="roll_Engineer" type="roll" value='&{template:skill-general} {{skill= Engineer }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Engineer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Engineer</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Engineer" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -882,7 +921,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Engineerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Engineer }} {{spec= @{skillSpeciality-Engineerspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Engineerspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Engineerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Engineer }} {{spec= @{skillSpeciality-Engineerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Engineerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Engineerspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Engineerspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Engineerspec" value="@{skillCharacteristicDM-Engineer} + @{skilllevel-Engineerspec} + @{skilllevel-Engineer} + @{skillmodifier-Engineer}" disabled="true"/></th>
@@ -906,7 +945,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Explosives" type="roll" value='&{template:skill-general} {{skill= Explosives }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Explosives}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Explosives</div></button></th>
+                            <th><button name="roll_Explosives" type="roll" value='&{template:skill-general} {{skill= Explosives }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Explosives}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Explosives</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Explosives" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -939,7 +978,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Flyer" type="roll" value='&{template:skill-general} {{skill= Flyer }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Flyer}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Flyer</div></button></th>
+                            <th><button name="roll_Flyer" type="roll" value='&{template:skill-general} {{skill= Flyer }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Flyer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Flyer</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Flyer" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -971,7 +1010,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Flyerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Flyer }} {{spec= @{skillSpeciality-Flyerspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Flyerspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Flyerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Flyer }} {{spec= @{skillSpeciality-Flyerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Flyerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Flyerspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Flyerspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Flyerspec" value="@{skillCharacteristicDM-Flyer} + @{skilllevel-Flyerspec} + @{skilllevel-Flyer} + @{skillmodifier-Flyer}" disabled="true"/></th>
@@ -995,7 +1034,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Gambler" type="roll" value='&{template:skill-general} {{skill= Gambler }}  {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Gambler}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Gambler</div></button></th>
+                            <th><button name="roll_Gambler" type="roll" value='&{template:skill-general} {{skill= Gambler }}  {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gambler}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Gambler</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Gambler" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1028,7 +1067,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Gunner" type="roll" value='&{template:skill-general} {{skill= Gunner }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Gunner}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Gunner</div></button></th>
+                            <th><button name="roll_Gunner" type="roll" value='&{template:skill-general} {{skill= Gunner }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gunner}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Gunner</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Gunner" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1060,7 +1099,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Gunnerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Gunner }} {{spec= @{skillSpeciality-Gunnerspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Gunnerspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Gunnerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Gunner }} {{spec= @{skillSpeciality-Gunnerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Gunnerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Gunnerspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Gunnerspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Gunnerspec" value="@{skillCharacteristicDM-Gunner} + @{skilllevel-Gunnerspec} + @{skilllevel-Gunner} + @{skillmodifier-Gunner}" disabled="true"/></th>
@@ -1084,7 +1123,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_GunCombat" type="roll" value='&{template:skill-general} {{skill= Gun Combat }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-GunCombat}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Gun Combat</div></button></th>
+                            <th><button name="roll_GunCombat" type="roll" value='&{template:skill-general} {{skill= Gun Combat }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-GunCombat}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Gun Combat</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-GunCombat" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1116,7 +1155,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_GunCombatspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= GunCombat }} {{spec= @{skillSpeciality-GunCombatspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-GunCombatspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_GunCombatspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= GunCombat }} {{spec= @{skillSpeciality-GunCombatspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-GunCombatspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-GunCombatspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-GunCombatspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-GunCombatspec" value="@{skillCharacteristicDM-GunCombat} + @{skilllevel-GunCombatspec} + @{skilllevel-GunCombat} + @{skillmodifier-GunCombat}" disabled="true"/></th>
@@ -1140,7 +1179,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_HeavyWeapons" type="roll" value='&{template:skill-general} {{skill= Heavy Weapons }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-HeavyWeapons}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Heavy Weapons</div></button></th>
+                            <th><button name="roll_HeavyWeapons" type="roll" value='&{template:skill-general} {{skill= Heavy Weapons }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-HeavyWeapons}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Heavy Weapons</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-HeavyWeapons" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1172,7 +1211,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_HeavyWeaponsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= HeavyWeapons }} {{spec= @{skillSpeciality-HeavyWeaponsspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-HeavyWeaponsspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_HeavyWeaponsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= HeavyWeapons }} {{spec= @{skillSpeciality-HeavyWeaponsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-HeavyWeaponsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-HeavyWeaponsspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-HeavyWeaponsspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-HeavyWeaponsspec" value="@{skillCharacteristicDM-HeavyWeapons} + @{skilllevel-HeavyWeaponsspec} + @{skilllevel-HeavyWeapons} + @{skillmodifier-HeavyWeapons}" disabled="true"/></th>
@@ -1196,7 +1235,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Investigate" type="roll" value='&{template:skill-general} {{skill= Investigate }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Investigate}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Investigate</div></button></th>
+                            <th><button name="roll_Investigate" type="roll" value='&{template:skill-general} {{skill= Investigate }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Investigate}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Investigate</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Investigate" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1229,7 +1268,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_JackOfAllTrades" type="roll" value='&{template:skill-general} {{skill= Jack-Of-All-Trades }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-JackOfAllTrades}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Jack-Of-All-Trades</div></button></th>
+                            <th><button name="roll_JackOfAllTrades" type="roll" value='&{template:skill-general} {{skill= Jack-Of-All-Trades }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-JackOfAllTrades}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Jack-Of-All-Trades</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-JackOfAllTrades" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1262,7 +1301,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Language" type="roll" value='&{template:skill-general} {{skill= Language }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Language}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Language</div></button></th>
+                            <th><button name="roll_Language" type="roll" value='&{template:skill-general} {{skill= Language }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Language}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Language</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Language" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1294,7 +1333,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Languagespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Language }} {{spec= @{skillSpeciality-Languagespec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Languagespec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Languagespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Language }} {{spec= @{skillSpeciality-Languagespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Languagespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Languagespec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Languagespec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Languagespec" value="@{skillCharacteristicDM-Language} + @{skilllevel-Languagespec} + @{skilllevel-Language} + @{skillmodifier-Language}" disabled="true"/></th>
@@ -1318,7 +1357,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Leadership" type="roll" value='&{template:skill-general} {{skill= Leadership }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Leadership}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Leadership</div></button></th>
+                            <th><button name="roll_Leadership" type="roll" value='&{template:skill-general} {{skill= Leadership }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Leadership}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Leadership</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Leadership" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1351,7 +1390,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Mechanic" type="roll" value='&{template:skill-general} {{skill= Mechanic }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Mechanic}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Mechanic</div></button></th>
+                            <th><button name="roll_Mechanic" type="roll" value='&{template:skill-general} {{skill= Mechanic }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Mechanic}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Mechanic</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Mechanic" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1384,7 +1423,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Medic" type="roll" value='&{template:skill-general} {{skill= Medic }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Medic}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Medic</div></button></th>
+                            <th><button name="roll_Medic" type="roll" value='&{template:skill-general} {{skill= Medic }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Medic}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Medic</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Medic" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1417,7 +1456,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Melee" type="roll" value='&{template:skill-general} {{skill= Melee }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Melee}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Melee</div></button></th>
+                            <th><button name="roll_Melee" type="roll" value='&{template:skill-general} {{skill= Melee }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Melee}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Melee</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Melee" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1449,7 +1488,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Meleespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Melee }} {{spec= @{skillSpeciality-Meleespec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Meleespec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Meleespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Melee }} {{spec= @{skillSpeciality-Meleespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Meleespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Meleespec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Meleespec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Meleespec" value="@{skillCharacteristicDM-Melee} + @{skilllevel-Meleespec} + @{skilllevel-Melee} + @{skillmodifier-Melee}" disabled="true"/></th>
@@ -1473,7 +1512,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Navigation" type="roll" value='&{template:skill-general} {{skill= Navigation }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Navigation}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Navigation</div></button></th>
+                            <th><button name="roll_Navigation" type="roll" value='&{template:skill-general} {{skill= Navigation }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Navigation}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Navigation</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Navigation" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1506,7 +1545,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Persuade" type="roll" value='&{template:skill-general} {{skill= Persuade }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Persuade}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Persuade</div></button></th>
+                            <th><button name="roll_Persuade" type="roll" value='&{template:skill-general} {{skill= Persuade }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Persuade}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Persuade</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Persuade" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1539,7 +1578,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Pilot" type="roll" value='&{template:skill-general} {{skill= Pilot }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Pilot}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Pilot</div></button></th>
+                            <th><button name="roll_Pilot" type="roll" value='&{template:skill-general} {{skill= Pilot }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Pilot}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Pilot</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Pilot" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1571,7 +1610,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Pilotspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Pilot }} {{spec= @{skillSpeciality-Pilotspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Pilotspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Pilotspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Pilot }} {{spec= @{skillSpeciality-Pilotspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Pilotspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Pilotspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Pilotspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Pilotspec" value="@{skillCharacteristicDM-Pilot} + @{skilllevel-Pilotspec} + @{skilllevel-Pilot} + @{skillmodifier-Pilot}" disabled="true"/></th>
@@ -1595,7 +1634,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Profession" type="roll" value='&{template:skill-general} {{skill= Profession }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Profession}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Profession</div></button></th>
+                            <th><button name="roll_Profession" type="roll" value='&{template:skill-general} {{skill= Profession }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Profession}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Profession</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Profession" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1627,7 +1666,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Professionspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Profession }} {{spec= @{skillSpeciality-Professionspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Professionspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Professionspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Profession }} {{spec= @{skillSpeciality-Professionspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Professionspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Professionspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Professionspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Professionspec" value="@{skillCharacteristicDM-Profession} + @{skilllevel-Professionspec} + @{skilllevel-Profession} + @{skillmodifier-Profession}" disabled="true"/></th>
@@ -1651,7 +1690,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Recon" type="roll" value='&{template:skill-general} {{skill= Recon }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Recon}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Recon</div></button></th>
+                            <th><button name="roll_Recon" type="roll" value='&{template:skill-general} {{skill= Recon }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Recon}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Recon</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Recon" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1684,7 +1723,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Science" type="roll" value='&{template:skill-general} {{skill= Science }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Science}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Science</div></button></th>
+                            <th><button name="roll_Science" type="roll" value='&{template:skill-general} {{skill= Science }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Science}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Science</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Science" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1716,7 +1755,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Sciencespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Science }} {{spec= @{skillSpeciality-Sciencespec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Sciencespec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Sciencespec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Science }} {{spec= @{skillSpeciality-Sciencespec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Sciencespec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Sciencespec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Sciencespec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Sciencespec" value="@{skillCharacteristicDM-Science} + @{skilllevel-Sciencespec} + @{skilllevel-Science} + @{skillmodifier-Science}" disabled="true"/></th>
@@ -1740,7 +1779,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Seafarer" type="roll" value='&{template:skill-general} {{skill= Seafarer }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Seafarer}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Seafarer</div></button></th>
+                            <th><button name="roll_Seafarer" type="roll" value='&{template:skill-general} {{skill= Seafarer }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Seafarer}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Seafarer</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Seafarer" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1772,7 +1811,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Seafarerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Seafarer }} {{spec= @{skillSpeciality-Seafarerspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Seafarerspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Seafarerspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Seafarer }} {{spec= @{skillSpeciality-Seafarerspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Seafarerspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Seafarerspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Seafarerspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Seafarerspec" value="@{skillCharacteristicDM-Seafarer} + @{skilllevel-Seafarerspec} + @{skilllevel-Seafarer} + @{skillmodifier-Seafarer}" disabled="true"/></th>
@@ -1796,7 +1835,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Stealth" type="roll" value='&{template:skill-general} {{skill= Stealth }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Stealth}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Stealth</div></button></th>
+                            <th><button name="roll_Stealth" type="roll" value='&{template:skill-general} {{skill= Stealth }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Stealth}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Stealth</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Stealth" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1829,7 +1868,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Steward" type="roll" value='&{template:skill-general} {{skill= Steward }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Steward}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Steward</div></button></th>
+                            <th><button name="roll_Steward" type="roll" value='&{template:skill-general} {{skill= Steward }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Steward}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Steward</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Steward" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1862,7 +1901,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Streetwise" type="roll" value='&{template:skill-general} {{skill= Streetwise }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Streetwise}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Streetwise</div></button></th>
+                            <th><button name="roll_Streetwise" type="roll" value='&{template:skill-general} {{skill= Streetwise }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Streetwise}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Streetwise</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Streetwise" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1895,7 +1934,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Survival" type="roll" value='&{template:skill-general} {{skill= Survival }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Survival}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Survival</div></button></th>
+                            <th><button name="roll_Survival" type="roll" value='&{template:skill-general} {{skill= Survival }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Survival}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Survival</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Survival" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1928,7 +1967,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_Tactics" type="roll" value='&{template:skill-general} {{skill= Tactics }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Tactics}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Tactics</div></button></th>
+                            <th><button name="roll_Tactics" type="roll" value='&{template:skill-general} {{skill= Tactics }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Tactics}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Tactics</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Tactics" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -1960,7 +1999,7 @@
                             <table>
                                 <tr>
                                     <th style="width:55px;"></th>
-                                    <th style="width:150px;"><button name="roll_Tacticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Tactics }} {{spec= @{skillSpeciality-Tacticsspec} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Tacticsspec}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></th>
+                                    <th style="width:150px;"><button name="roll_Tacticsspec" type="roll" style="width:150px;" value='&{template:skill-general} {{skill= Tactics }} {{spec= @{skillSpeciality-Tacticsspec} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Tacticsspec}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></th>
                                     <th style="width:200px;"><input type="text" class="sheet-input" style="width:200px;" name="attr_skillSpeciality-Tacticsspec" value="" placeholder="Specialty Name" /></th>
                                     <th style="width:75px;"><input type="number" class="sheet-input" style="width:45px;" name="attr_skilllevel-Tacticsspec" value="0" /></th>
                                     <th style="width:55px;"><input type="number" class="sheet-input" style="width:50px;" name="attr_skilltotal-Tacticsspec" value="@{skillCharacteristicDM-Tactics} + @{skilllevel-Tacticsspec} + @{skilllevel-Tactics} + @{skillmodifier-Tactics}" disabled="true"/></th>
@@ -1984,7 +2023,7 @@
                             <th style="width:55px;"></th>
                         </tr>
                         <tr>
-                            <th><button name="roll_VaccSuit" type="roll" value='&{template:skill-general} {{skill= Vacc Suit }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-VaccSuit}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">Vacc Suit</div></button></th>
+                            <th><button name="roll_VaccSuit" type="roll" value='&{template:skill-general} {{skill= Vacc Suit }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-VaccSuit}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">Vacc Suit</div></button></th>
                             <th><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-VaccSuit" value="0" style="width:95px" />
                                 <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
                                 <option value="@{mod-Dexterity}" data-i18n="skilldexterityoption-u">Dexterity</option>
@@ -2021,7 +2060,7 @@
         <fieldset class="repeating_otherspec">
             <table class="sheet-skilltable" style="width:820px">
                 <tr>
-                    <th style="width:55px;"><button name="roll_Otherspec" type="roll" style="width:20px;" value='&{template:skill-general} {{skill= @{skillName-Other} }} {{spec= @{skillSpeciality-Other} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + [[@{skilltotal-Other}]] + ?{Modifier|0}[MOD])]] }}' ><div class="sheet-button_header">***</div></button></td>
+                    <th style="width:55px;"><button name="roll_Otherspec" type="roll" style="width:20px;" value='&{template:skill-general} {{skill= @{skillName-Other} }} {{spec= @{skillSpeciality-Other} }} {{character= @{character_name} }} @{ro_default_rolltype} + [[@{skilltotal-Other}]] @{ro_default_mod}]] }} ' ><div class="sheet-button_header">***</div></button></td>
                     <th style="width:150px;"><input type="text" class="sheet-input" name="attr_skillName-Other" value="" style="width:145px;"/></td>
                     <th style="width:150px;"><input type="text" class="sheet-input" name="attr_skillSpeciality-Other" value="" style="width:145px;"/></td>
                     <th style="width:105px;"><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-Other" value="0" style="width:95px" />
@@ -2214,7 +2253,7 @@
                             </select>
                         </td>
                         <td>
-                            <button data-i18n="initiativeroll-u" type="roll" name="roll_initiative" value="&{template:skill-general} {{skill= Initiative}} {{character= @{character_name} }}{{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2}+@{initiativeattribute}[Attribute Modifier] + ?{Modifier|0}[Modifier] &{tracker}]]}}" ><div style="width:300px" class="sheet-button_header">Roll Initiative (select Token first)</div></button>
+                            <button data-i18n="initiativeroll-u" type="roll" name="roll_initiative" value="&{template:skill-general} {{skill= Initiative}} {{character= @{character_name} }}@{ro_default_rolltype}+@{initiativeattribute}[Attribute Modifier] @{ro_default_mod} &{tracker}]]}}" ><div style="width:300px" class="sheet-button_header">Roll Initiative (select Token first)</div></button>
                         </td>
                     </tr>
                 </table>
@@ -2238,7 +2277,7 @@
                     <span class="sheet-th sheet-weaponmag" data-i18n="weaponmagazine-u">Magazine</span>
                 </div>
                 <div class="sheet-weaponitem">
-                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-1" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-1}}}  {{roll=[[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{weapon_DM-1}[DM] + @{weapon_skill-1}[Skill] + ?{Modifier|0}[Modifier])]]}} {{damage=[[@{weapon_damage-1}]]}} {{range=@{weapon_range-1}}}" ></button>
+                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-1" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-1}}}  @{ro_default_rolltype} + @{weapon_DM-1}[DM] + @{weapon_skill-1}[Skill] @{ro_default_mod}]]}}  {{damage=[[@{weapon_damage-1}]]}} {{range=@{weapon_range-1}}}" ></button>
                     <input class="sheet-weaponweapon sheet-input" type="text" name="attr_weapon_name-1" value="" />
                     <input class="sheet-weaponskill sheet-input" style="width:62px;" type="number" name="attr_weapon_skill-1" value="0" />
                     <select class="sheet-weapondm sheet-input" type="text" name="attr_weapon_DM-1" value="0" style="width:85px">
@@ -2254,7 +2293,7 @@
                     <textarea class="sheet-weaponnote sheet-input" name="attr_weapon_note-1" ></textarea>
                 </div>
                 <div class="sheet-weaponitem">
-                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-2" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-2}}}  {{roll=[[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{weapon_DM-2}[DM] + @{weapon_skill-2}[Skill] + ?{Modifier|0}[Modifier])]]}} {{damage=[[@{weapon_damage-2}]]}} {{range=@{weapon_range-2}}}" ></button>
+                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-2" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-2}}}  @{ro_default_rolltype} + @{weapon_DM-2}[DM] + @{weapon_skill-2}[Skill] @{ro_default_mod}]]}}  {{damage=[[@{weapon_damage-2}]]}} {{range=@{weapon_range-2}}}" ></button>
                     <input class="sheet-weaponweapon sheet-input" type="text" name="attr_weapon_name-2" value="" />
                     <input class="sheet-weaponskill sheet-input" style="width:62px;" type="number" name="attr_weapon_skill-2" value="0" />
                     <select class="sheet-weapondm sheet-input" type="text" name="attr_weapon_DM-2" value="0" style="width:85px">
@@ -2270,7 +2309,7 @@
                     <textarea class="sheet-weaponnote sheet-input" name="attr_weapon_note-2" ></textarea>
                 </div>
                 <div class="sheet-weaponitem">
-                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-3" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-3}}}  {{roll=[[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{weapon_DM-3}[DM] + @{weapon_skill-3}[Skill] + ?{Modifier|0}[Modifier])]]}} {{damage=[[@{weapon_damage-3}]]}} {{range=@{weapon_range-3}}}" ></button>
+                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-3" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-3}}}  @{ro_default_rolltype} + @{weapon_DM-3}[DM] + @{weapon_skill-3}[Skill] @{ro_default_mod}]]}}  {{damage=[[@{weapon_damage-3}]]}} {{range=@{weapon_range-3}}}" ></button>
                     <input class="sheet-weaponweapon sheet-input" type="text" name="attr_weapon_name-3" value="" />
                     <input class="sheet-weaponskill sheet-input" style="width:62px;" type="number" name="attr_weapon_skill-3" value="0" />
                     <select class="sheet-weapondm sheet-input" type="text" name="attr_weapon_DM-3" value="0" style="width:85px">
@@ -2286,7 +2325,7 @@
                     <textarea class="sheet-weaponnote sheet-input" name="attr_weapon_note-3" ></textarea>
                 </div>
                 <div class="sheet-weaponitem">
-                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-4" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-4}}}  {{roll=[[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{weapon_DM-4}[DM] + @{weapon_skill-4}[Skill] + ?{Modifier|0}[Modifier])]]}} {{damage=[[@{weapon_damage-4}]]}} {{range=@{weapon_range-4}}}" ></button>
+                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-4" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-4}}}  @{ro_default_rolltype} + @{weapon_DM-4}[DM] + @{weapon_skill-4}[Skill] @{ro_default_mod}]]}}  {{damage=[[@{weapon_damage-4}]]}} {{range=@{weapon_range-4}}}" ></button>
                     <input class="sheet-weaponweapon sheet-input" type="text" name="attr_weapon_name-4" value="" />
                     <input class="sheet-weaponskill sheet-input" style="width:62px;" type="number" name="attr_weapon_skill-4" value="0" />
                     <select class="sheet-weapondm sheet-input" type="text" name="attr_weapon_DM-4" value="0" style="width:85px">
@@ -2302,7 +2341,7 @@
                     <textarea class="sheet-weaponnote sheet-input" name="attr_weapon_note-4" ></textarea>
                 </div>
                 <div class="sheet-weaponitem">
-                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-5" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-5}}}  {{roll=[[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{weapon_DM-5}[DM] + @{weapon_skill-5}[Skill] + ?{Modifier|0}[Modifier])]]}} {{damage=[[@{weapon_damage-5}]]}} {{range=@{weapon_range-5}}}" ></button>
+                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-5" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-5}}}  @{ro_default_rolltype} + @{weapon_DM-5}[DM] + @{weapon_skill-5}[Skill] @{ro_default_mod}]]}}  {{damage=[[@{weapon_damage-5}]]}} {{range=@{weapon_range-5}}}" ></button>
                     <input class="sheet-weaponweapon sheet-input" type="text" name="attr_weapon_name-5" value="" />
                     <input class="sheet-weaponskill sheet-input" style="width:62px;" type="number" name="attr_weapon_skill-5" value="0" />
                     <select class="sheet-weapondm sheet-input" type="text" name="attr_weapon_DM-5" value="0" style="width:85px">
@@ -2318,7 +2357,7 @@
                     <textarea class="sheet-weaponnote sheet-input" name="attr_weapon_note-5" ></textarea>
                 </div>
                 <div class="sheet-weaponitem">
-                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-6" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-6}}}  {{roll=[[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{weapon_DM-6}[DM] + @{weapon_skill-6}[Skill] + ?{Modifier|0}[Modifier])]]}} {{damage=[[@{weapon_damage-6}]]}} {{range=@{weapon_range-6}}}" ></button>
+                    <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-6" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-6}}}  @{ro_default_rolltype} + @{weapon_DM-6}[DM] + @{weapon_skill-6}[Skill] @{ro_default_mod}]]}}  {{damage=[[@{weapon_damage-6}]]}} {{range=@{weapon_range-6}}}" ></button>
                     <input class="sheet-weaponweapon sheet-input" type="text" name="attr_weapon_name-6" value="" />
                     <input class="sheet-weaponskill sheet-input" style="width:62px;" type="number" name="attr_weapon_skill-6" value="0" />
                     <select class="sheet-weapondm sheet-input" type="text" name="attr_weapon_DM-6" value="0" style="width:85px">
@@ -2335,7 +2374,7 @@
                 </div>
                 <fieldset class="repeating_weapons">
                     <div class="sheet-weaponitem">
-                        <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-rep" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-rep}}}  {{roll=[[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{weapon_DM-rep}[DM] + @{weapon_skill-rep}[Skill] + ?{Modifier|0}[Modifier])]]}} {{damage=[[@{weapon_damage-rep}]]}} {{range=@{weapon_range-rep}}}" ></button>
+                        <button class="sheet-weaponroll" style="width:25px;" name="roll_weapon-rep" type="roll" value="&{template:range} {{character=@{character_name}}} {{weapon=@{weapon_name-rep}}}  @{ro_default_rolltype} + @{weapon_DM-rep}[DM] + @{weapon_skill-rep}[Skill] @{ro_default_mod}]]}}  {{damage=[[@{weapon_damage-rep}]]}} {{range=@{weapon_range-rep}}}" ></button>
                         <input class="sheet-weaponweapon sheet-input" type="text" name="attr_weapon_name-rep" value="" />
                         <input class="sheet-weaponskill sheet-input" style="width:62px;" type="number" name="attr_weapon_skill-rep" value="0" />
                         <select class="sheet-weapondm sheet-input" type="text" name="attr_weapon_DM-rep" value="0" style="width:85px">
@@ -2370,7 +2409,7 @@
                     <td></td>
                 </tr>
                 <tr>
-                    <td style="width:130px"><button class="sheet-button" name="roll_PsionicStrength" type="roll" value='&{template:skill-attrib} {{skill= Psionic Strength }} {{character= @{character_name} }} {{roll= [[?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{mod-PsionicStrength} + ?{Modifier|0}]] }}' ><div class="sheet-button_header">Psionic Strength</div></button></td>
+                    <td style="width:130px"><button class="sheet-button" name="roll_PsionicStrength" type="roll" value='&{template:skill-attrib} {{skill= Psionic Strength }} {{character= @{character_name} }} {{roll= [[@{ro_default_rolltype} + @{mod-PsionicStrength} @{ro_default_mod}]] }}   }}' ><div class="sheet-button_header">Psionic Strength</div></button></td>
                     <td><input type="number" class="sheet-input sheet-bold" name="attr_base-PsionicStrength" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-norm" name="attr_injury-PsionicStrength" value="0"/></td>
                     <td><input type="number" class="sheet-input sheet-mod" name="attr_mod-PsionicStrength" value="0"/></td>
@@ -2387,7 +2426,7 @@
                 <th data-i18n="skilltableskilllevel-u" style="width:80px">Skill Level</th>
             </tr>
             <tr>
-                <td style="width:60px"><button type="roll" class="sheet-button" name="roll_skill-power" value='&{template:power} {{power= @{skillSpeciality-power} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{skillCharacteristicDM-power} + @{skilllevel-power} + ?{Modifier|0})]] }} {{note= @{skillnote-power} }} ' ><div class="sheet-button_header">Powers</div></button></td>
+                <td style="width:60px"><button type="roll" class="sheet-button" name="roll_skill-power" value='&{template:power} {{power= @{skillSpeciality-power} }} {{character= @{character_name} }} @{ro_default_rolltype} + @{skillCharacteristicDM-power} + @{skilllevel-power} @{ro_default_mod}]] }} {{note= @{skillnote-power} }} ' ><div class="sheet-button_header">Powers</div></button></td>
                 <td style="width:110px"><input type="text" class="sheet-input" name="attr_skillSpeciality-power" value="" /></td>
                 <td style="width:100px"><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-power" value="0" style="width:95px" />
                     <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
@@ -2407,7 +2446,7 @@
         <fieldset class="repeating_powers">
             <table>
                 <tr>
-                    <td style="width:60px"><button type="roll" class="sheet-button" name="roll_skill-reppower" value='&{template:power} {{power= @{skillSpeciality-reppower} }} {{character= @{character_name} }} {{roll= [[(?{Task Roll|Standard, 2d6|Boon, 3d6kh2|Bane, 3d6kl2} + @{skillCharacteristicDM-reppower} + @{skilllevel-reppower} + ?{Modifier|0})]] }} {{note= @{skillnote-reppower} }}' ><div class="sheet-button_header">Powers</div></button></td>
+                    <td style="width:60px"><button type="roll" class="sheet-button" name="roll_skill-reppower" value='&{template:power} {{power= @{skillSpeciality-reppower} }} {{character= @{character_name} }} @{ro_default_rolltype} + @{skillCharacteristicDM-reppower} + @{skilllevel-reppower} @{ro_default_mod}]] }} {{note= @{skillnote-reppower} }}' ><div class="sheet-button_header">Powers</div></button></td>
                     <td style="width:110px"><input type="text" class="sheet-input" name="attr_skillSpeciality-reppower" value="" /></td>
                     <td style="width:100px"><select type="text" class="sheet-input" name="attr_skillCharacteristicDM-reppower" value="0" style="width:95px" />
                         <option value="@{mod-Strength}" data-i18n="skillstrengthoption-u">Strength</option>
@@ -2437,6 +2476,16 @@
             <tr>
                 <td colspan="2"><i><b>{{character}}</b></i></td>
             </tr>
+			{{#rollhasboon}}
+            <tr>
+                <td colspan="2"><b>Rolling with BOON</b></td>
+            </tr>
+			{{/rollhasboon}}
+			{{#rollhasbane}}
+            <tr>
+                <td colspan="2"><b>Rolling with BANE</b></td>
+            </tr>
+			{{/rollhasbane}}
             <tr>
             	<td><span><b>Roll</b></span>
             	<td><i>{{roll}}</i></td>
@@ -2455,10 +2504,26 @@
             <tr>
                 <td colspan="4"><i><b>{{character}}</b></i></td>
             </tr>
+			{{#rollhasboon}}
+            <tr>
+                <td colspan="2"><b>Rolling with BOON</b></td>
+            </tr>
+			{{/rollhasboon}}
+			{{#rollhasbane}}
+            <tr>
+                <td colspan="2"><b>Rolling with BANE</b></td>
+            </tr>
+			{{/rollhasbane}}
             <tr>
             	<td colspan="2"><span><b>Attack</b></span>
             	<td colspan="2"><i>{{roll}}</i></td>
             </tr>
+			{{#bb}}
+            <tr>
+            	<td colspan="2"><span><b>Boon/Bane</b></span>
+            	<td colspan="2"><i>{{bb}}</i></td>
+            </tr>
+			{{/bb}}
             <tr>
             	<td colspan="2"><span><b>Damage</b></span>
             	<td colspan="2"><i>{{damage}}</i></td>
@@ -2481,10 +2546,26 @@
             <tr>
                 <td colspan="2"><i><b>{{character}}</b></i></td>
             </tr>
+			{{#rollhasboon}}
+            <tr>
+                <td colspan="2"><b>Rolling with BOON</b></td>
+            </tr>
+			{{/rollhasboon}}
+			{{#rollhasbane}}
+            <tr>
+                <td colspan="2"><b>Rolling with BANE</b></td>
+            </tr>
+			{{/rollhasbane}}
             <tr>
             	<td><span><b>Roll</b></span>
             	<td><i>{{roll}}</i></td>
             </tr>
+			{{#bb}}
+            <tr>
+            	<td><span><b>Boon/Bane</b></span>
+            	<td><i>{{bb}}</i></td>
+            </tr>
+			{{/bb}}
         </table>
     </rolltemplate>
     <rolltemplate class="sheet-rolltemplate-skill-general">
@@ -2498,6 +2579,16 @@
             <tr>
                 <td colspan="2"><i><b>{{character}}</b></i></td>
             </tr>
+			{{#rollhasboon}}
+            <tr>
+                <td colspan="2"><b>Rolling with BOON</b></td>
+            </tr>
+			{{/rollhasboon}}
+			{{#rollhasbane}}
+            <tr>
+                <td colspan="2"><b>Rolling with BANE</b></td>
+            </tr>
+			{{/rollhasbane}}
             {{#dm}}
             <tr>
             	<td><span><b>DM</b></span>
@@ -2516,10 +2607,106 @@
             	<td><span><b>Roll</b></span>
             	<td><i>{{roll}}</i></td>
             </tr>
+			{{#bb}}
+            <tr>
+            	<td><span><b>Boon/Bane</b></span>
+            	<td><i>{{bb}}</i></td>
+            </tr>
+			{{/bb}}
         </table>
     </rolltemplate>
 </div>
 <script type="text/worker">
+on('change:ro_default sheet:opened', function() {
+	getAttrs(["ro_default"], function(value) {
+		let opt = parseInt(value.ro_default)||1;
+		var def_ro_obj;
+		
+		if(1 === opt ){
+			def_ro_obj = {
+				ro_default_rolltype: "{{bb= [[(1d6)]] }} {{roll=[[2d6"
+			};
+		}		 
+		else if(2 === opt ){
+			def_ro_obj = {
+				ro_default_rolltype: "?{Roll type?|Normal, &#123&#123roll=[[2d6|Boon,&#123&#123rollhasboon= 1&#125&#125 &#123&#123roll=[[3d6kh2|Bane,&#123&#123rollhasbane= 1&#125&#125 &#123&#123roll=[[3d6kl2}"
+			};
+		}
+		else if(3 === opt ){
+			def_ro_obj = {
+			   ro_default_rolltype: "{{roll=[[2d6",
+			   ro_toggle_sel: "normal"
+			};
+		}
+		setAttrs(def_ro_obj);
+	});
+});
+
+on('clicked:normal', function() {
+	// save the updated attribute to the sheet
+	setAttrs({
+	   ro_default_rolltype: "{{roll=[[2d6",
+	   ro_toggle_sel: "normal"
+	});
+});
+
+on('clicked:boon', function() {
+	// save the updated attribute to the sheet
+	setAttrs({
+	   ro_default_rolltype: "{{rollhasboon= 1}} {{roll=[[ 3d6kh2", 
+	   ro_toggle_sel: "boon"
+	});
+});
+
+on('clicked:bane', function() {
+	// save the updated attribute to the sheet
+	setAttrs({
+	   ro_default_rolltype: "{{rollhasbane= 1}} {{roll=[[ 3d6kl2",
+	   ro_toggle_sel: "bane"	   
+	});
+});
+
+on('change:mod_default sheet:opened', function() {
+	getAttrs(["mod_default"], function(value) {
+		let opt = parseInt(value.mod_default)||1;
+		var def_mod_obj;
+		
+		if(1 === opt ){
+			def_mod_obj = {
+				ro_default_mod: "+ ?{Modifier|0}[Mod] "
+			};
+		}		 
+		else if(2 === opt ){
+			def_mod_obj = {
+				ro_default_mod: " "
+			};
+		}
+		else if(3 === opt ){
+			def_mod_obj = {
+			   ro_default_mod: "+ ?{Modifier|0}[Mod] ",
+			   mod_toggle_sel: "yes"
+			};
+		}
+		setAttrs(def_mod_obj);
+	});
+});
+
+on('clicked:modyes', function() {
+	// save the updated attribute to the sheet
+	setAttrs({
+	   ro_default_mod: "+ ?{Modifier|0}[Mod] ",
+	   mod_toggle_sel: "yes"
+	});
+});
+
+on('clicked:modno', function() {
+	// save the updated attribute to the sheet
+	setAttrs({
+	   ro_default_mod: " ",
+	   mod_toggle_sel: "no"
+	});
+});
+
 
 /* ---- BEGIN: TheAaronSheet.js ---- */
 // Github:   https://github.com/shdwjk/TheAaronSheet/blob/master/TheAaronSheet.js
diff --git a/Mongoose_Traveller2e/MongooseTraveller.png b/Mongoose_Traveller2e/MongooseTraveller.png
index 8a880c1eb8..7859a61b46 100644
Binary files a/Mongoose_Traveller2e/MongooseTraveller.png and b/Mongoose_Traveller2e/MongooseTraveller.png differ
diff --git a/Mongoose_Traveller2e/sheet.json b/Mongoose_Traveller2e/sheet.json
index 2fa17db22a..e626bfe496 100644
--- a/Mongoose_Traveller2e/sheet.json
+++ b/Mongoose_Traveller2e/sheet.json
@@ -4,5 +4,36 @@
     "authors": "Fabian D.",
     "roll20userid": "869232",
     "preview": "MongooseTraveller.png",
-    "instructions": "You can roll skills directly from the sheet, by clicking on the corresponding name or the roll button at the beginning of the row."
+    "instructions": "You can roll skills directly from the sheet, by clicking on the corresponding name or the roll button at the beginning of the row.",
+	"useroptions": [
+        {
+            "attribute": "ro_default",
+            "displayname": "Default dice roll behaviour",
+            "displaytranslationkey": "ro_default-Q",
+            "type": "select",
+			"options": [
+						"Legacy|1",
+						"Prompt|2",
+						"Toggle|3"
+					],
+			"default": "1",
+            "description": "Legacy is the old sheet method, Prompt asks every roll for normal/boon/bane, Toggle displays Normal/Boon/Bane buttons.",
+            "descriptiontranslationkey": "ro_default-D"
+		},
+        {
+            "attribute": "mod_default",
+            "displayname": "Ask for modifier?",
+            "displaytranslationkey": "mod_default-Q",
+            "type": "select",
+			"options": [
+						"Yes|1",
+						"No|2",
+						"Toggle|3"
+					],
+			"default": "1",
+            "description": "Yes prompts for a modifier on every roll, No never pronpts for a modifier, Toggle displays Yes/No buttons.",
+            "descriptiontranslationkey": "mod_default-D"
+		}
+		
+	]
 }
\ No newline at end of file
diff --git a/Mongoose_Traveller2e/translation.json b/Mongoose_Traveller2e/translation.json
index 03b295acc3..a75fc2034a 100644
--- a/Mongoose_Traveller2e/translation.json
+++ b/Mongoose_Traveller2e/translation.json
@@ -87,6 +87,20 @@
 	"weaponrange-u": "Range",
 	"weaponweight-u": "KG",
 	"weaponmagazine-u": "Magazine",
-	"powerstitle-u": "Powers"
+	"powerstitle-u": "Powers",
+	"legacy-u": "Legacy",
+	"normal-u": "Normal",
+	"prompt-u": "Prompt",
+	"boon-u": "Boon",
+	"bane-u": "Bane",
+	"ro_default-Q": "Default dice roll behaviour",
+	"ro_default-D": "Legacy is the old sheet method, Prompt asks every roll for normal/boon/bane, Toggle displays Normal/Boon/Bane buttons.",
+	"yes-u": "Yes",
+	"no-u": "No",
+	"rolltype-u": "Roll Type: ",
+	"modprompt-u": "Modifier: ",
+	"settings-u": "Settings: ",
+	"mod_default-Q": "Ask for modifier?",
+	"mod_default-D": "Yes prompts for a modifier on every roll, No never pronpts for a modifier, Toggle displays Yes/No buttons."
 
 }
\ No newline at end of file