diff --git a/ShadowrunAnarchy/ShadowrunAnarchy.html b/ShadowrunAnarchy/ShadowrunAnarchy.html
index 3cac381226..0ce889d823 100644
--- a/ShadowrunAnarchy/ShadowrunAnarchy.html
+++ b/ShadowrunAnarchy/ShadowrunAnarchy.html
@@ -19,32 +19,32 @@
 	<!-- ~~~~~~~~ Attribute  ~~~~~~~~ -->
 		<div class="tan attribute">
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Strength}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Strength Roll"><h1 data-i18n="strength">STRENGTH</h1></button>
+				<button name="Strength" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Strength}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Strength Roll"><h1 data-i18n="strength">STRENGTH</h1></button>
 				<input type="number" name="attr_strength" value="1" title="@{strength}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Agility}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{agility}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Agility Roll"><h1 data-i18n="agility">AGILITY</h1></button>
+				<button name="Agility" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Agility}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{agility}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Agility Roll"><h1 data-i18n="agility">AGILITY</h1></button>
 				<input type="number" name="attr_agility" value="1" title="@{agility}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Willpower}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{willpower}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Willpower Roll"><h1 data-i18n="willpower">WILLPOWER</h1></button>
+				<button name="Willpower" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Willpower}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{willpower}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Willpower Roll"><h1 data-i18n="willpower">WILLPOWER</h1></button>
 				<input type="number" name="attr_willpower" value="1" title="@{willpower}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Logic}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{logic}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Logic Roll"><h1 data-i18n="logic">LOGIC</h1></button>
+				<button name="Logic" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Logic}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{logic}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Logic Roll"><h1 data-i18n="logic">LOGIC</h1></button>
 				<input type="number" name="attr_logic" value="1" title="@{logic}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Charisma}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{charisma}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Charisma Roll"><h1 data-i18n="charisma">CHARISMA</h1></button>
+				<button name="Charisma" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Charisma}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{charisma}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Charisma Roll"><h1 data-i18n="charisma">CHARISMA</h1></button>
 				<input type="number" name="attr_charisma" value="1" title="@{charisma}" />
 			</div>
 			<div class="vertdeco"></div>
 			<div class="sheet-col">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Edge}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{edge}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Edge Roll"><h1 data-i18n="edge">EDGE</h1></button>
+				<button name="Edge" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Edge}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{edge}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Edge Roll"><h1 data-i18n="edge">EDGE</h1></button>
 				<input type="number" name="attr_edge" value="1" title="@{edge}" />
 			</div>
 		</div><!--End Attributes-->
