diff --git a/Shadowrun5thEdition/Shadowrun5thEdition.css b/Shadowrun5thEdition/Shadowrun5thEdition.css
index 71a3f58198..8be547f20f 100644
--- a/Shadowrun5thEdition/Shadowrun5thEdition.css
+++ b/Shadowrun5thEdition/Shadowrun5thEdition.css
@@ -132,7 +132,7 @@
 	    display: none;} 
 
 	.sheet-static,
-	.sheet-sheet_type[value="grunt"] ~ .sheet-npc,
+	.sheet-sheet_type[value="goon"] ~ .sheet-npc,
 	.sheet-sheet_type[value="host"] ~ .sheet-npc,
 	.sheet-sheet_type[value="sprite"] ~ .sheet-npc,
 	.sheet-sheet_type[value="vehicle"] ~ .sheet-npc,
@@ -565,7 +565,7 @@
 
 			.sheet-attr-box input.sheet-settings-toggle + span,
 			.sheet-condition-box input[type="checkbox"] + span  {
-				color: #9a9a9a;}
+				color: #fff;}
 
 			/***** ATTRIBUTE SETTINGS TOGGLE *****/
 				.sheet-attr-box input.sheet-settings-toggle {left: 65%;}
@@ -954,7 +954,7 @@
 
 					.sheet-weapon-range h3:first-child,
 					.sheet-weapon-melee h3:first-child {
-						margin-right: 2%;}
+								margin-right: 8px;}
 
 					.sheet-weapon-melee h3:first-child,
 					.sheet-weapon-melee input[type="text"]:first-child {
@@ -965,7 +965,7 @@
 
 				.sheet-weapon-range h3:nth-child(2),
 				.sheet-weapon-range h3:nth-child(5) {
-					width: 6%;}
+					width: 11%;}
 
 				.sheet-weapon-melee input,			
 				.sheet-weapon-melee .sheet-display-row {
@@ -981,7 +981,7 @@
 						display: inline;}
 
 		/***** ARMOR *****/
