diff --git a/Free Spacer/FreeSpacer.css b/Free Spacer/FreeSpacer.css
index 229b3e0a24..141147bac2 100644
--- a/Free Spacer/FreeSpacer.css	
+++ b/Free Spacer/FreeSpacer.css	
@@ -488,10 +488,59 @@ select.sheet-typeSelector
 	font-size: 11px;
 }
 
+/* Salvo Mode Button */
+.sheet-salvoRollButton
+{
+	position: absolute;
+	top: 170px;
+	left: 0;
+}
+
+input[type="checkbox"].sheet-hideSalvoModeCheckbox
+{
+	
+	opacity: 0;
+	cursor: pointer;
+	z-index: 19;
+	width: 25px;
+	height: 200px;
+	margin: 0;
+	padding: 0;
+	font-size: 25px;
+	vertical-align: top;
+}
+
+span.sheet-salvoMode
+{
+	z-index: 18;
+	width: 25px;
+	height: 200px;
+	vertical-align: top;
+}
+
+/* Inactive Salvo Mode Button*/
+input.sheet-salvoRollButton + span.sheet-salvoMode
+{
+	background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Free%20Spacer/images/sys-int.png);
+	background-repeat: repeat;
+	background-position: top;
+	opacity: 1;
+	background-size: 25px 25px;
+}
+/* Active Salvo Mode Button*/
+input.sheet-salvoRollButton:checked + span.sheet-salvoMode
+{
+	background-image: url(https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Free%20Spacer/images/sys-int2.png);
+	background-repeat: repeat;
+	background-position: top;
+	opacity: 1;
+	background-size: 25px 25px;
+}
+
 /* Salvo Widget */
 .sheet-salvo
 {
-	position:absolute;
+	position: absolute;
 	z-index: 10;
 	display: grid;
 	width: 900px;
@@ -546,7 +595,19 @@ select.sheet-typeSelector
 	justify-self: center;
 }
 
-/* Specialty Hidding Functionality */
+/* Salvo Mode Hiding Functionality */
+div.sheet-salvo
+{
+	display: none;
+}
+
+input[type="checkbox"].sheet-salvoRollButton:checked ~ div.sheet-salvo
+{
+	display: grid;
+}
+
+
+/* Specialty Hiding Functionality */
 option.sheet-specialtyChoice
 {
 	display: none;
@@ -568,7 +629,7 @@ input.sheet-fieldDynamicsSelector:checked ~ div.sheet-capitalShipSheet
 	display: block;
 }
 
-/* Tool Hidding Functionality */
+/* Tool Hiding Functionality */
 optgroup.sheet-scaleChoice
 {
 	display: none;
diff --git a/Free Spacer/FreeSpacer.html b/Free Spacer/FreeSpacer.html
index 604ce5ae5b..2723c3c91e 100644
--- a/Free Spacer/FreeSpacer.html	
+++ b/Free Spacer/FreeSpacer.html	
@@ -44,6 +44,9 @@
 	<!-- ------------------- -->
 	<div class="sheetType crewmemberSheet">
 		<!--Salvo Roller-->
+		<input type="checkbox" name="attr_salvoMode" class="hideSalvoModeCheckbox salvoRollButton" value="1" />
+		<span class="salvoMode salvoRollButton"></span>
+
 		<div class="salvo">
 			<div class="salvoTitle">Salvo</div>
 			<div class="taskDice">
@@ -140,7 +143,7 @@
 				<div>Difficulty</div>
 				<input type="number" value="3" min="0" max="10" name="attr_salvoDifficulty" />
 				<div>Disadvantage</div>
-				<input type="number" value="0" min="0" max="10" name="attr_salvoDisadvantage"/>
+				<input type="number" value="0" min="0" max="10" name="attr_salvoDisadvantage" />
 			</div>
 			<div class="rollSalvo">
 				Roll Salvo
@@ -148,6 +151,9 @@
 			</div>
 
 		</div>
+
+
+
 		<div class="crewmemberSheetGrid">
 			<!--Crew Sheet Top -->
 			<div class="crewTop">
@@ -218,8 +224,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -248,8 +254,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -278,8 +284,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -308,8 +314,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -338,8 +344,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -372,8 +378,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -402,8 +408,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -432,8 +438,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -462,8 +468,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -492,8 +498,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -526,8 +532,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -556,8 +562,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -586,8 +592,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -616,8 +622,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="checked" /><span class="inlinePips ZeroDie"></span>
@@ -646,8 +652,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="checked" /><span class="inlinePips ZeroDie"></span>