@@ -87,11 +87,11 @@
 	<!-- ~~~~~~~~ Skills  ~~~~~~~~ -->
 		<div class="roll-toggles">
 			<div class="toggle-buttons">
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Perception}}{{attr=Wil+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{willpower}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Perception Roll"><span class="pictos">E</span></button>
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Defense}}{{attr=Agi+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{agility}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Defense Roll"><span class="pictosC">e</span></button>
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Spell Defense}}{{attr=Str+Wil}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Spell Defense Roll"><span class="pictos3">b</span><span class="lightening">e</span></button>
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Glitch Dice}}{{glitch=[[1d6cs6cs5cf1]]}}" title="Glitch Dice"><span class="glitch">L</span></button>
-				<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Dice Roll}}{{attr=?{D6s to roll|0}d6}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(?{D6s to roll|0}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="D6 Roll"><span class="d6">L</span></button>
+				<button name="Perception" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Perception}}{{attr=Wil+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{willpower}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Perception Roll"><span class="pictos">E</span></button>
+				<button name="Defense" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Defense}}{{attr=Agi+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{agility}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Defense Roll"><span class="pictosC">e</span></button>
+				<button name="Spell Defense" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Spell Defense}}{{attr=Str+Wil}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Spell Defense Roll"><span class="pictos3">b</span><span class="lightening">e</span></button>
+				<button name="Glitch Die" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Glitch Die}}{{glitch=[[1d6cs6cs5cf1]]}}" title="Glitch Dice"><span class="glitch">L</span></button>
+				<button name="D6s" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=D6s}}{{attr=?{D6s to roll|0}d6}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(?{D6s to roll|0}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="D6 Roll"><span class="d6">L</span></button>
 			</div>
 			<div class="toggle-toggles">
 				<input type="checkbox" class="whisper-flag" name="attr_gm_toggle" value="/w gm" title="GM Whisper Toggle" /><span class="whisper-flag">w</span>
@@ -115,16 +115,17 @@
 						<div class="skillbox">
 							<input type="text" name="attr_skill" placeholder="Skill Name">
 							<input type="number" name="attr_skill_rank" placeholder="0"><br />
-							<input type="text" name="attr_skill_specalization" placeholder="Specialization">
+							<input type="hidden" name="attr_skill_specalization" placeholder="Specialization"> <!--- DELETE IN FUTURE UPDATE Patch 1.8--->
+							<input type="text" name="attr_skill_specialization" placeholder="Specialization">
 						</div>
 					</div>
 					<div class="display">
 						<div class="skillbox">
 							<div class="skillheader">
-								<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=@{skill}}}{{attr=@{attribute_name}}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{skill_rank}+@{skill_attribute}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Skill Name">
+								<button name="Skill" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=@{skill}}}{{attr=@{attribute_name}}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{skill_rank}+@{skill_attribute}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Skill Name">
 									<span class="skillname" name="attr_skill_display"></span>
 								</button>
-								<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=@{skill}}}{{spec=@{skill_specalization}}}{{attr=@{attribute_name}}}{{wound=[[@{wound_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{skill_rank}+@{skill_attribute}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Skill Specilization Roll">
+								<button name="Specialization" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=@{skill}}}{{spec=@{skill_specialization}}}{{attr=@{attribute_name}}}{{wound=[[@{wound_toggle}]]}}{{mod=[[@{modifier_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{skill_rank}+2+@{skill_attribute}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Skill Specilization Roll">
 									<span class="skillname" name="attr_skill_spec_display"></span>
 								</button>
 							</div>
@@ -168,7 +169,7 @@
 					<div class="display">
 						<div class="skillbox">
 							<div class="amprating"><span name="attr_amp_rating"></span></div>
-							<div class="ampheader"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=@{amp}}}{{desc=@{amp_desc}}}"><span class="skillname" name="attr_amp"></span></button></div>
+							<div class="ampheader"><button name="Description" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=@{amp}}}{{desc=@{amp_desc}}}"><span class="skillname" name="attr_amp"></span></button></div>
 							<div class="textcontainer"><span name="attr_amp_desc"></span></div>
 						</div>
 					</div>
@@ -218,7 +219,7 @@
 					<input type="hidden" class="quality-pos" name="attr_quality_type" value="positive" />
 					<input type="hidden" class="quality-neg" name="attr_quality_type" value="negative" />
 					<div class="skillbox">
-						<div class="ampheader"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=@{quality}}}{{desc=@{quality_desc}}}"><span class="skillname" name="attr_quality"></span></button></div>
+						<div class="ampheader"><button name="Quality" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=@{quality}}}{{desc=@{quality_desc}}}"><span class="skillname" name="attr_quality"></span></button></div>
 						<div class="textcontainer"><span name="attr_quality_desc"></span></div>
 					</div>
 				</div>
