diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.css b/Shadowrun5thEdition/Shadowrun5thEdition.css
index 32b962c60d..f839070709 100644
--- a/Shadowrun5thEdition/Shadowrun5thEdition.css
+++ b/Shadowrun5thEdition/Shadowrun5thEdition.css
@@ -132,7 +132,7 @@
 	    display: none;} 
 
 	.sheet-static,
-	.sheet-sheet_type[value="goon"] ~ .sheet-npc,
+	.sheet-sheet_type[value="grunt"] ~ .sheet-npc,
 	.sheet-sheet_type[value="host"] ~ .sheet-npc,
 	.sheet-sheet_type[value="sprite"] ~ .sheet-npc,
 	.sheet-sheet_type[value="vehicle"] ~ .sheet-npc,
@@ -569,7 +569,7 @@
 
 			.sheet-attr-box input.sheet-settings-toggle + span,
 			.sheet-condition-box input[type="checkbox"] + span  {
-				color: #fff;}
+				color: #9a9a9a;}
 
 			/***** ATTRIBUTE SETTINGS TOGGLE *****/
 				.sheet-attr-box input.sheet-settings-toggle {left: 65%;}
@@ -958,7 +958,7 @@
 
 					.sheet-weapon-range h3:first-child,
 					.sheet-weapon-melee h3:first-child {
-								margin-right: 8px;}
+						margin-right: 2%;}
 
 					.sheet-weapon-melee h3:first-child,
 					.sheet-weapon-melee input[type="text"]:first-child {
@@ -969,7 +969,7 @@
 
 				.sheet-weapon-range h3:nth-child(2),
 				.sheet-weapon-range h3:nth-child(5) {
-					width: 11%;}
+					width: 6%;}
 
 				.sheet-weapon-melee input,			
 				.sheet-weapon-melee .sheet-display-row {
@@ -985,7 +985,7 @@
 						display: inline;}
 
 		/***** ARMOR *****/