-			.sheet-armor-box h3 {margin-right: 1%;}
+			.sheet-armor-box h3 {margin-right: 5.5px;}
 
 			.sheet-armor-box button:nth-child(1n+2) {
 				height: 25px;
@@ -1128,7 +1128,7 @@
 		.sheet-powers-box .sheet-display .sheet-display-row:nth-of-type(1) {
 			margin-right: 1%;}
 
-		.sheet-spell-box h3 {width: 13%;}
+		.sheet-spell-box h3 {width: 15%;}
 
 		.sheet-powers-box h3,
 		.sheet-powers-box input[type="number"],
@@ -1659,7 +1659,7 @@
 
 	/*:+:+:+: NPC SETTINGS & DISPLAYS :+:+:+:*/
 		.sheet-npc .sheet-display,
-		.sheet-npc .sheet-display .sheet-grunt,
+		.sheet-npc .sheet-display .sheet-goon,
 		.sheet-npc .sheet-display .sheet-host,
 		.sheet-npc .sheet-display .sheet-vehicle,
 		.sheet-npc .sheet-display .sheet-sprite {
@@ -1698,11 +1698,10 @@
 		.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: 1%;
+				margin-left: 6%;
 				text-transform: capitalize;
 				width: 14%;}
 
@@ -1746,10 +1745,7 @@
 
 			.sheet-npc-repeating .sheet-settings {min-width: 700px;}
 
-			.sheet-npc-repeating .sheet-settings input[type="text"] {
-				margin-left: 2%;
-				margin-right: 2%;
-				width: 51%;}
+			.sheet-npc-repeating .sheet-settings input[type="text"] {width: 51%;}
 
 
 	/*:+:+:+: NPC ATTRIBUTES :+:+:+:*/
@@ -2034,14 +2030,14 @@
 		.sheet-optional-flag[value="0"] + .sheet-attr-header,
 		.sheet-category + div,
 		.sheet-category + div + div,
-		.sheet-grunt,
+		.sheet-goon,
 		.sheet-host,
 		.sheet-sprite,
 		.sheet-vehicle  {
 			display: none;}
 
 		.sheet-optional-flag:not([value="0"]) + .sheet-optional,
-		.sheet-npc-type[value="grunt"] ~ .sheet-grunt,
+		.sheet-npc-type[value="goon"] ~ .sheet-goon,
 		.sheet-npc-type[value="host"] ~ .sheet-host,
 		.sheet-npc-type[value="sprite"] ~ .sheet-sprite,
 		.sheet-npc-type[value="vehicle"] ~ .sheet-vehicle {
@@ -2058,7 +2054,7 @@
 
 		.sheet-category[value="Combat"] ~ .sheet-combat-type-hide {display: inline;}
 
-		.sheet-npc-type[value="grunt"] ~ div.sheet-grunt.sheet-attribute,
+		.sheet-npc-type[value="goon"] ~ div.sheet-goon.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 11df817ec4..493b9e8c95 100644
--- a/Shadowrun5thEdition/Shadowrun5thEdition.html
+++ b/Shadowrun5thEdition/Shadowrun5thEdition.html
@@ -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="text" name="attr_acc" placeholder="5" title="Accuracy"  />
+									<input type="number" 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></button>
+								<span class="default" name="attr_rating"></span><!--<span class="hover" name="attr_soak"></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></button>
+								<span class="default" name="attr_acid_modifier"></span><!--<span class="hover" name="attr_acid_protection"></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></button>
+								<span class="default" name="attr_cold_modifier"></span><!--<span class="hover" name="attr_cold_protection"></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></button>
+								<span class="default" name="attr_electrical_modifier"></span><!--<span class="hover" name="attr_electrical_protection"></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></button>
+								<span class="default" name="attr_fire_modifier"></span><!--<span class="hover" name="attr_fire_protection"></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></button>
+								<span class="default" name="attr_radiation_modifier"></span><!--<span class="hover" name="attr_radiation_protection"></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="grunt" data-i18n="grunt">grunt</option>
+								<option value="goon" data-i18n="goon">Goon</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,13 +1798,12 @@
 <!-- ~~~~~~~~:+:+::+:+:+:+:+::+:+:+:+:+:+: Start of NPC Sheet :+:+::+:+:+::+:+:+:+::+:+:+::+:+:+:+::+:+:::::+:+:~~~~~~~~ -->
 <!-- ~~~~~~~~+:+:::::+:+::+:+:::::+:+::+:+:+::+:+:+:+::+:+:::::+:+:::::+:+:+:+:::::+:+::+:+:+::+:+:+:+::+:+:::::+:+:+~~~~~~~~ -->
 <div class="npc">
-	<div class="stats toggle">
-		<!-- ~~~~~~~~ Start of the grunt Sheet  ~~~~~~~~ -->
+	<div class="stats toggle"><!-- ~~~~~~~~ Start of the Goon 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="grunt" />
-			<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
-			<div class="grunt attribute">
+			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
+		<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
+			<div class="goon attribute">
 				<input type="hidden" class="character-type" name="attr_flag_special" />
 				<div class="attr-header">
 					<label data-i18n="b">B</label><br />
@@ -1879,10 +1878,9 @@
 			</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="grunt" />
-				<div class="grunt">
+			<div class="leftcol"><!--Start Left modifieres-->
+			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
+				<div class="goon">
 					<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" />
@@ -1897,7 +1895,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="grunt sprite">
+				<div class="goon 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" />
@@ -1905,7 +1903,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="grunt">
+				<div class="goon">
 					<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" />
@@ -1947,15 +1945,13 @@
 					<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="grunt vehicle">
+				<div class="goon 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="grunt vehicle 2col">
-				<!--Start Mid modifieres-->
+			</div><!--End Left modifieres-->
+			<div class="goon 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>
@@ -1967,42 +1963,33 @@
 				<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="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 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>
 			<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 />
-			<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 />
+		<!-- ~~~~~~~~ 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 />
 			</div>
-			<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 class="goon 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="grunt textrow">
+			<div class="goon 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>
@@ -2018,9 +2005,9 @@
 			</div>
 		</div><!-- ~~~~~~~~ End of Settings  ~~~~~~~~ -->
 		<div class="display">
-			<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
-			<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
-			<div class="grunt attribute">
+		<!-- ~~~~~~~~ Attributes  ~~~~~~~~ -->
+			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
+			<div class="goon 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>
@@ -2118,8 +2105,8 @@
 					<span name="attr_firewall"></span>
 				</div>
 			</div>
-			<!-- ~~~~~~~~ Initiative  ~~~~~~~~ -->
-			<div class="grunt">
+		<!-- ~~~~~~~~ Initiative  ~~~~~~~~ -->
+			<div class="goon">
 				<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>
@@ -2136,16 +2123,14 @@
 					<br />
 				</div>
 			</div>
-			<!-- ~~~~~~~~ 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>
+		<!-- ~~~~~~~~ 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>
 				</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="grunt">
-				<!-- ~~~~~~~~ Movement  ~~~~~~~~ -->
+			<div class="goon">
+		<!-- ~~~~~~~~ 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>
@@ -2186,8 +2171,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="grunt vehicle">
+		<!-- ~~~~~~~~ Armor  ~~~~~~~~ -->
+			<div class="goon 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">
@@ -2199,17 +2184,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=[[(@{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>
+						<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>
 					</div>
 				</div>
 			</div>
-			<!-- ~~~~~~~~ Skills  ~~~~~~~~ -->
-			<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
-			<div class="grunt skills">
+	<!-- ~~~~~~~~ Skills  ~~~~~~~~ -->
+			<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
+			<div class="goon skills">
 				<div class="skill-box"><label data-i18n="skills">Skills</label><span class="colon">: </span>
 					<fieldset class="repeating_active">
 						<div class="npc-repeating">
@@ -2457,8 +2442,8 @@
 					</fieldset>
 				</div>
 			</div>
-			<!-- ~~~~~~~~ Qualities/Augs/Init/Gear/Weakness & Other STUFF ~~~~~~~~ -->
-			<div class="grunt textrow">
+		<!-- ~~~~~~~~ Qualities/Augs/Init/Gear/Weakness & Other STUFF ~~~~~~~~ -->
+			<div class="goon 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>
@@ -2490,7 +2475,7 @@
 					<span name="attr_powers" title="@{powers}"></span>
 				</div>
 			</div>
-			<div class="grunt vehicle textrow">
+			<div class="goon 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>
@@ -2507,7 +2492,7 @@
 					<span name="attr_modifications" title="@{modifications}"></span>
 				</div>
 			</div>
-			<div class="grunt">
+			<div class="goon">
 				<input type="hidden" class="optional-flag" name="attr_weakness" value="0" />
 				<div class="textboxes">
 					<label data-i18n="weakness">Weakness</label><span class="colon">: </span>
@@ -2517,38 +2502,26 @@
 		</div><!-- ~~~~~~~~ End of Display  ~~~~~~~~ -->
 	</div><!-- ~~~~~~~~ End of Stats area  ~~~~~~~~ -->
 	<!-- ~~~~~~~~ Weapons ~~~~~~~~ -->
-	<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
-	<div class="grunt vehicle">
+	<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
+	<div class="goon 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="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>
+						<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>
 						<div class="repeat-row weapon-range" style="width: 2%;"><span>(c)</span></div>
 						<br />
 						<div class="weapon-note">
@@ -2681,9 +2654,8 @@
 		</fieldset>
 	</div><!-- ~~~~~~~~ End of Complex Forms ~~~~~~~~ -->
 	<!-- ~~~~~~~~ IC! ~~~~~~~~ -->
-	<input type="hidden" class="npc-type" name="attr_sheet_type" value="grunt" />
-	<div class="host">
-		<h2 data-i18n="intrusioncountermeasures">Intrusion Countermeasures</h2>
+	<input type="hidden" class="npc-type" name="attr_sheet_type" value="goon" />
+	<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>
@@ -2882,10 +2854,7 @@
 	</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.2</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.1</span></div>
 
 <div class="rolltemplates">
 	<!--Roll Template for rolling without Focus-->
@@ -2922,6 +2891,11 @@
 
 	<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" />
@@ -3771,8 +3745,7 @@ on("change:repeating_weapon", function() {
     ].forEach(field => {
         // Attach listener
         on(`change:${field}`, function(eventInfo) {
-        	console.log(eventInfo);
-
+        
         	const source = eventInfo.sourceAttribute;
         	const type = eventInfo.sourceType;
 
@@ -3825,8 +3798,6 @@ on("change:repeating_weapon", function() {
                     let removeGroup = (lowercase.includes("group")) ? lowercase.slice(0, -6) : lowercase;
                     let skillSet = (removeGroup.includes(" ")) ? removeGroup.replace(/ /g,"") : removeGroup;
 
-                    console.log(`${skillSet} WAS SET TO ${bas}`);
-
                     setAttrs({
                        [`${skillSet}`]: bas
                     });
@@ -3861,8 +3832,7 @@ on("change:repeating_weapon", function() {
             const newV = eventInfo.newValue;
             const type = weap.slice(-5);
 
-            //Setting this here for now to ensure dicepool attribute gets updated
-            //Move this for the Version 1.2
+            //Setting this here for now to ensure dicepool attribute gets updated. Remove in a future update
         	getAttrs([`${weap}_dicepool_modifier`, `${weap}_spec`], function(v) {
         		const mod = parseInt(v[`${weap}_dicepool_modifier`]) || 0;
 				const spec = parseInt(v[`${weap}_spec`]) || 0;
diff --git a/Shadowrun5thEdition/translation.json b/Shadowrun5thEdition/translation.json
index 1ced7d2d20..3e16e4ca2a 100644
--- a/Shadowrun5thEdition/translation.json
+++ b/Shadowrun5thEdition/translation.json
@@ -143,7 +143,7 @@
     "funds": "Funds",
     "gear": "Gear",
     "gm": "To GM",
-    "grunt": "Grunt",
+    "goon": "Goon",
     "gunnery": "Gunnery",
     "gymnastics": "Gymnastics",
     "hacking": "Hacking",
@@ -221,7 +221,6 @@
     "modifierdice": "Modifier Dice",
     "modifiers": "Modifiers",
     "movement": "Movement",
-    "movement-b": "Movement Bonus",
     "mundane": "Mundane",
     "n": "N",
     "name": "Name",