@@ -566,11 +567,11 @@
 			<div class="display">
 				<div class="npc-name"><span name="attr_character_name"></span></div>
 				<div class="roll-toggles">
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Perception}}{{attr=Wil+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{willpower}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Perception Roll"><span class="pictos">E</span></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Defense}}{{attr=Agi+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{agility}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Defense Roll"><span class="pictosC">e</span></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Spell Defense}}{{attr=Str+Wil}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Spell Defense Roll"><span class="pictos3">b</span><span class="lightening">e</span></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Glitch Dice}}{{glitch=[[1d6cs6cs5cf1]]}}" title="Glitch Dice"><span class="glitch">L</span></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Dice Roll}}{{attr=?{D6s to roll|0}d6}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(?{D6s to roll|0}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="D6 Roll"><span class="d6">L</span></button>
+					<button name="Defense" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Perception}}{{attr=Wil+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{willpower}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Perception Roll"><span class="pictos">E</span></button>
+					<button name="Defense" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Defense}}{{attr=Agi+Log}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{agility}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Defense Roll"><span class="pictosC">e</span></button>
+					<button name="Spell Defense" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Spell Defense}}{{attr=Str+Wil}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="Spell Defense Roll"><span class="pictos3">b</span><span class="lightening">e</span></button>
+					<button name="Glitch Die" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Glitch Die}}{{glitch=[[1d6cs6cs5cf1]]}}" title="Glitch Dice"><span class="glitch">L</span></button>
+					<button name="D6" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Dice Roll}}{{attr=?{D6s to roll|0}d6}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(?{D6s to roll|0}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}" title="D6s"><span class="d6">L</span></button>
 					<div class="toggle-toggles">
 						<input type="checkbox" class="whisper-flag" name="attr_gm_toggle" value="/w gm" title="GM Whisper Toggle" /><span class="whisper-flag">w</span>
 						<input type="checkbox" class="wound-flag" name="attr_wound_toggle" value="@{wounds}" title="Wounds Toggle" /><span class="wound-flag">k</span><span class="wound-line">Y</span>
@@ -581,12 +582,12 @@
 					</div>
 				</div>
 				<div class="npc-attribute">
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Strength}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Strength Roll"><label>STR</label></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Agility}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Agility Roll"><label>AGI</label></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Willpower}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Willpower Roll"><label>WIL</label></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Logic}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Logic Roll"><label>LOG</label></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Charisma}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Charisma Roll"><label>CHA</label></button>
-					<button type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Edge}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Edge Roll"><label>EDG</label></button>
+					<button name="Strength" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Strength}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Strength Roll"><label>STR</label></button>
+					<button name="Agility" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Agility}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Agility Roll"><label>AGI</label></button>
+					<button name="Willpower" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Willpower}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Willpower Roll"><label>WIL</label></button>
+					<button name="Logic" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Logic}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Logic Roll"><label>LOG</label></button>
+					<button name="Charisma" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Charisma}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Charisma Roll"><label>CHA</label></button>
+					<button name="Edge" type='roll' value="@{gm_toggle} &{template:sAnarchy}{{header=Edge}}{{attr=Attribute}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{strength}+(?{Attribute|Strength,@{strength}|Agility,@{agility}|Willpower,@{willpower}|Logic,@{logic}|Charisma,@{charisma}|Edge,@{edge}|None,0})+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}]]}}" title="Edge Roll"><label>EDG</label></button>
 					<div class="npc-attr-row">
 						<div class="npc-attr-num"><span name="attr_strength"></span></div>
 						<div class="npc-attr-num"><span name="attr_agility"></span></div>