-			.sheet-armor-box h3 {margin-right: 5.5px;}
+			.sheet-armor-box h3 {margin-right: 1%;}
 
 			.sheet-armor-box button:nth-child(1n+2) {
 				height: 25px;
@@ -1132,7 +1132,7 @@
 		.sheet-powers-box .sheet-display .sheet-display-row:nth-of-type(1) {
 			margin-right: 1%;}
 
-		.sheet-spell-box h3 {width: 15%;}
+		.sheet-spell-box h3 {width: 13%;}
 
 		.sheet-powers-box h3,
 		.sheet-powers-box input[type="number"],
@@ -1663,7 +1663,7 @@
 
 	/*:+:+:+: NPC SETTINGS & DISPLAYS :+:+:+:*/
 		.sheet-npc .sheet-display,
-		.sheet-npc .sheet-display .sheet-goon,
+		.sheet-npc .sheet-display .sheet-grunt,
 		.sheet-npc .sheet-display .sheet-host,
 		.sheet-npc .sheet-display .sheet-vehicle,
 		.sheet-npc .sheet-display .sheet-sprite {
@@ -1702,10 +1702,11 @@
 		.sheet-npc .sheet-skill-box select {
 			font-size: 1em;
 			height: 25px;
+			margin-right: 2%;
 			width: 60%;}
 
 			.sheet-npc .sheet-skill-box select:last-child {
-				margin-left: 6%;
+				margin-left: 1%;
 				text-transform: capitalize;
 				width: 14%;}
 
@@ -1749,7 +1750,10 @@
 
 			.sheet-npc-repeating .sheet-settings {min-width: 700px;}
 
-			.sheet-npc-repeating .sheet-settings input[type="text"] {width: 51%;}
+			.sheet-npc-repeating .sheet-settings input[type="text"] {
+				margin-left: 2%;
+				margin-right: 2%;
+				width: 51%;}
 
 
 	/*:+:+:+: NPC ATTRIBUTES :+:+:+:*/
@@ -2034,14 +2038,14 @@
 		.sheet-optional-flag[value="0"] + .sheet-attr-header,
 		.sheet-category + div,
 		.sheet-category + div + div,
-		.sheet-goon,
+		.sheet-grunt,
 		.sheet-host,
 		.sheet-sprite,
 		.sheet-vehicle  {
 			display: none;}
 
 		.sheet-optional-flag:not([value="0"]) + .sheet-optional,
-		.sheet-npc-type[value="goon"] ~ .sheet-goon,
+		.sheet-npc-type[value="grunt"] ~ .sheet-grunt,
 		.sheet-npc-type[value="host"] ~ .sheet-host,
 		.sheet-npc-type[value="sprite"] ~ .sheet-sprite,
 		.sheet-npc-type[value="vehicle"] ~ .sheet-vehicle {
@@ -2058,7 +2062,7 @@
 
 		.sheet-category[value="Combat"] ~ .sheet-combat-type-hide {display: inline;}
 
-		.sheet-npc-type[value="goon"] ~ div.sheet-goon.sheet-attribute,
+		.sheet-npc-type[value="grunt"] ~ div.sheet-grunt.sheet-attribute,
 		.sheet-npc-type[value="host"] ~ div.sheet-host.sheet-attribute,
 		.sheet-npc-type[value="sprite"] ~ div.sheet-sprite.sheet-attribute,
 		.sheet-npc-type[value="vehicle"] ~ div.sheet-vehicle.sheet-attribute {
diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.html b/Shadowrun5thEdition/Shadowrun5thEdition.html
index dae2b13816..3e6ec5c2a6 100644
--- a/Shadowrun5thEdition/Shadowrun5thEdition.html
+++ b/Shadowrun5thEdition/Shadowrun5thEdition.html
@@ -30,7 +30,7 @@
 		</div>
 		<div class="tab-sheet" title="Sheet Type">
 			<select name="attr_sheet_type">
-				<option value="goon" data-i18n="goon">Goon</option>
+				<option value="grunt" data-i18n="grunt">grunt</option>
 				<option value="host" data-i18n="host">Host</option>
 				<option value="sprite" data-i18n="sprite">Sprite</option>
 				<option value="vehicle" data-i18n="vehicle">Vehicle</option>
@@ -860,7 +860,7 @@
 								<div>
 									<input type="text" name="attr_weapon" placeholder="Ares Alpha" title="Weapon name" />
 									<input type="text" name="attr_damage" placeholder="11P" style="width: 11%;" title="Damage"  />
-									<input type="number" name="attr_acc" placeholder="5" title="Accuracy"  />
+									<input type="text" name="attr_acc" placeholder="5" title="Accuracy"  />
 									<input type="number" name="attr_ap" placeholder="-2" title="Armor Penetration"  />
 									<select name="attr_mode" title="Current mode" >
 										<option value="BF" data-i18n="bf">BF</option>
@@ -1024,22 +1024,22 @@
 							</div>
 							<div class="display-row hoverswitch" title="Armor roll">
 								<button type="roll" value="@{gm_toggle} &{template:sRun}{{header=@{armor}}}{{base= Armor}}{{dice=[[(@{rating}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}">
-								<span class="default" name="attr_rating"></span><!--<span class="hover" name="attr_soak"></span>--></button>
+								<span class="default" name="attr_rating"></span></button>
 							</div>
 							<div class="display-row hoverswitch" title="Acid protection roll"><button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Acid Protection}}{{base=Body ♦ Armor}}{{dice=[[(@{body}+@{rating}+@{dicepool_modifier}+@{acid_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}">
-								<span class="default" name="attr_acid_modifier"></span><!--<span class="hover" name="attr_acid_protection"></span>--></button>
+								<span class="default" name="attr_acid_modifier"></span></button>
 							</div>
 							<div class="display-row hoverswitch" title="Cold protection roll"><button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Cold Protection}}{{base=Body ♦ Armor}}{{dice=[[(@{body}+@{rating}+@{dicepool_modifier}+@{cold_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}">
-								<span class="default" name="attr_cold_modifier"></span><!--<span class="hover" name="attr_cold_protection"></span>--></button>
+								<span class="default" name="attr_cold_modifier"></span></button>
 							</div>
 							<div class="display-row hoverswitch" title="Electrical protection roll"><button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Electrical Protection}}{{base=Body ♦ Armor}}{{dice=[[(@{body}+@{rating}+@{dicepool_modifier}+@{electrical_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}">
-								<span class="default" name="attr_electrical_modifier"></span><!--<span class="hover" name="attr_electrical_protection"></span>--></button>
+								<span class="default" name="attr_electrical_modifier"></span></button>
 							</div>
 							<div class="display-row hoverswitch" title="Fire protection roll"><button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Fire Protection}}{{base=Body ♦ Armor}}{{dice=[[(@{body}+@{rating}+@{dicepool_modifier}+@{fire_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}">
-								<span class="default" name="attr_fire_modifier"></span><!--<span class="hover" name="attr_fire_protection"></span>--></button>
+								<span class="default" name="attr_fire_modifier"></span></button>
 							</div>
 							<div class="display-row hoverswitch" title="Radiation protection roll"><button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Radiation Protection}}{{base=Body ♦ Armor}}{{dice=[[(@{body}+@{rating}+@{dicepool_modifier}+@{radiation_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}">
-								<span class="default" name="attr_radiation_modifier"></span><!--<span class="hover" name="attr_radiation_protection"></span>--></button>
+								<span class="default" name="attr_radiation_modifier"></span></button>
 							</div>
 							<input class="display-flag" type="checkbox" name="attr_display_flag" title="Display notes" /><span>i</span>
 							<div class="collapsable">
@@ -1756,7 +1756,7 @@
 							<h2 data-i18n="sheetselect">Sheet Select</h2><br />
 							<select name="attr_sheet_type" title="@{sheet_type}">
 								<option value="pc" data-i18n="pc">PC</option>
-								<option value="goon" data-i18n="goon">Goon</option>
+								<option value="grunt" data-i18n="grunt">grunt</option>
 								<option value="host" data-i18n="host">Host</option>
 								<option value="sprite" data-i18n="sprite">Sprite</option>
 								<option value="vehicle" data-i18n="vehicle">Vehicle</option>
@@ -1798,12 +1798,13 @@
 <!-- ~~~~~~~~:+:+::+:+:+:+:+::+:+:+:+:+:+: Start of NPC Sheet :+:+::+:+:+::+:+:+:+::+:+:+::+:+:+:+::+:+:::::+:+:~~~~~~~~ -->
 <!-- ~~~~~~~~+:+:::::+:+::+:+:::::+:+::+:+:+::+:+:+:+::+:+:::::+:+:::::+:+:+:+:::::+:+::+:+:+::+:+:+:+::+:+:::::+:+:+~~~~~~~~ -->
 <div class="npc">
-	<div class="stats toggle"><!-- ~~~~~~~~ Start of the Goon Sheet  ~~~~~~~~ -->
+	<div class="stats toggle">
+		<!-- ~~~~~~~~ Start of the grunt Sheet  ~~~~~~~~ -->
 		<input type="checkbox" class="settings-toggle npc-stats-toggle" name="attr_stats_toggle" checked="checked" /><span>y</span>
 		<div class="settings stat-inputs">
-			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
-		<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
-			<div class="goon attribute">
+			<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
+			<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
+			<div class="grunt attribute">
 				<input type="hidden" class="character-type" name="attr_flag_special" />
 				<div class="attr-header">
 					<label data-i18n="b">B</label><br />
@@ -1878,9 +1879,10 @@
 			</div>
 		<!-- ~~~~~~~~ modifieres  ~~~~~~~~ -->
 			<h1 data-i18n="bonuses">Bonuses</h1>
-			<div class="leftcol"><!--Start Left modifieres-->
-			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
-				<div class="goon">
+			<div class="leftcol">
+				<!--Start Left modifieres-->
+				<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
+				<div class="grunt">
 					<label data-i18n="initiative">Initiative</label><span class="colon">: </span>
 					<input type="hidden" name="attr_initiative_mod" value="6" />
 					<input type="hidden" name="attr_initiative_dice" min="1" max="5" value="1" />
@@ -1895,7 +1897,7 @@
 						<input type="number" name="attr_astral_dice_modifier" min="0" max="3" placeholder="0" title="@{astral_dice_modifier}" value="0"  /><span data-i18n="d6"> d6</span>
 					</div>
 				</div>
-				<div class="goon sprite">
+				<div class="grunt sprite">
 					<label data-i18n="matrixinitiative">Matrix Initiative</label><span class="colon">: </span>
 					<input type="hidden" name="attr_matrix_mod" value="0" />
 					<input type="hidden" name="attr_matrix_dice" max="5" />
@@ -1903,7 +1905,7 @@
 					<input type="number" name="attr_matrix_dice_modifier" min="0" max="4" placeholder="0" title="@{matrix_dice_modifier}" value="0" /><span data-i18n="d6"> d6</span>
 					<br />
 				</div>
-				<div class="goon">
+				<div class="grunt">
 					<label data-i18n="movement">Movement</label><span class="colon">: </span>
 					<input type="hidden" name="attr_walk" value="12" />
 					<input type="hidden" name="attr_run" value="24" />
@@ -1945,13 +1947,15 @@
 					<label data-i18n="devicerating">Device Rating </label><span class="colon">: </span>
 						<input type="number" name="attr_device_rating" min="0" placeholder="0" title="@{device_rating}" value="" /><br />
 				</div>
-				<div class="goon vehicle">
+				<div class="grunt vehicle">
 					<label data-i18n="defense">Defense</label><span class="colon">: </span>
 					<input type="hidden" name="attr_defense" value="6" />
 					<input type="number" name="attr_defense_modifier" placeholder="0" value="0" />
 				</div>
-			</div><!--End Left modifieres-->
-			<div class="goon vehicle 2col"><!--Start Mid modifieres-->
+			</div>
+			<!--End Left modifieres-->
+			<div class="grunt vehicle 2col">
+				<!--Start Mid modifieres-->
 				<label data-i18n="armorrating">Armor Rating </label><span class="colon">: </span>
 					<input type="number" name="attr_armor_rating" placeholder="9" title="@{armor_rating}" value="0" /><br />
 				<label data-i18n="soakbonus">Soak Bonus </label><span class="colon">: </span>
@@ -1963,33 +1967,42 @@
 				<label data-i18n="electricalprotection">Electrical Protection </label><span class="colon">: </span>
 					<input type="number" name="attr_electrical_modifier" placeholder="0" title="@{electrical_modifier}" value="0" /><br />
 				<label data-i18n="fireprotection">Fire Protection </label><span class="colon">: </span>
-					<input type="number" name="attr_fire_modifier" placeholder="0" value="0" title="@{fire_modifier}"" /><br />
+				<input type="number" name="attr_fire_modifier" placeholder="0" value="0" title="@{fire_modifier}"" /><br />
 				<label data-i18n="radiationprotection">Radiation Protection </label><span class="colon">: </span>
-					<input type="number" name="attr_radiation_modifier" placeholder="0" title="@{radiation_modifier}" value="0" /><br />
+				<input type="number" name="attr_radiation_modifier" placeholder="0" title="@{radiation_modifier}" value="0" /><br />
 			</div>
-			<div class="goon 2col"><!--Start Right Checkboxes -->
-				<input class="character-type" type="radio" name="attr_flag_special" checked="checked" title="@{flag_special}" value="mundane" /><label data-i18n="mundane">Mundane</label><br />
-				<input class="character-type" type="radio" name="attr_flag_special" title="@{flag_special}" value="magic" /><label data-i18n="awakened">Awakened</label><br />
-				<input class="character-type" type="radio" name="attr_flag_special" title="@{flag_special}" value="resonance" /><label data-i18n="emerged">Emerged</label><br />
-				<input class="character-type" type="checkbox" name="attr_flag_matrix" title="@{flag_matrix}" value="matrix" /><label data-i18n="matrixdevice">Matrix Device</label><br />
+			<div class="grunt 2col">
+				<!--Start Right Checkboxes -->
+				<input class="character-type" type="radio" name="attr_flag_special" checked="checked" title="@{flag_special}" value="mundane" /><label
+				 data-i18n="mundane">Mundane</label><br />
+				<input class="character-type" type="radio" name="attr_flag_special" title="@{flag_special}" value="magic" /><label
+				 data-i18n="awakened">Awakened</label><br />
+				<input class="character-type" type="radio" name="attr_flag_special" title="@{flag_special}" value="resonance" /><label
+				 data-i18n="emerged">Emerged</label><br />
+				<input class="character-type" type="checkbox" name="attr_flag_matrix" title="@{flag_matrix}" value="matrix" /><label
+				 data-i18n="matrixdevice">Matrix Device</label><br />
 			</div>
 			<div class="vehicle 2col"><!--Start Right Checkboxes -->
 				<input class="character-type" type="checkbox" name="attr_flag_drone" title="@{flag_drone}" value="drone" /><label data-i18n="drone">Drone</label><br />
 			</div>
 			<br />
-		<!-- ~~~~~~~~ Qualities/Augs/Init/Gear/Weakness & Other STUFF ~~~~~~~~ -->
-			<div class="goon textrow">
-				<label data-i18n="qualities">Qualities </label><span class="colon">: </span><textarea name="attr_quality" placeholder="Quality" title="@{quality}"></textarea><br />
-				<label data-i18n="augmentations">Augmentations </label><span class="colon">: </span><textarea name="attr_augmentations" placeholder="Augmentations" title="@{augmentations}"></textarea><br />
+			<hr />
+			<!-- ~~~~~~~~ Qualities/Augs/Init/Gear/Weakness & Other STUFF ~~~~~~~~ -->
+			<div class="grunt textrow">
+				<label data-i18n="qualities">Qualities </label><span class="colon">: </span><textarea name="attr_quality"
+				 placeholder="Quality" title="@{quality}"></textarea><br />
+				<label data-i18n="augmentations">Augmentations </label><span class="colon">: </span><textarea name="attr_augmentations"
+				 placeholder="Augmentations" title="@{augmentations}"></textarea><br />
 			</div>
-			<div class="goon vehicle textrow">
-				<label data-i18n="gear">Gear </label><span class="colon">: </span><textarea name="attr_gear" placeholder="Gear" title="@{gear}"></textarea>
+			<div class="grunt vehicle textrow">
+				<label data-i18n="gear">Gear </label><span class="colon">: </span><textarea name="attr_gear" placeholder="Gear"
+				 title="@{gear}"></textarea>
 			</div>
 			<div class="vehicle textrow">
 				<label data-i18n="programs">Programs </label><span class="colon">: </span><textarea name="attr_programs" placeholder="Programs" title="@{programs}"></textarea><br />
 				<label data-i18n="modifications">Modifications </label><span class="colon">: </span><textarea name="attr_modifications" placeholder="Modifications" title="@{modifications}"></textarea>
 			</div>
-			<div class="goon textrow">
+			<div class="grunt textrow">
 				<input type="hidden" class="character-type" name="attr_flag_special" />
 				<div class="magic textrow">
 					<label data-i18n="initiate">Initiate </label><span class="colon">: </span>
@@ -2005,9 +2018,9 @@
 			</div>
 		</div><!-- ~~~~~~~~ End of Settings  ~~~~~~~~ -->
 		<div class="display">
-		<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
-			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
-			<div class="goon attribute">
+			<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
+			<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
+			<div class="grunt attribute">
 				<input type="hidden" class="character-type" name="attr_flag_special" />
 				<div class="attr-header"><label><button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Body}}{{base=Base}}{{dice=[[(@{body}+(?{Attribute|None,0|Body,@{body}|Agility,@{agility}|Reaction,@{reaction}|Strength,@{strength}|Willpower,@{willpower}|Logic,@{logic}|Intuition,@{intuition}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Body Roll" data-i18n="b">B</button></label><br /><span name="attr_display_body"></span></div>
 				<div class="attr-header"><label><button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Agility}}{{base=Base}}{{dice=[[(@{agility}+(?{Attribute|None,0|Body,@{body}|Agility,@{agility}|Reaction,@{reaction}|Strength,@{strength}|Willpower,@{willpower}|Logic,@{logic}|Intuition,@{intuition}|Charisma,@{charisma}|Edge,@{edge}})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Agility Roll" data-i18n="a">A</button></label><br /><span name="attr_display_agility"></span></div>
@@ -2105,8 +2118,8 @@
 					<span name="attr_firewall"></span>
 				</div>
 			</div>
-		<!-- ~~~~~~~~ Initiative  ~~~~~~~~ -->
-			<div class="goon">
+			<!-- ~~~~~~~~ Initiative  ~~~~~~~~ -->
+			<div class="grunt">
 				<div>
 					<label>
 						<button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Initiative}}{{base=Base}}{{dice=[[(@{initiative_mod}+@{wound_toggle}+@{modifier_toggle})+(@{initiative_dice})d6cf0 &{tracker}]]}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Initiative Roll" data-i18n="initiate">Initiative</button><span class="colon">: </span>
@@ -2123,14 +2136,16 @@
 					<br />
 				</div>
 			</div>
-		<!-- ~~~~~~~~ Matrix Initiative  ~~~~~~~~ -->
-			<div class="host goon sprite vehicle">
-				<label><button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Matrix Initiative}}{{base=Base}}{{dice=[[(@{matrix_mod}+@{wound_toggle}+@{modifier_toggle})+(@{matrix_dice})d6cf0 &{tracker}]]}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Matrix Initiative Roll" data-i18n="matrixinitiative">Matrix Initiative</button><span class="colon">: </span>
+			<!-- ~~~~~~~~ Matrix Initiative  ~~~~~~~~ -->
+			<div class="host grunt sprite vehicle">
+				<label><button type="roll" value="@{gm_toggle} &{template:sRun}{{header=Matrix Initiative}}{{base=Base}}{{dice=[[(@{matrix_mod}+@{wound_toggle}+@{modifier_toggle})+(@{matrix_dice})d6cf0 &{tracker}]]}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}{{edge=[[@{edge_toggle}]]}}"
+					 title="Matrix Initiative Roll" data-i18n="matrixinitiative">Matrix Initiative</button><span class="colon">:
+					</span>
 				</label>
 				<span name="attr_display_matrix_mod"></span><span> + </span><span name="attr_matrix_dice"></span><span data-i18n="d6">d6</span>
 			</div>
-			<div class="goon">
-		<!-- ~~~~~~~~ Movement  ~~~~~~~~ -->
+			<div class="grunt">
+				<!-- ~~~~~~~~ Movement  ~~~~~~~~ -->
 				<div>
 					<label data-i18n="movement">Movement</label><span class="colon">: </span>
 					<span name="attr_walk" title="@{walk}"></span><span> / </span><span name="attr_run" title="@{run}"></span><span> / +</span><span name="attr_movement_mod" title="@{movement_mod}"></span>
@@ -2171,8 +2186,8 @@
 			<div class="host">
 				<label class="cond-header" data-i18n="conditionmonitorm">Condition Monitor (M)</label><span class="colon">: </span><span name="attr_matrix" title="@{matrix}"></span>
 			</div>
-		<!-- ~~~~~~~~ Armor  ~~~~~~~~ -->
-			<div class="goon vehicle">
+			<!-- ~~~~~~~~ Armor  ~~~~~~~~ -->
+			<div class="grunt vehicle">
 				<div>
 					<label>
 						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Soak}}{{base=Base}}{{dice=[[(@{soak}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Soak Roll" data-i18n="armor">
@@ -2184,17 +2199,17 @@
 					</button>
 					<div class="armor-buttons">
 						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Defense}}{{base=Base}}{{dice=[[(@{defense}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Defense Roll"><span class="pictosC">e</span></button>
-						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Acid Protection}}{{base=Base}}{{dice=[[(@{acid_protection}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Acid Protection"><span class="pictos3">d</span></button>
-						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Cold Protection}}{{base=Base}}{{dice=[[(@{cold_protection}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Cold Protection"><span>b</span></button>
-						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Electricity Protection}}{{base=Base}}{{dice=[[(@{electrical_protection}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Electrical Protection"><span>e</span></button>
-						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Fire Protection}}{{base=Base}}{{dice=[[(@{fire_protection}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Fire Protection"><span class="pictos3">j</span></button>
-						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Radiation Protection}}{{base=Base}}{{dice=[[(@{radiation_protection}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Radiation Protection"><span class="pictos3">l</span></button>
+						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Acid Protection}}{{base=Base}}{{dice=[[(@{soak}+@{acid_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Acid Protection"><span class="pictos3">d</span></button>
+						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Cold Protection}}{{base=Base}}{{dice=[[(@{soak}+@{cold_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Cold Protection"><span>b</span></button>
+						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Electricity Protection}}{{base=Base}}{{dice=[[(@{soak}+@{electrical_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Electrical Protection"><span>e</span></button>
+						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Fire Protection}}{{base=Base}}{{dice=[[(@{soak}+@{fire_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Fire Protection"><span class="pictos3">j</span></button>
+						<button type='roll' value="@{gm_toggle} &{template:sRun}{{header=Radiation Protection}}{{base=Base}}{{dice=[[(@{soak}+@{radiation_modifier}+@{modifier_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}" title="Radiation Protection"><span class="pictos3">l</span></button>
 					</div>
 				</div>
 			</div>
-	<!-- ~~~~~~~~ Skills  ~~~~~~~~ -->
-			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
-			<div class="goon skills">
+			<!-- ~~~~~~~~ Skills  ~~~~~~~~ -->
+			<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
+			<div class="grunt skills">
 				<div class="skill-box"><label data-i18n="skills">Skills</label><span class="colon">: </span>
 					<fieldset class="repeating_active">
 						<div class="npc-repeating">
@@ -2442,8 +2457,8 @@
 					</fieldset>
 				</div>
 			</div>
-		<!-- ~~~~~~~~ Qualities/Augs/Init/Gear/Weakness & Other STUFF ~~~~~~~~ -->
-			<div class="goon textrow">
+			<!-- ~~~~~~~~ Qualities/Augs/Init/Gear/Weakness & Other STUFF ~~~~~~~~ -->
+			<div class="grunt textrow">
 				<input type="hidden" class="optional-flag" name="attr_quality" value="0" />
 				<div class="textboxes">
 					<label data-i18n="qualities">Qualities</label><span class="colon">: </span>
@@ -2475,7 +2490,7 @@
 					<span name="attr_powers" title="@{powers}"></span>
 				</div>
 			</div>
-			<div class="goon vehicle textrow">
+			<div class="grunt vehicle textrow">
 				<input type="hidden" class="b" name="attr_gear" value="0" />
 				<div class="textboxes">
 					<label data-i18n="gear">Gear</label><span class="colon">: </span>
@@ -2492,7 +2507,7 @@
 					<span name="attr_modifications" title="@{modifications}"></span>
 				</div>
 			</div>
-			<div class="goon">
+			<div class="grunt">
 				<input type="hidden" class="optional-flag" name="attr_weakness" value="0" />
 				<div class="textboxes">
 					<label data-i18n="weakness">Weakness</label><span class="colon">: </span>
@@ -2502,26 +2517,38 @@
 		</div><!-- ~~~~~~~~ End of Display  ~~~~~~~~ -->
 	</div><!-- ~~~~~~~~ End of Stats area  ~~~~~~~~ -->
 	<!-- ~~~~~~~~ Weapons ~~~~~~~~ -->
-	<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
-	<div class="goon vehicle">
+	<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
+	<div class="grunt vehicle">
 		<h2 data-i18n="weapons">Weapons</h2>
 		<fieldset class="repeating_weapon">
 			<div class="repeating toggle">
 				<input type="checkbox" class="settings-toggle" name="attr_weapon_toggle" checked="checked" title="Settings toggle" /><span>x</span>
 				<div class="settings">
 					<div class="repeat-section npc-weapons">
-						<input type="radio" class="range-toggle" name="attr_weapon_range" checked="checked" title="Range weapon" value="0" /><span data-i18n="range">Range</span>
-						<input type="radio" class="melee-toggle" name="attr_weapon_range" title="Melee weapon" value="1" /><span data-i18n="melee">Melee</span>
-						<div class="repeat-row"><label data-i18n="dice">Dice</label><br/><input type="number" name="attr_weapon_dice" placeholder="18" title="Weapon dice" value="" /></div>
-						<div class="repeat-row repeat-row-20"><label data-i18n="name">Name</label><br/><input type="text" name="attr_weapon_name" placeholder="Ares Predator" title="Name" value="" /></div>
-						<div class="repeat-row repeat-row-20"><label data-i18n="type">Type</label><br/><input type="text" name="attr_weapon_type" placeholder="Heavy Pistol" title="Type" value="" /></div>
-						<div class="repeat-row weapon-melee repeat-row-8"><label data-i18n="reach">Reach</label><br/><input type="number" name="attr_weapon_reach" min="0" placeholder="Reach" title="Reach" value="0"/></div>
-						<div class="repeat-row"><label data-i18n="acc">Acc</label><br/><input type="number" name="attr_weapon_acc" placeholder="ACC" title="Accuracy" value="" /></div>
-						<div class="repeat-row"><label data-i18n="dam">Dam</label><br/><input type="text" class="wea-dv" name="attr_weapon_dv" placeholder="9P" title="Damage Value" value="" /></div>
-						<div class="repeat-row"><label data-i18n="ap">AP</label><br/><input type="number" name="attr_weapon_ap" placeholder="AP" title="Armor Penetration" value="" /></div>
-						<div class="repeat-row weapon-range repeat-row-8"><label data-i18n="modes">Modes</label><br/><input type="text" name="attr_weapon_mode" placeholder="SA/BF/FA" title="Modes" value="" /></div>
-						<div class="repeat-row weapon-range repeat-row-8"><label data-i18n="recoil">Recoil</label><br/><input type="number" name="attr_weapon_rc" placeholder="Recoil" title="Recoil Compensation" value="" /></div>
-						<div class="repeat-row weapon-range"><label data-i18n="ammo">Ammo</label><br/><input type="number" name="attr_weapon_ammo" placeholder="15" title="Ammo" value="" /></div>
+						<input type="radio" class="range-toggle" name="attr_weapon_range" checked="checked" title="Range weapon" value="0" /><span
+						 data-i18n="range">Range</span>
+						<input type="radio" class="melee-toggle" name="attr_weapon_range" title="Melee weapon" value="1" /><span
+						 data-i18n="melee">Melee</span>
+						<div class="repeat-row"><label data-i18n="dice">Dice</label><br /><input type="number" name="attr_weapon_dice"
+							 placeholder="18" title="Weapon dice" value="" /></div>
+						<div class="repeat-row repeat-row-20"><label data-i18n="name">Name</label><br /><input type="text" name="attr_weapon_name"
+							 placeholder="Ares Predator" title="Name" value="" /></div>
+						<div class="repeat-row repeat-row-20"><label data-i18n="type">Type</label><br /><input type="text" name="attr_weapon_type"
+							 placeholder="Heavy Pistol" title="Type" value="" /></div>
+						<div class="repeat-row weapon-melee repeat-row-8"><label data-i18n="reach">Reach</label><br /><input type="number"
+							 name="attr_weapon_reach" min="0" placeholder="Reach" title="Reach" value="0" /></div>
+						<div class="repeat-row"><label data-i18n="acc">Acc</label><br /><input type="text" name="attr_weapon_acc"
+							 placeholder="ACC" title="Accuracy" value="" /></div>
+						<div class="repeat-row"><label data-i18n="dam">Dam</label><br /><input type="text" class="wea-dv" name="attr_weapon_dv"
+							 placeholder="9P" title="Damage Value" value="" /></div>
+						<div class="repeat-row"><label data-i18n="ap">AP</label><br /><input type="number" name="attr_weapon_ap"
+							 placeholder="AP" title="Armor Penetration" value="" /></div>
+						<div class="repeat-row weapon-range repeat-row-8"><label data-i18n="modes">Modes</label><br /><input type="text"
+							 name="attr_weapon_mode" placeholder="SA/BF/FA" title="Modes" value="" /></div>
+						<div class="repeat-row weapon-range repeat-row-8"><label data-i18n="recoil">Recoil</label><br /><input type="number"
+							 name="attr_weapon_rc" placeholder="Recoil" title="Recoil Compensation" value="" /></div>
+						<div class="repeat-row weapon-range"><label data-i18n="ammo">Ammo</label><br /><input type="number" name="attr_weapon_ammo"
+							 placeholder="15" title="Ammo" value="" /></div>
 						<div class="repeat-row weapon-range" style="width: 2%;"><span>(c)</span></div>
 						<br />
 						<div class="weapon-note">
@@ -2654,8 +2681,9 @@
 		</fieldset>
 	</div><!-- ~~~~~~~~ End of Complex Forms ~~~~~~~~ -->
 	<!-- ~~~~~~~~ IC! ~~~~~~~~ -->
-	<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
-	<div class="host"><h2 data-i18n="intrusioncountermeasures">Intrusion Countermeasures</h2>
+	<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
+	<div class="host">
+		<h2 data-i18n="intrusioncountermeasures">Intrusion Countermeasures</h2>
 		<fieldset class="repeating_IC">
 			<div class="repeating toggle">
 				<input type="checkbox" class="settings-toggle" name="attr_weapon_toggle" checked="checked" title="Settings toggle" /><span>x</span>
@@ -2854,7 +2882,10 @@
 	</div><!-- ~~~~~~~~ End of Matrix Area ~~~~~~~~ -->
 </div><!-- ~~~~~~~~ End of the NPC sheet ~~~~~~~~ -->
 
-<div class="footer"><span data-i18n="copyrightfooter">The Topps Company, Inc. has sole ownership of the names, logo, artwork, marks, photographs, sounds, audio, video and/or any proprietary material used in connection with the game Shadowrun. The Topps Company, Inc. has granted permission to use such names, logos, artwork, marks and/or any proprietary materials for promotional and informational purposes on its website but does not endorse, and is not affiliated with any official capacity whatsoever.</span><span> Version 1.1</span></div>
+<div class="footer">
+  <span data-i18n="copyrightfooter">The Topps Company, Inc. has sole ownership of the names, logo, artwork, marks, photographs, sounds, audio, video and/or any proprietary material used in connection with the game Shadowrun. The Topps Company, Inc. has granted permission to use such names, logos, artwork, marks and/or any proprietary materials for promotional and informational purposes on its website but does not endorse, and is not affiliated with any official capacity whatsoever.</span>
+  <span> Version 1.2</span>
+</div>
 
 <div class="rolltemplates">
 	<!--Roll Template for rolling without Focus-->
@@ -2891,11 +2922,6 @@
 
 	<input type="hidden" name="attr_armor_name" value="select a Primary in Arms" />
 	<input type="hidden" name="attr_soak" min="0" value="0" />
-	<input type="hidden" name="attr_acid_protection" min="0" value="0" />
-	<input type="hidden" name="attr_cold_protection" min="0" value="0" />
-	<input type="hidden" name="attr_electrical_protection" min="0" value="0" />
-	<input type="hidden" name="attr_fire_protection" min="0" value="0" />
-	<input type="hidden" name="attr_radiation_protection" min="0" value="0" />
 
 	<input type="hidden" name="attr_primary_range_weapon" value="select a Primary in Arms" />
 	<input type="hidden" name="attr_primary_range_weapon_skill" />
@@ -3009,6 +3035,19 @@
 
 <!--Sheet Worker-->
 <script type="text/worker">
+//Sheet open
+//This updating grunts to Grunts per the change in styling. This can be removed later. 3 Nov 2018
+on('sheet:opened', function() {
+	getAttrs(["sheet_type"], function(v) {
+		if (v.sheet_type === "grunt") {
+			setAttrs({
+				sheet_type: "grunt"
+			});
+		};
+	});
+})
+
+
 //Watch for Updates and Run the needed functions
 	on("change:body", function() {
 		update_liftCarry();
@@ -3362,35 +3401,34 @@
 	};
 
 //Manipulating Condition Tracks
-	//PHYSICAL TRACK
-		var update_physicalTrack = function() {
-			getAttrs(["body","physical_modifier", "sheet_type", "flag_drone"], function(v) {
-				var bod = parseInt(v.body) || 0;
-				var mod = parseInt(v.physical_modifier) || 0;
-				tra = (v.sheet_type === "pc" || v.sheet_type === "goon") ? (Math.ceil(bod/2) + 8 + mod) : 
-					  (v.sheet_type === "vehicle" && v.flag_drone === "drone") ? (Math.ceil(bod/2) + 6 + mod) :
-					  (v.sheet_type === "vehicle") ? (Math.ceil(bod/2) + 12 + mod) :
-					  "Not a goon or vehicle";
-				let update = {};
-				update["physical"] = tra;
-				update["physical_max"] = tra;
-				setAttrs(update);
-			});
-		};
-
-	//STUN TRACK
-		var update_stunTrack = function () {
-			getAttrs(["willpower","stun_modifier"], function(v){
-				var wil = parseInt(v.willpower) || 0;
-				var mod = parseInt(v.stun_modifier) || 0;
-				var tot = Math.ceil(wil/2) + 8 + mod;
-				let update = {};
-				update["stun"] = tot;
-				update["stun_max"] = tot;
-				setAttrs(update);
-			});
-		};
+//PHYSICAL TRACK
+var update_physicalTrack = function () {
+	getAttrs(["body", "physical_modifier", "sheet_type", "flag_drone"], function (v) {
+		var bod = parseInt(v.body) || 0;
+		var mod = parseInt(v.physical_modifier) || 0;
+		tra = (v.sheet_type === "pc" || v.sheet_type === "grunt") ? (Math.ceil(bod / 2) + 8 + mod) :
+			(v.sheet_type === "vehicle" && v.flag_drone === "drone") ? (Math.ceil(bod / 2) + 6 + mod) :
+				(v.sheet_type === "vehicle") ? (Math.ceil(bod / 2) + 12 + mod) :
+					"Not a grunt or vehicle";
+		let update = {};
+		update["physical"] = tra;
+		update["physical_max"] = tra;
+		setAttrs(update);
+	});
+};
 
+//STUN TRACK
+var update_stunTrack = function () {
+	getAttrs(["willpower", "stun_modifier"], function (v) {
+		var wil = parseInt(v.willpower) || 0;
+		var mod = parseInt(v.stun_modifier) || 0;
+		var tot = Math.ceil(wil / 2) + 8 + mod;
+		let update = {};
+		update["stun"] = tot;
+		update["stun_max"] = tot;
+		setAttrs(update);
+	});
+};
 
 //Convert physical into the physical damage track boxes
 	on("change:physical", function() {
@@ -3523,35 +3561,34 @@
 	});
 
 //Calculate Matrix Initiatve.
-	on("change:host_rating change:data_processing change:pilot change:intuition change:matrix_mod_modifier change:level change:matrix_dice_modifier change:edge_toggle", function() {
-		getAttrs(["sheet_type", "data_processing", "pilot", "intuition", "matrix_mod_modifier", "host_rating", "level", "matrix_dice_modifier", "edge_toggle"], function(v) {
-			var dat = parseInt(v.data_processing) || 0;
-			var pil = parseInt(v.pilot) || 0;
-			var int = parseInt(v.intuition) || 0;
-			var mat = parseInt(v.matrix_mod_modifier) || 0;
-			var hos = parseInt(v.host_rating) || 0;
-			var lev = parseInt(v.level) || 0;
-			var dic = parseInt(v.matrix_dice_modifier) || 0;
-			let update = {};
+on("change:host_rating change:data_processing change:pilot change:intuition change:matrix_mod_modifier change:level change:matrix_dice_modifier change:edge_toggle", function () {
+	getAttrs(["sheet_type", "data_processing", "pilot", "intuition", "matrix_mod_modifier", "host_rating", "level", "matrix_dice_modifier", "edge_toggle"], function (v) {
+		var dat = parseInt(v.data_processing) || 0;
+		var pil = parseInt(v.pilot) || 0;
+		var int = parseInt(v.intuition) || 0;
+		var mat = parseInt(v.matrix_mod_modifier) || 0;
+		var hos = parseInt(v.host_rating) || 0;
+		var lev = parseInt(v.level) || 0;
+		var dic = parseInt(v.matrix_dice_modifier) || 0;
+		let update = {};
 
-			dice = 	(v.sheet_type === "goon" && v.edge_toggle == 0) ? 4 + dic : 
-					((v.sheet_type === "goon" && v.edge_toggle != 0) ? 5 :
-					4);
+		dice = (v.sheet_type === "grunt" && v.edge_toggle == 0) ? 4 + dic :
+			((v.sheet_type === "grunt" && v.edge_toggle != 0) ? 5 :
+				4);
 
-			tot = (v.sheet_type === "vehicle") ? dat + pil :
-				  (v.sheet_type === "host") ? dat + hos :
-				  (v.sheet_type === "sprite") ? dat + lev + mat :
-				  dat + int + mat;
+		tot = (v.sheet_type === "vehicle") ? dat + pil :
+			(v.sheet_type === "host") ? dat + hos :
+				(v.sheet_type === "sprite") ? dat + lev + mat :
+					dat + int + mat;
 
-			bas = (v.sheet_type === "sprite") ? dat + lev : dat + int ;
+		bas = (v.sheet_type === "sprite") ? dat + lev : dat + int;
 
-			update["matrix_mod"] = tot;
-			update["matrix_dice"] = dice;
+		update["matrix_mod"] = tot;
+		update["matrix_dice"] = dice;
 
-			(mat != 0) ? update["display_matrix_mod"] = bas + " (" + tot + ")" : update["display_matrix_mod"] = tot;
+		(mat != 0) ? update["display_matrix_mod"] = bas + " (" + tot + ")" : update["display_matrix_mod"] = tot;
 
-			setAttrs(update);
-		});
+		setAttrs(update);
 	});
 
 //Edge toggle to include ! for exploding dice
@@ -3571,7 +3608,7 @@
 			var mat = parseInt(v.matrix_max) || 0;
 			let update = {};
 
-			if (v.sheet_type === "goon" || v.sheet_type === "pc") {
+			if (v.sheet_type === "grunt" || v.sheet_type === "pc") {
 				update["physical"] = phy;
 				update["stun"] = stun;
 			} else if (v.sheet_type === "sprite") {
@@ -3580,7 +3617,7 @@
 				update["physical"] = phy;
 				update["matrix"] = mat;
 			} else {
-				return "Not a goon or vehicle";
+				return "Not a grunt or vehicle";
 			};
 
 			setAttrs(update);
@@ -3866,7 +3903,6 @@ on("change:repeating_weapon", function() {
 		});
 	});
 
-
 //REFACTORED Range & MELEE UPDATES
    ['repeating_range',
     'repeating_melee',
diff --git a/Shadowrun5thEdition/sheet.json b/Shadowrun5thEdition/sheet.json
index c0666ea39f..7b5a8f46d2 100644
--- a/Shadowrun5thEdition/sheet.json
+++ b/Shadowrun5thEdition/sheet.json
@@ -1,11 +1,11 @@
 {
-	"html": "Shadowrun5thEdition.html",
-	"css": "Shadowrun5thEdition.css",
-	"authors": " Cassie Levett",
-	"roll20userid": "557736",
-	"patreon": "https://www.patreon.com/emeraldgrid",
-	"preview": "preview.png",
-	"instructions": "Shadowrun 5th Edition version 1.0. Instructions for use can be found on the [GitHub README](https://github.com/clevett/roll20-character-sheets/blob/master/Shadowrun5thEdition/README.md). *The Topps Company, Inc. has sole ownership of the names, logo, artwork, marks, photographs, sounds, audio, video and/or any proprietary material used in connection with the game Shadowrun. The Topps Company, Inc. has granted permission to use such names, logos, artwork, marks and/or any proprietary materials for promotional and informational purposes on its website but does not endorse, and is not affiliated with any official capacity whatsoever.*",
+    "html": "Shadowrun5thEdition.html",
+    "css": "Shadowrun5thEdition.css",
+    "authors": "Cassie Levett, Thomas Brown",
+    "roll20userid": "557736, 53401",
+    "patreon": "https://www.patreon.com/emeraldgrid",
+    "preview": "preview.png",
+    "instructions": "Shadowrun 5th Edition version 1.2.  Instructions for use can be found on the [GitHub README](https://github.com/clevett/roll20-character-sheets/blob/master/Shadowrun5thEdition/README.md).<br/><br/> *The Topps Company, Inc. has sole ownership of the names, logo, artwork, marks, photographs, sounds, audio, video and/or any proprietary material used in connection with the game Shadowrun. The Topps Company, Inc. has granted permission to use such names, logos, artwork, marks and/or any proprietary materials for promotional and informational purposes on its website but does not endorse, and is not affiliated with any official capacity whatsoever.*",
     "useroptions": [
         {
             "attribute": "sheet_type",
@@ -13,10 +13,10 @@
             "displaytranslationkey": "sheettype",
             "type": "select",
             "options": [
-            	"Player Character|pc",
+                "Player Character|pc",
                 "Goon|goon",
                 "Host|host",
- 				"Sprite|sprite",
+                "Sprite|sprite",
                 "Vehicle|vehicle"
             ],
             "optiontranslationkeys": ["pc","goon","host","sprite","vehicle"],
@@ -25,4 +25,4 @@
             "descriptiontranslationkey": "sheetdescription"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/Shadowrun5thEdition/translation.json b/Shadowrun5thEdition/translation.json
index 3e16e4ca2a..1ced7d2d20 100644
--- a/Shadowrun5thEdition/translation.json
+++ b/Shadowrun5thEdition/translation.json
@@ -143,7 +143,7 @@
     "funds": "Funds",
     "gear": "Gear",
     "gm": "To GM",
-    "goon": "Goon",
+    "grunt": "Grunt",
     "gunnery": "Gunnery",
     "gymnastics": "Gymnastics",
     "hacking": "Hacking",
@@ -221,6 +221,7 @@
     "modifierdice": "Modifier Dice",
     "modifiers": "Modifiers",
     "movement": "Movement",
+    "movement-b": "Movement Bonus",
     "mundane": "Mundane",
     "n": "N",
     "name": "Name",