diff --git a/FreeSpacer/FreeSpacer.css b/FreeSpacer/FreeSpacer.css
index 03347b969b..157b43aac0 100644
--- a/FreeSpacer/FreeSpacer.css
+++ b/FreeSpacer/FreeSpacer.css
@@ -493,60 +493,222 @@ select.sheet-typeSelector
 /* ************* */
 .sheet-rolltemplate-FS
 {
-    margin-left: -37px;
 }
 
-    .sheet-rolltemplate-FS .withoutavatars
-    {
-        margin-left: -7px;
-    }
-
     .sheet-rolltemplate-FS .sheet-rolltemplateContainer
     {
         display: grid;
-        grid-template-columns: repeat(12, 15px);
-        grid-template-rows: repeat(6,15px);
-        grid-row-gap: 2px;
+        grid-template-columns: repeat(24, 10px);
+        grid-template-rows: repeat(10,20px);
+        background-color: #353635;
         border: none;
-        background-color: darkgrey;
         font-family: 'Myriad Pro';
+        color: white;
+        margin-left: -5px;
+        font-weight: 400;
     }
 
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateSkill
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateHeader
         {
             grid-row: 1/2;
-            grid-column: 1/8;
+            grid-column: 1/-1;
+            background-color: #d87d29;
+            font-variant-caps: small-caps;
+            font-weight: 700;
+            font-size: 17px;
+            color: black;
+            margin-left: -5px;
+            padding-left: 2px;
+            padding-top: 3px;
         }
 
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateSpecialty
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateTextRows
         {
-            grid-row: 1/2;
-            grid-column: 8/13;
+            padding-left: 2px;
+            padding-top: 3px;
         }
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateTool
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateCol1
+        {
+            grid-column: 1/13;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateCol2
+        {
+            grid-column: 13/-1;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateRow1
         {
             grid-row: 2/3;
-            grid-column: 1/13;
+            background-color: #414241;
         }
-        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-taskDice
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-rolltemplateRow2
         {
             grid-row: 3/4;
-            grid-column: 1/13;
+            background-color: #353635;
         }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-taskDiceSubheader
+        {
+            grid-column: 1/-1;
+            grid-row: 4/5;
+            background-color: #414241;
+            color: #d87d29;
+            font-variant-caps: small-caps;
+            font-weight: 500;
+            padding-left: 2px;
+            padding-top: 3px;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-taskDice
+        {
+            grid-row: 5/6;
+            background-color: #353635;
+        }
+
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-threatDice
         {
-            grid-row: 4/5;
-            grid-column: 1/13;
+            grid-row: 7/8;
+            background-color: #353635;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-dice
+        {
+            justify-self: center;
+            align-self: center;
+            padding-top: 3px;
+            background-color: #353635;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die0
+        {
+            grid-column: 2/4;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die1
+        {
+            grid-column: 4/6;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die2
+        {
+            grid-column: 6/8;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die3
+        {
+            grid-column: 8/10;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die4
+        {
+            grid-column: 10/12;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die5
+        {
+            grid-column: 12/14;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die6
+        {
+            grid-column: 14/16;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die7
+        {
+            grid-column: 16/18;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die8
+        {
+            grid-column: 18/20;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-die9
+        {
+            grid-column: 20/22;
+        }
+              
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .inlinerollresult
+        {
+            background-color: transparent;
+            border: none;
+            padding: 0px;
+        }
+
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-threatDiceSubheader
+        {
+            grid-column: 1/-1;
+            grid-row: 6/7;
+            background-color: #414241;
+            color: #d87d29;
+            font-variant-caps: small-caps;
+            font-weight: 500;
+            padding-left: 2px;
+            padding-top: 3px;
+        }
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-excessDiceSubheader
+        {
+            grid-column: 1/-1;
+            grid-row: 8/9;
+            background-color: #414241;
+            color: #d87d29;
+            font-variant-caps: small-caps;
+            font-weight: 500;
+            padding-left: 2px;
+            padding-top: 3px;
+        }
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-autoHits
+        {
+            padding-top: 3px;
+            grid-column: 10/16;
+            grid-row: 8/9;
+        }
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-autoMisses
+        {
+            padding-top: 3px;
+            grid-column: 17/-1;
+            grid-row: 8/9;
+        }
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-resultsSubheader
+        {
+            grid-column: 1/-1;
+            grid-row: 9/10;
+            background-color: #353635;
+            color: #d87d29;
+            font-variant-caps: small-caps;
+            font-weight: 500;
+            padding-left: 2px;
+            padding-top: 3px;
         }
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-result
         {
-            grid-row: 5/6;
-            grid-column: 1/13;
+            padding-top: 3px;
+            grid-row: 9/10;
+            grid-column: 8/-1;
+            background-color: #353635;
+        }
+        .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-outcomeSubheader
+        {
+            grid-column: 1/-1;
+            grid-row: 10/11;
+            background-color: #414241;
+            color: #d87d29;
+            font-variant-caps: small-caps;
+            font-weight: 500;
+            padding-left: 2px;
+            padding-top: 3px;
         }
         .sheet-rolltemplate-FS .sheet-rolltemplateContainer .sheet-outcome
         {
-            grid-row: 6/7;
-            grid-column: 1/13;
+            padding-top: 3px;
+            grid-row: 10/11;
+            grid-column: 8/-1;
+            background-color: #414241;
         }
 
 
diff --git a/FreeSpacer/FreeSpacer.html b/FreeSpacer/FreeSpacer.html
index 28a01f503d..ff068bcfb9 100644
--- a/FreeSpacer/FreeSpacer.html
+++ b/FreeSpacer/FreeSpacer.html
@@ -250,11 +250,11 @@
 
             <!--Salvo Roll Button-->
             <input type="hidden" name="attr_salvoMacro" readonly />
-            <button type="roll" class="rollSalvoButton" name="roll_rollSalvo" value="@{salvoMacro}" ></button><span class="rollSalvoButton">Roll Salvo</span>
+            <button type="roll" class="rollSalvoButton" name="roll_rollSalvo" value="@{salvoMacro}"></button><span class="rollSalvoButton">Roll Salvo</span>
 
             <!--Spend Charge & Close SalvoMode-->
             <input type="checkbox" class="spendChargeCloseSalvoMode" name="attr_spendChargeCloseSalvo" value="1" /><span class="spendChargeCloseSalvoMode">Spend Charge &amp; Close Salvo Mode</span>
- 
+
             <!--Threat Off-page Box-->
             <div class="salvoThreatBox offPage">
                 <input type="number" class="salvoThreatRating" name="attr_salvoThreat" value="0" />
@@ -360,8 +360,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Culture" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Culture}+?{Culture Specialty|Anthropology, @{CultureAnthropology}|History, @{CultureHistory}|Lingustics, @{CultureLingustics}}+?{Advantage|0}]]d10>10f<4+[[[[@{Culture}+?{Culture Specialty|Anthropology, @{CultureAnthropology}|History, @{CultureHistory}|Lingustics, @{CultureLingustics}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Culture}+?{Culture Specialty|Anthropology, @{CultureAnthropology}|History, @{CultureHistory}|Lingustics, @{CultureLingustics}}+?{Advantage|0}]]d10>10f<4+[[[[@{Culture}+?{Culture Specialty|Anthropology, @{CultureAnthropology}|History, @{CultureHistory}|Lingustics, @{CultureLingustics}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Anthropology:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_CultureAnthropology" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -390,8 +390,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Economy" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Economy}+?{Economy Specialty|Accounting, @{EconomyAccounting}|Commerce, @{EconomyCommerce}|Trade, @{EconomyTrade}}+?{Advantage|0}]]d10>10f<4+[[[[@{Economy}+?{Economy Specialty|Accounting, @{EconomyAccounting}|Commerce, @{EconomyCommerce}|Trade, @{EconomyTrade}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Economy}+?{Economy Specialty|Accounting, @{EconomyAccounting}|Commerce, @{EconomyCommerce}|Trade, @{EconomyTrade}}+?{Advantage|0}]]d10>10f<4+[[[[@{Economy}+?{Economy Specialty|Accounting, @{EconomyAccounting}|Commerce, @{EconomyCommerce}|Trade, @{EconomyTrade}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Accounting:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_EconomyAccounting" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -420,8 +420,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Interface" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Interface}+?{Interface Specialty|Comms, @{InterfaceComms}|Network Defence, @{InterfaceNetworkDefence}|Research, @{InterfaceResearch}}+?{Advantage|0}]]d10>10f<4+[[[[@{Interface}+?{Interface Specialty|Comms, @{InterfaceComms}|Network Defence, @{InterfaceNetworkDefence}|Research, @{InterfaceResearch}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Interface}+?{Interface Specialty|Comms, @{InterfaceComms}|Network Defence, @{InterfaceNetworkDefence}|Research, @{InterfaceResearch}}+?{Advantage|0}]]d10>10f<4+[[[[@{Interface}+?{Interface Specialty|Comms, @{InterfaceComms}|Network Defence, @{InterfaceNetworkDefence}|Research, @{InterfaceResearch}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Comms:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_InterfaceComms" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -450,8 +450,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Politic" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Politic}+?{Politic Specialty|Administration, @{PoliticAdministration}|Group Dynamics, @{PoliticGroupDynamics}|Oratory, @{PoliticOratory}}+?{Advantage|0}]]d10>10f<4+[[[[@{Politic}+?{Politic Specialty|Administration, @{PoliticAdministration}|Group Dynamics, @{PoliticGroupDynamics}|Oratory, @{PoliticOratory}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Politic}+?{Politic Specialty|Administration, @{PoliticAdministration}|Group Dynamics, @{PoliticGroupDynamics}|Oratory, @{PoliticOratory}}+?{Advantage|0}]]d10>10f<4+[[[[@{Politic}+?{Politic Specialty|Administration, @{PoliticAdministration}|Group Dynamics, @{PoliticGroupDynamics}|Oratory, @{PoliticOratory}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Administration:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_PoliticAdministration" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -480,8 +480,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Sophontolgy" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Sophontolgy}+?{Sophontolgy Specialty|Insight, @{SophontolgyInsight}|Performance, @{SophontolgyPerformance}|Persuasion, @{SophontolgyPersuasion}}+?{Advantage|0}]]d10>10f<4+[[[[@{Sophontolgy}+?{Sophontolgy Specialty|Insight, @{SophontolgyInsight}|Performance, @{SophontolgyPerformance}|Persuasion, @{SophontolgyPersuasion}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Sophontolgy}+?{Sophontolgy Specialty|Insight, @{SophontolgyInsight}|Performance, @{SophontolgyPerformance}|Persuasion, @{SophontolgyPersuasion}}+?{Advantage|0}]]d10>10f<4+[[[[@{Sophontolgy}+?{Sophontolgy Specialty|Insight, @{SophontolgyInsight}|Performance, @{SophontolgyPerformance}|Persuasion, @{SophontolgyPersuasion}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Insight:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_SophontolgyInsight" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -514,8 +514,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Athletics" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Athletics}+?{Athletics Specialty|Sneak, @{AthleticsSneak}|Melee, @{AthleticsMelee}|Parkour, @{AthleticsParkour}}+?{Advantage|0}]]d10>10f<4+[[[[@{Athletics}+?{Athletics Specialty|Sneak, @{AthleticsSneak}|Melee, @{AthleticsMelee}|Parkour, @{AthleticsParkour}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Athletics}+?{Athletics Specialty|Sneak, @{AthleticsSneak}|Melee, @{AthleticsMelee}|Parkour, @{AthleticsParkour}}+?{Advantage|0}]]d10>10f<4+[[[[@{Athletics}+?{Athletics Specialty|Sneak, @{AthleticsSneak}|Melee, @{AthleticsMelee}|Parkour, @{AthleticsParkour}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Sneak:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_AthleticsSneak" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -544,8 +544,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Fitness" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Fitness}+?{Fitness Specialty|Martial Arts, @{FitnessMartialArts}|Endurance, @{FitnessEndurance}|Strength, @{FitnessStrength}}+?{Advantage|0}]]d10>10f<4+[[[[@{Fitness}+?{Fitness Specialty|Martial Arts, @{FitnessMartialArts}|Endurance, @{FitnessEndurance}|Strength, @{FitnessStrength}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Fitness}+?{Fitness Specialty|Martial Arts, @{FitnessMartialArts}|Endurance, @{FitnessEndurance}|Strength, @{FitnessStrength}}+?{Advantage|0}]]d10>10f<4+[[[[@{Fitness}+?{Fitness Specialty|Martial Arts, @{FitnessMartialArts}|Endurance, @{FitnessEndurance}|Strength, @{FitnessStrength}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Martial Arts:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_FitnessMartialArts" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -574,8 +574,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Geosciences" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Geosciences}+?{Geosciences Specialty|Architecture, @{GeosciencesArchitecture}|Planetology, @{GeosciencesPlanetology}|Mining, @{GeosciencesMining}}+?{Advantage|0}]]d10>10f<4+[[[[@{Geosciences}+?{Geosciences Specialty|Architecture, @{GeosciencesArchitecture}|Planetology, @{GeosciencesPlanetology}|Mining, @{GeosciencesMining}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Geosciences}+?{Geosciences Specialty|Architecture, @{GeosciencesArchitecture}|Planetology, @{GeosciencesPlanetology}|Mining, @{GeosciencesMining}}+?{Advantage|0}]]d10>10f<4+[[[[@{Geosciences}+?{Geosciences Specialty|Architecture, @{GeosciencesArchitecture}|Planetology, @{GeosciencesPlanetology}|Mining, @{GeosciencesMining}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Architecture:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_GeosciencesArchitecture" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -604,8 +604,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Perception" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Perception}+?{Perception Specialty|Survey, @{PerceptionSurvey}|Alertness, @{PerceptionAlertness}|Analysis, @{PerceptionAnalysis}}+?{Advantage|0}]]d10>10f<4+[[[[@{Perception}+?{Perception Specialty|Survey, @{PerceptionSurvey}|Alertness, @{PerceptionAlertness}|Analysis, @{PerceptionAnalysis}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Perception}+?{Perception Specialty|Survey, @{PerceptionSurvey}|Alertness, @{PerceptionAlertness}|Analysis, @{PerceptionAnalysis}}+?{Advantage|0}]]d10>10f<4+[[[[@{Perception}+?{Perception Specialty|Survey, @{PerceptionSurvey}|Alertness, @{PerceptionAlertness}|Analysis, @{PerceptionAnalysis}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Survey:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_PerceptionSurvey" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -634,8 +634,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Pilot" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Pilot}+?{Pilot Specialty|Grav Drive, @{PilotGravDrive}|Pulse Drive, @{PilotPulseDrive}|Archaic Vehicle, @{PilotArchaicVehicle}}+?{Advantage|0}]]d10>10f<4+[[[[@{Pilot}+?{Pilot Specialty|Grav Drive, @{PilotGravDrive}|Pulse Drive, @{PilotPulseDrive}|Archaic Vehicle, @{PilotArchaicVehicle}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Pilot}+?{Pilot Specialty|Grav Drive, @{PilotGravDrive}|Pulse Drive, @{PilotPulseDrive}|Archaic Vehicle, @{PilotArchaicVehicle}}+?{Advantage|0}]]d10>10f<4+[[[[@{Pilot}+?{Pilot Specialty|Grav Drive, @{PilotGravDrive}|Pulse Drive, @{PilotPulseDrive}|Archaic Vehicle, @{PilotArchaicVehicle}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Grav Drive:</div>
                     <div class="right">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_PilotGravDrive" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -668,8 +668,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Biosciences" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Biosciences}+?{Biosciences Specialty|Medicine, @{BiosciencesMedicine}|Biomechanics, @{BiosciencesBiomechanics}|Agriculture, @{BiosciencesAgriculture}}+?{Advantage|0}]]d10>10f<4+[[[[@{Biosciences}+?{Biosciences Specialty|Medicine, @{BiosciencesMedicine}|Biomechanics, @{BiosciencesBiomechanics}|Agriculture, @{BiosciencesAgriculture}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Biosciences}+?{Biosciences Specialty|Medicine, @{BiosciencesMedicine}|Biomechanics, @{BiosciencesBiomechanics}|Agriculture, @{BiosciencesAgriculture}}+?{Advantage|0}]]d10>10f<4+[[[[@{Biosciences}+?{Biosciences Specialty|Medicine, @{BiosciencesMedicine}|Biomechanics, @{BiosciencesBiomechanics}|Agriculture, @{BiosciencesAgriculture}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Medicine:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_BiosciencesMedicine" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -698,8 +698,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_FieldDynamics" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{FieldDynamics}+?{Field Dynamics Specialty|Holography, @{FieldDynamicsHolography}|Shield Mechanics, @{FieldDynamicsShieldMechanics}|Astronavigation, @{FieldDynamicsAstronavigation}}+?{Advantage|0}]]d10>10f<4+[[[[@{FieldDynamics}+?{Field Dynamics Specialty|Holography, @{FieldDynamicsHolography}|Shield Mechanics, @{FieldDynamicsShieldMechanics}|Astronavigation, @{FieldDynamicsAstronavigation}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{FieldDynamics}+?{Field Dynamics Specialty|Holography, @{FieldDynamicsHolography}|Shield Mechanics, @{FieldDynamicsShieldMechanics}|Astronavigation, @{FieldDynamicsAstronavigation}}+?{Advantage|0}]]d10>10f<4+[[[[@{FieldDynamics}+?{Field Dynamics Specialty|Holography, @{FieldDynamicsHolography}|Shield Mechanics, @{FieldDynamicsShieldMechanics}|Astronavigation, @{FieldDynamicsAstronavigation}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Holography:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_FieldDynamicsHolography" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -728,8 +728,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_PulseProjection" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{PulseProjection}+?{Pulse Projection Specialty|Away Weaponry, @{PulseProjectionAwayWeaponry}|Artillery, @{PulseProjectionArtillery}|Tractor Mechanics, @{PulseProjectionTractorMechanics}}+?{Advantage|0}]]d10>10f<4+[[[[@{PulseProjection}+?{Pulse Projection Specialty|Away Weaponry, @{PulseProjectionAwayWeaponry}|Artillery, @{PulseProjectionArtillery}|Tractor Mechanics, @{PulseProjectionTractorMechanics}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{PulseProjection}+?{Pulse Projection Specialty|Away Weaponry, @{PulseProjectionAwayWeaponry}|Artillery, @{PulseProjectionArtillery}|Tractor Mechanics, @{PulseProjectionTractorMechanics}}+?{Advantage|0}]]d10>10f<4+[[[[@{PulseProjection}+?{Pulse Projection Specialty|Away Weaponry, @{PulseProjectionAwayWeaponry}|Artillery, @{PulseProjectionArtillery}|Tractor Mechanics, @{PulseProjectionTractorMechanics}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Away Weaponry:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_PulseProjectionAwayWeaponry" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -758,8 +758,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Inscription" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Inscription}+?{Inscription Specialty|Hack, @{InscriptionHack}|Trace, @{InscriptionTrace}|Code, @{InscriptionCode}}+?{Advantage|0}]]d10>10f<4+[[[[@{Inscription}+?{Inscription Specialty|Hack, @{InscriptionHack}|Trace, @{InscriptionTrace}|Code, @{InscriptionCode}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Inscription}+?{Inscription Specialty|Hack, @{InscriptionHack}|Trace, @{InscriptionTrace}|Code, @{InscriptionCode}}+?{Advantage|0}]]d10>10f<4+[[[[@{Inscription}+?{Inscription Specialty|Hack, @{InscriptionHack}|Trace, @{InscriptionTrace}|Code, @{InscriptionCode}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Hack:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_InscriptionHack" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -788,8 +788,8 @@
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_Mechatronics" value="3" /><span class="inlinePips D10"></span>
                     </div>
                     <!--<div class="skillRollButton">
-                    <button class="rollButton" type="roll" value="/roll [[@{Mechatronics}+?{Mechatronics Specialty|Mechanics, @{MechatronicsMechanics}|Material Science, @{MechatronicsMaterialScience}|Archaic Technology, @{MechatronicsArchaicTechnology}}+?{Advantage|0}]]d10>10f<4+[[[[@{Mechatronics}+?{Mechatronics Specialty|Mechanics, @{MechatronicsMechanics}|Material Science, @{MechatronicsMaterialScience}|Archaic Technology, @{MechatronicsArchaicTechnology}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
-                </div>-->
+                        <button class="rollButton" type="roll" value="/roll [[@{Mechatronics}+?{Mechatronics Specialty|Mechanics, @{MechatronicsMechanics}|Material Science, @{MechatronicsMaterialScience}|Archaic Technology, @{MechatronicsArchaicTechnology}}+?{Advantage|0}]]d10>10f<4+[[[[@{Mechatronics}+?{Mechatronics Specialty|Mechanics, @{MechatronicsMechanics}|Material Science, @{MechatronicsMaterialScience}|Archaic Technology, @{MechatronicsArchaicTechnology}}+?{Advantage|0}]]d1>1]]+?{Threat Dice|3}d6>7f<3"></button>
+                    </div>-->
                     <div class="specialty">Mechanics:</div>
                     <div class="specialtydice">
                         <input type="radio" class="inlinePipCheckbox hideCheckbox" name="attr_MechatronicsMechanics" value="0" checked /><span class="inlinePips ZeroDie"></span>
@@ -4073,7 +4073,7 @@
         </div>
     </div>
 
-       
+
     <!-- ------------------- -->
     <!--    Sophont Log      -->
     <!-- ------------------- -->
@@ -4271,7 +4271,7 @@
         </div>
     </div>
 
-        
+
     <!-- --------------------- -->
     <!-- Composite Sophont Log -->
     <!-- --------------------- -->
@@ -4595,8 +4595,8 @@
             </div>
         </div>
     </div>
-        
-    
+
+
     <!-- --------------------- -->
     <!--	  Swarm Log        -->
     <!-- --------------------- -->
@@ -5060,8 +5060,8 @@
             </div>
         </div>
     </div>
-        
-    
+
+
     <!-- ----------------------- -->
     <!--	  Creature Log   	 -->
     <!-- ----------------------- -->
@@ -5393,8 +5393,8 @@
             </div>
         </div>
     </div>
-        
-    
+
+
     <!-- --------------------- -->
     <!--	  Behemoth Log     -->
     <!-- --------------------- -->
@@ -5825,8 +5825,8 @@
             </div>
         </div>
     </div>
-        
-    
+
+
     <!-- --------------------- -->
     <!--	  Drone Log        -->
     <!-- --------------------- -->
@@ -6300,7 +6300,7 @@
         </div>
     </div>
 
-        
+
     <!-- ----------------------- -->
     <!--	  Shuttle Log        -->
     <!-- ----------------------- -->
@@ -6813,8 +6813,8 @@
             </div>
         </div>
     </div>
-        
-    
+
+
     <!-- ----------------------- -->
     <!--	Small Craft Log      -->
     <!-- ----------------------- -->
@@ -7083,8 +7083,8 @@
             </div>
         </div>
     </div>
-        
-    
+
+
     <!-- ----------------------- -->
     <!--		Ship Log         -->
     <!-- ----------------------- -->
@@ -7410,8 +7410,8 @@
             </div>
         </div>
     </div>
-        
-    
+
+
     <!-- ----------------------- -->
     <!--    Capital Ship Log     -->
     <!-- ----------------------- -->
@@ -8107,14 +8107,57 @@
 <!-- ----------------------- -->
 <rolltemplate class="sheet-rolltemplate-FS">
     <div class="rolltemplateContainer">
-        <div class="rolltemplateSkill">{{salvoSkill}}<span>(</span>{{salvoSkillRating}}<span>)</span></div>
-        <div class="rolltemplateSpecialty">{{salvoSpecialty}}<span>(</span>{{salvoSpecialtyRating}}<span>)</span></div>
-        <div class="rolltemplateTool">{{salvoTool}}<span>(</span>{{salvoToolRating}}<span>) costing </span> {{salvoCharge}}<span> Charge</span></div>
-        <div class="taskDice">{{task0}}{{task1}}{{task2}}{{task3}}{{task4}}{{task5}}{{task6}}{{task7}}{{task8}}{{task9}}+{{autoHits}}</div>
-        <div class="threatDice">{{threat0}}{{threat1}}{{threat2}}{{threat3}}{{threat4}}{{threat5}}{{threat6}}{{threat7}}{{threat8}}{{threat9}}+{{autoMisses}}</div>
-        <div class="result">Result: {{total}} </div>
-        <!--Roll Outcome-->
-        <div class="outcome">
+        <div class="rolltemplateHeader">Salvo</div>
+        <div class="rolltemplateTextRows rolltemplateCol1 rolltemplateRow1">{{salvoSkill}}<span>(</span>{{salvoSkillRating}}<span>)</span></div>
+        <div class="rolltemplateTextRows rolltemplateCol2 rolltemplateRow1">{{salvoSpecialty}}<span>(</span>{{salvoSpecialtyRating}}<span>)</span></div>
+        <div class="rolltemplateTextRows rolltemplateCol1 rolltemplateRow2">{{salvoTool}}<span>(</span>{{salvoToolRating}}<span>)</span></div>
+        <div class="rolltemplateTextRows rolltemplateCol2 rolltemplateRow2"><span>Charge(</span>{{salvoCharge}}<span>)</span></div>
+
+        <!--Task Dice-->
+        <div class="taskDiceSubheader">Task Dice//</div>
+        <div class="taskDice dice die0">{{task0}}</div>
+        <div class="taskDice dice die1">{{task1}}</div>
+        <div class="taskDice dice die2">{{task2}}</div>
+        <div class="taskDice dice die3">{{task3}}</div>
+        <div class="taskDice dice die4">{{task4}}</div>
+        <div class="taskDice dice die5">{{task5}}</div>
+        <div class="taskDice dice die6">{{task6}}</div>
+        <div class="taskDice dice die7">{{task7}}</div>
+        <div class="taskDice dice die8">{{task8}}</div>
+        <div class="taskDice dice die9">{{task9}}</div>
+
+        <!--Threat Dice-->
+        <div class="threatDiceSubheader">Threat Dice//</div>
+        <div class="threatDice dice die0">{{threat0}}</div>
+        <div class="threatDice dice die1">{{threat1}}</div>
+        <div class="threatDice dice die2">{{threat2}}</div>
+        <div class="threatDice dice die3">{{threat3}}</div>
+        <div class="threatDice dice die4">{{threat4}}</div>
+        <div class="threatDice dice die5">{{threat5}}</div>
+        <div class="threatDice dice die6">{{threat6}}</div>
+        <div class="threatDice dice die7">{{threat7}}</div>
+        <div class="threatDice dice die8">{{threat8}}</div>
+        <div class="threatDice dice die9">{{threat9}}</div>
+
+        <!--Excess Dice-->
+        <div class="excessDiceSubheader">Excess Dice//</div>
+        <div class="autoHits">
+            {{#rollGreater() autoHits 0}}
+            <span>add {{autoHits}} Hits</span>
+            {{/rollGreater() autoHits 0}}
+        </div>
+        <div class="autoMisses">
+            {{#rollGreater() autoMisses 0}}
+            <span>add {{autoMisses}} Misses</span>
+            {{/rollGreater() autoMisses 0}}
+        </div>
+
+        <!--Results-->
+        <div class="resultsSubheader">Result//</div> <div class="result">{{total}} </div>
+
+        <!--Outcome-->
+        <div class="outcomeSubheader">Outcome//</div>
+        <div class="rolltemplateTextRows outcome">
             <!--Double Critical Roll Outcome-->
             {{#rollGreater() total 4 }}
             <span>Critical(5+)</span>
@@ -8611,7 +8654,7 @@
 
         //Set the Salvo Tool Rating, track Charge spent, and limit spending to current ReactorCharge
         on("change:salvomod1 change:salvomod2 change:salvomod3 change:salvomod4 change:salvomod5 change:salvomod6 change:salvomod7 change:salvomod8 change:salvomod9 change:salvomod10 change:salvomod11 change:salvomod12 change:salvomod13 change:salvomod14 change:salvomod15 change:salvomod16 change:salvomod17 change:salvomod18 change:salvomod19 change:salvomod20", (event) =>
-        {            
+        {
             getAttrs(["salvoTool", "ReactorCharge", "ReactorOvercharge",
                 "salvoMod1", "salvoMod2", "salvoMod3", "salvoMod4", "salvoMod5",
                 "salvoMod6", "salvoMod7", "salvoMod8", "salvoMod9", "salvoMod10",
@@ -9631,7 +9674,7 @@
                 setAttrs(setObj);
             })
         });
-                
+
         //Cargo Total
         on("change:repeating_shipcargo remove:repeating_shipcargo change:supply change:complexmaterials", (event) =>
         {