@@ -600,66 +601,66 @@
 					<div class="indent-row"><span class="bolder caps" data-i18n="skills" style="font-weight: bolder">SKILLS</span><span>: </span>
 						<!-- ~~~~~~~~ astralcombat  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_astral_combat_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Astral Combat}}{{attr=Willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{astral_combat}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}"><span data-i18n="astralcombat">Astral Combat</span><span> </span><span name="attr_astral_combat"></span><span>+W</span></button>,</span>
+						<span class="optional"><button name="Astral Combat" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Astral Combat}}{{attr=Willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{astral_combat}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}"><span data-i18n="astralcombat">Astral Combat</span><span> </span><span name="attr_astral_combat"></span><span>+W</span></button>,</span>
 						<!-- ~~~~~~~~ Athletics  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_athletics_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Athletics}}{{attr=Agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{athletics}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Athletics" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Athletics}}{{attr=Agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{athletics}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="athletics">Athletics</span><span> </span><span name="attr_athletics"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ Biotech  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_biotech_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Biotech}}{{attr=Logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{biotech}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Biotech" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Biotech}}{{attr=Logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{biotech}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="biotech">Biotech</span><span> </span><span name="attr_biotech"></span><span>+L</span></button>,</span>
 						<!-- ~~~~~~~~ close_combat  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_close_combat_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Close Combat}}{{attr=Agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{close_combat}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Close Combat" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Close Combat}}{{attr=Agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{close_combat}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="closecombat">Close Combat</span><span> </span><span name="attr_close_combat"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ con  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_con_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=con}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{con}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Con" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=con}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{con}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="con">Con</span><span> </span><span name="attr_con"></span><span>+C</span></button>,</span>
 						<!-- ~~~~~~~~ conjuring  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_conjuring_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=conjuring}}{{attr=willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{conjuring}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Conjuring" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=conjuring}}{{attr=willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{conjuring}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="conjuring">Conjuring</span><span> </span><span name="attr_conjuring"></span><span>+W</span></button>,</span>
 						<!-- ~~~~~~~~ disguise  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_disguise_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=disguise}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{disguise}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Disguise" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=disguise}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{disguise}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="disguise">Disguise</span><span> </span><span name="attr_disguise"></span><span>+C</span></button>,</span>
 						<!-- ~~~~~~~~ electronics  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_electronics_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=electronics}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{electronics}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Electronics" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=electronics}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{electronics}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="electronics">Electronics</span><span> </span><span name="attr_electronics"></span><span>+L</span></button>,</span>
 						<!-- ~~~~~~~~ engineering  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_engineering_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=engineering}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{engineering}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Engineering" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=engineering}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{engineering}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="engineering">Engineering</span><span> </span><span name="attr_engineering"></span><span>+L</span></button>,</span>
 						<!-- ~~~~~~~~ escape_artist  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_escape_artist_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Escape Artist}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{escape_artist}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Escape Artist" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Escape Artist}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{escape_artist}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="escapeartist">Escape Artist</span><span> </span><span name="attr_escape_artist"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ firearms  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_firearms_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=firearms}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{firearms}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Firearms" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=firearms}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{firearms}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="firearms">Firearms</span><span> </span><span name="attr_firearms"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ hacking  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_hacking_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=hacking}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{hacking}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Hacking" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=hacking}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{hacking}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="hacking">Hacking</span><span> </span><span name="attr_hacking"></span><span>+L</span></button>,</span>
 						<!-- ~~~~~~~~ heavy weapons  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_heavy_weapons_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Heavy Weapons}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{heavy_weapons}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Heavy Weapons" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Heavy Weapons}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{heavy_weapons}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="heavyweapons">Heavy Weapons</span><span> </span><span name="attr_heavy_weapons"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ intimidation  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_intimidation_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=intimidation}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{intimidation}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Intimidation" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=intimidation}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{intimidation}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="intimidation">Intimidation</span><span> </span><span name="attr_intimidation"></span><span>+C</span></button>,</span>
 						<!-- ~~~~~~~~ negotiation  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_negotiation_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=negotiation}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{negotiation}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Negotiation" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=negotiation}}{{attr=charisma}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{negotiation}+@{charisma}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="negotiation">Negotiation</span><span> </span><span name="attr_negotiation"></span><span>+C</span></button>,</span>
 						<!-- ~~~~~~~~ piloting_ground  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_piloting_ground_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Piloting (Ground)}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{piloting_ground}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Piloting (Ground)" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Piloting (Ground)}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{piloting_ground}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="pilotground">Piloting (Ground)</span><span> </span><span name="attr_piloting_ground"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ piloting_other  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_piloting_other_flag" value="0">
@@ -667,31 +668,31 @@
 							<span data-i18n="pilotother">Piloting (Other)</span><span> </span><span name="attr_piloting_other"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ projectile_weapons  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_projectile_weapons_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Projectile Weapons}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{projectile_weapons}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Projectile Weapons" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Projectile Weapons}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{projectile_weapons}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="projectileweapons">Projectile Weapons</span><span> </span><span name="attr_projectile_weapons"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ sorcery  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_sorcery_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=sorcery}}{{attr=willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{sorcery}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Sorcery" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=sorcery}}{{attr=willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{sorcery}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="sorcery">Sorcery</span><span> </span><span name="attr_sorcery"></span><span>+W</span></button>,</span>
 						<!-- ~~~~~~~~ stealth  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_stealth_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=stealth}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{stealth}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Stealth" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=stealth}}{{attr=agility}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{stealth}+@{agility}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="stealth">Stealth</span><span> </span><span name="attr_stealth"></span><span>+A</span></button>,</span>
 						<!-- ~~~~~~~~ survival  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_survival_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=survival}}{{attr=willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{survival}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Survival" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=survival}}{{attr=willpower}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{survival}+@{willpower}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="survival">Survival</span><span> </span><span name="attr_survival"></span><span>+W</span></button>,</span>
 						<!-- ~~~~~~~~ tasking  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_tasking_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=tasking}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{tasking}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Tasking" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=tasking}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{tasking}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="tasking">Tasking</span><span> </span><span name="attr_tasking"></span><span>+L</span></button>,</span>
 						<!-- ~~~~~~~~ tracking  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_tracking_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=tracking}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{tracking}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Tracking" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=tracking}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{tracking}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="tracking">Tracking</span><span> </span><span name="attr_tracking"></span><span>+L</span></button>,</span>
 						<!-- ~~~~~~~~ vehicle_weapons  ~~~~~~~~ -->
 						<input type="hidden" class="optional-flag0" name="attr_vehicle_weapons_flag" value="0">
-						<span class="optional"><button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Vehicle Weapons}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{vehicle_weapons}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
+						<span class="optional"><button name="Vehicle Weapons" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=Vehicle Weapons}}{{attr=logic}}{{mod=[[@{modifier_toggle}]]}}{{wound=[[@{wound_toggle}]]}}@{modifier_toggle}{{edge=[[@{edge_toggle}]]}}{{dice=[[(@{vehicle_weapons}+@{logic}+@{wound_toggle}+@{modifier_toggle}+@{edge_toggle})d6>@{edge_threshold}cs0]]}}">
 							<span data-i18n="vehicleweapons">Vehicle Weapons</span><span> </span><span name="attr_vehicle_weapons"></span><span>+A</span></button></span>
 					</div>
 				</div>
@@ -712,7 +713,7 @@
 						</div>
 						<div class="display">
 							<div class="npc-amps">
-								<button type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=@{amp}}}{{desc=@{amp_desc}}}"><span name="attr_amp"></span></button><span>: </span><span name="attr_amp_desc"></span>
+								<button name="Description" type="roll" value="@{gm_toggle} &{template:sAnarchy}{{header=@{amp}}}{{desc=@{amp_desc}}}"><span name="attr_amp"></span></button><span>: </span><span name="attr_amp_desc"></span>
 							</div>
 						</div>
 					</div>
@@ -890,7 +891,8 @@
 </div>
 
 <input type="hidden" class="npc-toggle" name="attr_npc_toggle" />
-<div class="footer" data-i18n="topps">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.<br />Sheet: Version 1.7</div>
+<input type="hidden" name="attr_version" value="1.7" />
+<div class="footer" data-i18n="topps">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.<br />Sheet: Version <span name="attr_version"></span></div>
 
 
 <div class="rolltemplates">
@@ -920,25 +922,15 @@
 <!--Sheet Worker-->
 <script type="text/worker">
 
-on('sheet:opened', function() {
-	getAttrs(["astral_combat"], function(v) {
-		const skl = parseInt(v.astral_combat) || 0;
-		if (skl > 0) {
-			setAttrs({
-				astral_combat_flag: 1
-			});
-		};
-	});
-});
+//Sheet open versioning
+on("sheet:opened", () => {
+	getAttrs(["version"], (v) => {versioning(v.version);});
+});			
 
   //UPDATE THE TRACKS
-["armor",
-"physical_max",
-"stun_max",
-"edge"
-].forEach(attr => {
-    on(`change:${attr}`, function(eventinfo) {
-    	getAttrs([`${attr}`], function (v) {
+["armor","physical_max","stun_max","edge"].forEach(attr => {
+    on(`change:${attr}`, (eventinfo) => {
+    	getAttrs([`${attr}`], (v) => {
     		const name = (attr === "edge") ? "edge" : (attr.includes("max")) ? attr.slice(0, -4) : "armor";
 			const stat = parseInt(v[`${attr}`]) || 0;
 			const max  = (attr === "edge") ? 6 : 15;
@@ -962,51 +954,42 @@ on('sheet:opened', function() {
  });
 
     //Configure Max Physical & Stun Track 
-on("change:strength change:willpower", function(eventinfo) {
+on("change:strength change:willpower", (eventinfo) => {
 	const attr = parseInt(eventinfo.newValue) || 0;
-	const tot = Math.ceil(attr/2) + 8;
 	const change = (eventinfo.sourceAttribute === "strength") ? "physical_max" : "stun_max";
 
      setAttrs({
-        [`${change}`]: tot
+        [`${change}`]: Math.ceil(attr/2) + 8
     });
 });
 
 	//Edge Toggle
-on("change:edge_toggle", function() {
-    getAttrs(["edge_threshold", "edge_toggle"], function(v){
-		if (v.edge_toggle == 1 && v.edge_threshold == 5) {
-			var thres = 4;
-		} else {
-			var thres = 5; }
-
+on("change:edge_toggle", () => {
+    getAttrs(["edge_threshold", "edge_toggle"], (v) => {
         setAttrs({
-            edge_threshold: thres
+            edge_threshold: (v.edge_toggle == 1 && v.edge_threshold == 5) ? 4 : 5
         });
     });
 });
 
 //Wound Modifiers for PC & NPC
 ["physical", "stun", "npc_physical", "npc_stun"].forEach(attr => {
-	on(`change:${attr}`, function (eventinfo) {
+	on(`change:${attr}`,  (eventinfo) => {
 		const source = eventinfo.sourceAttribute;
-		const otherattr = (source === "physical") ? "stun" : (source === "stun") ? "physical" : (source == "npc_physical") ? "npc_stun" : "npc_physical";
-
-		getAttrs([`${attr}`, `${otherattr}`], function (v) {
-			const phy = parseInt(v.npc_physical) || 0;
-			const stu = parseInt(v.npc_stun) || 0;
-			const tot = Math.floor(phy/3) + Math.floor(stu/3);
+		const otherattr = (source === "physical") ? "stun" : (source === "stun") ? "physical" : (source === "npc_physical") ? "npc_stun" : "npc_physical";
+		getAttrs([`${otherattr}`],  (v) => {
+			const attr1 = parseInt(eventinfo.newValue) || 0, attr2 = parseInt(v[`${otherattr}`]) || 0, tot = Math.floor(attr1/3) + Math.floor(attr2/3);
 			setAttrs({
 	            wounds: [`-${tot}`]
 	        });
+	        console.log(`%c WOUNDS: ${tot}`, "color:green;font-weight: 16px;");
 		});
 	});
 });
 
     //Set the Attribute to a name for the Roll Template
-on("change:repeating_skills:skill_attribute", function(eventinfo) {
-	const skill = eventinfo.newValue;
-    switch (skill) {
+on("change:repeating_skills:skill_attribute", (eventinfo) => {
+    switch (eventinfo.newValue) {
         case '@{strength}':
         	attr = "Strength"
             break;
@@ -1038,42 +1021,16 @@ on("change:repeating_skills:skill_attribute", function(eventinfo) {
 });
 
     //Put () around Skill specializations
-on("change:repeating_skills:skill_specalization", function(eventinfo) {
-	const ski = eventinfo.newValue;
-	const spec = (ski) ? `(${ski})` : "";
-
+on("change:repeating_skills:skill_specialization", (eventinfo) => {
 	setAttrs({
-		repeating_skills_skill_spec_display: spec
+		repeating_skills_skill_spec_display: (eventinfo.newValue) ? `(${eventinfo.newValue})` : ""
 	});
 });
 
 	//NPC Skill Toggles
-[	'astral_combat',
-	'athletics',
-	'biotech',
-	'close_combat',
-	'con',
-	'conjuring',
-	'disguise',
-	'electronics',
-	'engineering',
-	'escape_artist',
-	'firearms',
-	'hacking',
-	'heavy_weapons',
-	'intimidation',
-	'negotiation',
-	'piloting_ground',
-	'piloting_other',
-	'projectile_weapons',
-	'sorcery',
-	'stealth',
-	'survival',
-	'tasking',
-	'tracking',
-	'vehicle_weapons'
+['astral_combat','athletics','biotech','close_combat','con','conjuring','disguise','electronics','engineering','escape_artist','firearms','hacking','heavy_weapons','intimidation','negotiation','piloting_ground','piloting_other','projectile_weapons','sorcery','stealth','survival','tasking','tracking','vehicle_weapons'
 ].forEach(attr => {
-    on(`change:${attr}`, function(eventinfo) {
+    on(`change:${attr}`, (eventinfo) => {
 		const skl  = parseInt(eventinfo.newValue) || 0;
 		const flag = (skl > 0) ? 1 : 0;
 
@@ -1085,29 +1042,58 @@ on("change:repeating_skills:skill_specalization", function(eventinfo) {
 
 
 	//Repeating active for PC sheet
-on("change:repeating_skills", function() {
-	getAttrs(["repeating_skills_skill", "repeating_skills_skill_specalization"], function(v) {
+on("change:repeating_skills", () => {
+	getAttrs(["repeating_skills_skill", "repeating_skills_skill_specialization"], (v) => {
 		const skill = (v.repeating_skills_skill);
-		const spec = (v.repeating_skills_skill_specalization);
+		const spec = (v.repeating_skills_skill_specialization);
+		let update = {};
 
 		if (spec === "") {
-
-			(skill.length > 0 && skill.length <= 24) ? setAttrs({repeating_skills_skill_display: skill}) : 
-				(skill.length > 24 ) ? setAttrs({repeating_skills_skill_display: skill.slice(0, 24) + "..."}) :
-				setAttrs({repeating_skills_skill_display: " "});
-
+			update["repeating_skills_skill_display"] = (skill.length > 0 && skill.length <= 24) ? skill : (skill.length > 24 ) ? skill.slice(0, 24) + "..." : " ";
 		} else {
-
-			(skill.length > 0 && skill.length <= 15) ? setAttrs({repeating_skills_skill_display: skill}) : 
-				(skill.length > 12 ) ? setAttrs({repeating_skills_skill_display: skill.slice(0, 12) + "..."}) :
-				setAttrs({repeating_skills_skill_display: " "});
-
-			(spec.length > 0 && spec.length <= 12) ? setAttrs({repeating_skills_skill_spec_display: "(" + spec + ")"}) : 
-				(spec.length > 12 ) ? setAttrs({repeating_skills_skill_spec_display: "(" + spec.slice(0, 12) + "..." + ")"}) :
-				setAttrs({repeating_skills_skill_spec_display: " "});	
+			update["repeating_skills_skill_display"] = (skill.length > 0 && skill.length <= 15) ? skill : (skill.length > 12 ) ? skill.slice(0, 12) + "..." : " ";
+			update["repeating_skills_skill_spec_display"] = (spec.length > 0 && spec.length <= 12) ? `(${spec})`: (spec.length > 12 ) ? "(" + spec.slice(0, 12) + "..." + ")" : " ";
 		};
+
+		setAttrs(update);
 	});
 });
 
+	//VERSION
+const versioning = (version) => {
+	console.log(`%c Shadowrun Anarchy versioning, ${version}`, "color: blue; font-weight:bold");
+   if (version === "1.8") {
+		console.log(`%c Shadowrun Anarchy is update to date`, "color: red; font-weight:bold");
+   	} else if (version === "1.7") {
+		getAttrs(["astral_combat"], (v) => {
+			const skl = parseInt(v.astral_combat) || 0;
+			if (skl > 0) {
+				setAttrs({
+					astral_combat_flag: 1
+				});
+			};
+		});
+		//GET THE OLD SPEC MISSPELLED  AND UPDATE NEW SPEC ATTRIBUTE
+		getSectionIDs(`repeating_skills`, (ids) => {
+			let oldSpecs = [];
+		    for(var i=0; i < ids.length; i++) {
+		        oldSpecs.push(`repeating_skills_` + ids[i] + "_skill_specalization");
+			};
+			getAttrs(oldSpecs, (v) => {
+				let update = {};
+				oldSpecs.forEach(spec => {
+					const repeatingID = spec.split("_")[2];
+					update[`repeating_skills_${repeatingID}_skill_specialization`] = (v[`${spec}`]) ? v[`${spec}`] : "";;
+				});
+				setAttrs(update);
+			});
+		});
+		//UPDATE VERSION
+		setAttrs({version: "1.8"}, () => {versioning("1.8")});
+    } else {
+		setAttrs({version: "1.7"}, () => {versioning("1.7")});
+	};
+};
+
 
 </script>
\ No newline at end of file
diff --git a/ShadowrunAnarchy/translations/fr.json b/ShadowrunAnarchy/translations/fr.json
index 0412d281e4..c351c474d8 100644
--- a/ShadowrunAnarchy/translations/fr.json
+++ b/ShadowrunAnarchy/translations/fr.json
@@ -9,25 +9,25 @@
     "close": "Mêlée",
     "closecombat": "Combat rapproché",
     "con": "Con",
-    "condition": "Moniteur d’État",
+    "condition": "Moniteur de conditions",
     "conjuring": "Conjuration",
     "contacts": "Contacts",
-    "cues": "Repères",
+    "cues": "Répliques",
     "damage": "Dommages",
     "disguise": "Déguisement",
-    "dispositions": "Dispositions",
+    "dispositions": "Comportements",
     "edge": "Chance",
     "electronics": "Électronique",
     "emerged": "Émergé",
     "engineering": "Ingénierie",
     "escapeartist": "Artiste de l’évasion",
     "essence": "Essence",
-    "exploit": "EXPLOIT!",
+    "exploit": "Réussite Critique",
     "far": "Loin",
     "firearms": "Armes à Feu",
     "gear": "Equipement",
-    "glitch": "GLITCH!",
-    "hacking": "Piratage informatique",
+    "glitch": "Complication",
+    "hacking": "Hacking",
     "heavyweapons": "Armes Lourdes",
     "intimidation": "Intimidation",
     "karmabalance": "Karma actuel",
@@ -41,26 +41,26 @@
     "npctoggle": "Basculer PNJ",
     "physical": "Physique",
     "physicalbonus": "Bonus Physique",
-    "pilotground": "Pilotage (sol)",
+    "pilotground": "Véhicule terrestre",
     "pilotother": "Pilotage (autre)",
-    "plot": "Histoire",
+    "plot": "Point d'Anarchy",
     "projectileweapons": "Armes à projectiles",
-    "qualities": "Avantages",
-    "shadowamps": "Atouts des Ombres",
+    "qualities": "Traits",
+    "shadowamps": "Atouts",
     "skills": "Compétences",
     "sorcery": "Sorcellerie",
     "stealth": "Discrétion",
     "strength": "Force",
-    "stun": "Étourdissement",
-    "stunbonus": "Bonus assomé",
+    "stun": "Etourdissant",
+    "stunbonus": "Dégâts étourdissants",
     "survival": "Survie",
     "tasking": "Attribution des tâches",
     "totalkarma": "Karma total",
     "tracking": "Pistage",
-    "unarmed": "Non armés",
-    "vehicleweapons": "Armement du Véhicule",
+    "unarmed": "Mains nues",
+    "vehicleweapons": "Armes de véhicules",
     "weapons": "Armes",
     "willpower": "Volonté",
-    "wounds": "Wounds",
+    "wounds": "Blessures",
     "topps": "La Topps Company, Inc. a la propriété exclusive des noms, logos, illustrations, marques, photographies, sons, sons, audio, vidéo et/ou tout matériel exclusif utilisé en rapport avec le jeu Shadowrun. The Topps Company, Inc. a accordé la permission d'utiliser ces noms, logos, illustrations, marques et/ou tout matériel exclusif à des fins promotionnelles et informatives sur son site Web, mais n'endosse pas et n'est affilié à aucun titre officiel."
 }
\ No newline at end of file