diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.css b/Shadowrun Sixth World/Shadowrun6thEdition.css
index a9cc40bd21..d8b3b9ae32 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.css	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.css	
@@ -900,118 +900,6 @@ div.matrix-device .matrixFirewall {
 
 
 
-  .npc .body div.headers {
-    display: grid !important; }
-    .npc .body div.headers h2:nth-of-type(1n+2) {
-      text-align: center !important; }
-  .npc .body div.repitem h3 {
-    color: #040404 !important; }
-  .npc .body div.repitem input:nth-of-type(1n+2) {
-    text-align: center !important; }
-  .npc .body div.repitem input.flag-primary[value='primary'] + button {
-    background-color: #460141 !important;
-    border-bottom: 2px solid #040404 !important; }
-
-  .npc .body div.repitem button[name='roll_range_weapon'] > span {
-    text-align: left; }
-
-  /* Ranged Specific */
-  .npc .body div.weapon-range div.headers {
-    width: 100%;
-    display: inline-grid;
-    grid-template-columns: 1fr 4em 4em 2em 2em 2em 2em 2em 5em 4em 1em 1em; }
-  .npc .body div.weapon-range div.repitem {
-    align-items: center;
-    width: 100%;
-    display: inline-grid;
-    grid-template-columns: 1fr 4em 4em 2em 2em 2em 2em 2em 5em 4em 1em 1em; }
-  .npc .body div.weapon-range div.repitem label[data-i18n-title='notes'],
-  .npc .body div.weapon-range div.repitem h3[data-i18n='notes'],
-  .npc .body div.weapon-range div.repitem div.collapse {
-    grid-column: 1 / 13 !important; }
-  .npc .body div.weapon-range div.repitem input.collapse-flag {
-    opacity: 0;
-    margin-bottom: 8px;
-    z-index: 2;
-    grid-area: 1 / 11 / 1 / 12 !important; }
-  .npc .body div.weapon-range div.repitem input.collapse-flag + span.pictos, .npc .body div.weapon-range div.repitem .settings-toggle input[type='checkbox'].collapse-flag + span, .settings-toggle .npc .body div.weapon-range div.repitem input[type='checkbox'].collapse-flag + span,
-  .npc .body div.weapon-range div.repitem .settings-flag input[type='checkbox'].collapse-flag + span,
-  .settings-flag .npc .body div.weapon-range div.repitem input[type='checkbox'].collapse-flag + span, .npc .body div.weapon-range div.repitem .flag-primary + div > input.collapse-flag + span, .npc .body div.weapon-range div.repitem .repcontrol input.collapse-flag + span.repcontrol_edit:after, .repcontrol .npc .body div.weapon-range div.repitem input.collapse-flag + span.repcontrol_edit:after,
-  .npc .body div.weapon-range div.repitem .repcontrol input.collapse-flag + span.repcontrol_add:after,
-  .repcontrol .npc .body div.weapon-range div.repitem input.collapse-flag + span.repcontrol_add:after, .npc .body div.weapon-range div.repitem .itemcontrol input.collapse-flag + span.repcontrol_del, .itemcontrol .npc .body div.weapon-range div.repitem input.collapse-flag + span.repcontrol_del {
-    grid-area: 1 / 11 / 1 / 12 !important; }
-
-  .npc .body div.weapon-range div.repitem input.settings-flag {
-    opacity: 0;
-    margin-bottom: 8px;
-    z-index: 2;
-    grid-area: 1 / 12 / 1 / 13 !important; }
-  .npc .body div.weapon-range div.repitem input.settings-flag + span.pictos,
-  .npc .body div.weapon-range div.repitem .settings-toggle input[type='checkbox'].settings-flag + span,
-  .settings-toggle .npc .body div.weapon-range div.repitem input[type='checkbox'].settings-flag + span,
-  .npc .body div.weapon-range div.repitem .settings-flag input[type='checkbox'].settings-flag + span,
-  .settings-flag .npc .body div.weapon-range div.repitem input[type='checkbox'].settings-flag + span,
-  .npc .body div.weapon-range div.repitem .flag-primary + div > input.settings-flag + span,
-  .npc .body div.weapon-range div.repitem .repcontrol input.settings-flag + span.repcontrol_edit:after,
-  .repcontrol .npc .body div.weapon-range div.repitem input.settings-flag + span.repcontrol_edit:after,
-  .npc .body div.weapon-range div.repitem .repcontrol input.settings-flag + span.repcontrol_add:after,
-  .repcontrol .npc .body div.weapon-range div.repitem input.settings-flag + span.repcontrol_add:after,
-  .npc .body div.weapon-range div.repitem .itemcontrol input.settings-flag + span.repcontrol_del,
-  .itemcontrol .npc .body div.weapon-range div.repitem input.settings-flag + span.repcontrol_del {
-    grid-area: 1 / 12 / 1 / 13 !important; }
-
-
-  .npc .body div.weapon-range div.repitem div.settings {
-    align-items: center;
-    width: 100%;
-    display: inline-grid;
-    grid-column: 1 / 13;
-    grid-template-columns: 1fr 4em 4em 2em 2em 2em 2em 2em 5em 4em 1em 1em; }
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_close'],
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_near'],
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_medium'],
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_far'],
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_extreme'] {
-    width: 2em; }
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_dicepool'],
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_damage'] {
-    width: 4em; }
-  .npc .body div.weapon-range div.repitem div.settings input[name='attr_firing_modes'] {
-    width: 13em; }
-  
-  
-  .npc .body div.weapon-range,
-  .npc .body div.weapon-melee {
-    width: 100% !important; }
-    .npc .body div.weapon-range div.row {
-      grid-column: 1 / 13 !important;
-      margin-left: 0px !important; }
-    .npc .body div.weapon-melee div.row {
-      grid-column: 1 / 9 !important;
-      margin-left: 0px !important; }
-      .npc .body div.weapon-range div.row label[data-i18n-title="modeoptions"],
-      .npc .body div.weapon-range div.row label[data-i18n-title="range"],
-      .npc .body div.weapon-melee div.row label[data-i18n-title="modeoptions"],
-      .npc .body div.weapon-melee div.row label[data-i18n-title="range"] {
-        width: 25% !important;
-        margin-left: 0px !important; }
-      .npc .body div.weapon-range div.row input[type='number'],
-      .npc .body div.weapon-melee div.row input[type='number'] {
-        width: 3em !important;
-        margin-left: 0px !important; }
-      .npc .body div.weapon-range div.row select,
-      .npc .body div.weapon-melee div.row select {
-        width: 30% !important;
-        margin-left: 0px !important; }
-    .npc .body div.weapon-range div.exotic-warning,
-    .npc .body div.weapon-melee div.exotic-warning {
-      display: none !important; }
-    .npc .body div.weapon-range input[value='0'] + div.exotic-warning,
-    .npc .body div.weapon-melee input[value='0'] + div.exotic-warning {
-      display: block !important; }
-
-
-
   .pc div.arms div.armor div.headers {
     grid-template-columns: 30% 3.5em 2.5em 2.5em 2.5em 2.5em 2.5em 1em 1em !important; }
   .pc div.arms div.armor div.repitem {
@@ -3223,9 +3111,126 @@ span.d6 {
 .npc div.mid span[name='attr_mental_limit']:after {
   content: ','; }
     /*:+:+:+: TEXT AREAS :+:+:+:*/
+
+
+
     /*:+:+:+: REPEATING SECTIONS :+:+:+:*/
-    /*:+:+:+: NPC INLINE REPEAITNG SECTIONS SUCH AS SKILLS :+:+:+:*/
-    /*:+:+:+: WEAPONS :+:+:+:*/
+
+
+
+/*:+:+:+: NPC INLINE REPEAITNG SECTIONS SUCH AS SKILLS :+:+:+:*/
+  /*:+:+:+: WEAPONS :+:+:+:*/
+  /* NPC (Grunt / Vehicle) Weapons */
+.npc .body div.headers {
+  display: grid !important; }
+.npc .body div.headers h2:nth-of-type(1n+2) {
+  text-align: center !important; }
+.npc .body div.repitem h3 {
+  color: #040404 !important; }
+.npc .body div.repitem input:nth-of-type(1n+2) {
+  text-align: center !important; }
+.npc .body div.repitem input.flag-primary[value='primary'] + button {
+  background-color: #460141 !important;
+  border-bottom: 2px solid #040404 !important; }
+
+.npc .body div.repitem button[name='roll_range_weapon'] > span {
+  text-align: left; }
+
+/* Ranged Specific */
+.npc .body div.weapon-range div.headers {
+  width: 100%;
+  display: inline-grid;
+  grid-template-columns: 1fr 4em 4em 2em 2em 2em 2em 2em 5em 4em 1em 1em; }
+.npc .body div.weapon-range div.repitem {
+  align-items: center;
+  width: 100%;
+  display: inline-grid;
+  grid-template-columns: 1fr 4em 4em 2em 2em 2em 2em 2em 5em 4em 1em 1em; }
+.npc .body div.weapon-range div.repitem label[data-i18n-title='notes'],
+.npc .body div.weapon-range div.repitem h3[data-i18n='notes'],
+.npc .body div.weapon-range div.repitem div.collapse {
+  grid-column: 1 / 13 !important; }
+.npc .body div.weapon-range div.repitem input.collapse-flag {
+  opacity: 0;
+  margin-bottom: 8px;
+  z-index: 2;
+  grid-area: 1 / 11 / 1 / 12 !important; }
+.npc .body div.weapon-range div.repitem input.collapse-flag + span.pictos, .npc .body div.weapon-range div.repitem .settings-toggle input[type='checkbox'].collapse-flag + span, .settings-toggle .npc .body div.weapon-range div.repitem input[type='checkbox'].collapse-flag + span,
+.npc .body div.weapon-range div.repitem .settings-flag input[type='checkbox'].collapse-flag + span,
+.settings-flag .npc .body div.weapon-range div.repitem input[type='checkbox'].collapse-flag + span, .npc .body div.weapon-range div.repitem .flag-primary + div > input.collapse-flag + span, .npc .body div.weapon-range div.repitem .repcontrol input.collapse-flag + span.repcontrol_edit:after, .repcontrol .npc .body div.weapon-range div.repitem input.collapse-flag + span.repcontrol_edit:after,
+.npc .body div.weapon-range div.repitem .repcontrol input.collapse-flag + span.repcontrol_add:after,
+.repcontrol .npc .body div.weapon-range div.repitem input.collapse-flag + span.repcontrol_add:after, .npc .body div.weapon-range div.repitem .itemcontrol input.collapse-flag + span.repcontrol_del, .itemcontrol .npc .body div.weapon-range div.repitem input.collapse-flag + span.repcontrol_del {
+  grid-area: 1 / 11 / 1 / 12 !important; }
+
+.npc .body div.weapon-range div.repitem input.settings-flag {
+  opacity: 0;
+  margin-bottom: 8px;
+  z-index: 2;
+  grid-area: 1 / 12 / 1 / 13 !important; }
+.npc .body div.weapon-range div.repitem input.settings-flag + span.pictos,
+.npc .body div.weapon-range div.repitem .settings-toggle input[type='checkbox'].settings-flag + span,
+.settings-toggle .npc .body div.weapon-range div.repitem input[type='checkbox'].settings-flag + span,
+.npc .body div.weapon-range div.repitem .settings-flag input[type='checkbox'].settings-flag + span,
+.settings-flag .npc .body div.weapon-range div.repitem input[type='checkbox'].settings-flag + span,
+.npc .body div.weapon-range div.repitem .flag-primary + div > input.settings-flag + span,
+.npc .body div.weapon-range div.repitem .repcontrol input.settings-flag + span.repcontrol_edit:after,
+.repcontrol .npc .body div.weapon-range div.repitem input.settings-flag + span.repcontrol_edit:after,
+.npc .body div.weapon-range div.repitem .repcontrol input.settings-flag + span.repcontrol_add:after,
+.repcontrol .npc .body div.weapon-range div.repitem input.settings-flag + span.repcontrol_add:after,
+.npc .body div.weapon-range div.repitem .itemcontrol input.settings-flag + span.repcontrol_del,
+.itemcontrol .npc .body div.weapon-range div.repitem input.settings-flag + span.repcontrol_del {
+  grid-area: 1 / 12 / 1 / 13 !important; }
+
+.npc .body div.weapon-range div.repitem div.settings {
+  align-items: center;
+  width: 100%;
+  display: inline-grid;
+  grid-column: 1 / 13;
+  grid-template-columns: 1fr 4em 4em 2em 2em 2em 2em 2em 5em 4em 1em 1em; }
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_close'],
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_near'],
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_medium'],
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_far'],
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_extreme'] {
+  width: 2em; }
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_dicepool'],
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_damage'] {
+  width: 4em; }
+.npc .body div.weapon-range div.repitem div.settings input[name='attr_firing_modes'] {
+  width: 13em; }
+
+.npc .body div.weapon-range,
+.npc .body div.weapon-melee {
+width: 100% !important; }
+.npc .body div.weapon-range div.row {
+  grid-column: 1 / 13 !important;
+  margin-left: 0px !important; }
+.npc .body div.weapon-melee div.row {
+  grid-column: 1 / 9 !important;
+  margin-left: 0px !important; }
+.npc .body div.weapon-range div.row label[data-i18n-title="modeoptions"],
+.npc .body div.weapon-range div.row label[data-i18n-title="range"],
+.npc .body div.weapon-melee div.row label[data-i18n-title="modeoptions"],
+.npc .body div.weapon-melee div.row label[data-i18n-title="range"] {
+  width: 25% !important;
+  margin-left: 0px !important; }
+.npc .body div.weapon-range div.row input[type='number'],
+.npc .body div.weapon-melee div.row input[type='number'] {
+  width: 3em !important;
+  margin-left: 0px !important; }
+.npc .body div.weapon-range div.row select,
+.npc .body div.weapon-melee div.row select {
+  width: 30% !important;
+  margin-left: 0px !important; }
+.npc .body div.weapon-range div.exotic-warning,
+.npc .body div.weapon-melee div.exotic-warning {
+  display: none !important; }
+.npc .body div.weapon-range input[value='0'] + div.exotic-warning,
+.npc .body div.weapon-melee input[value='0'] + div.exotic-warning {
+  display: block !important; }
+
+
+
     /*:+:+:+: SPELLS :+:+:+:*/
     /*:+:+:+: COMPLEX FORMS :+:+:+:*/
     /*:+:+:+: IC :+:+:+:*/
@@ -3683,6 +3688,9 @@ div.footer img {
 /********************************************************************************************************/
 /**************************************** Roll template *******************************************/
 /********************************************************************************************************/
+.sheet-rolltemplate-rolls a[href^="~"] {
+  background-color: #460141; }
+
 .sheet-rolltemplate-rolls div.sheet-template-body {
   border: 2px solid #000 !important;
   border-radius: 3px 3px 3px 3px !important; }
diff --git a/Shadowrun Sixth World/Shadowrun6thEdition.html b/Shadowrun Sixth World/Shadowrun6thEdition.html
index 25af3cd48a..e98b578874 100644
--- a/Shadowrun Sixth World/Shadowrun6thEdition.html	
+++ b/Shadowrun Sixth World/Shadowrun6thEdition.html	
@@ -1690,13 +1690,27 @@
               <input name="attr_conjuring_drain_modifier" title="@{conjuring_drain_modifier}" type="number" value="0"/>
             </label>
           </div>
+          <div class="row-long headers">
+            <button name="roll_conjuring" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Conjuring Spirit of ?{Spirit Type?|Air|Beasts|Earth|Fire|Kin|Water} Force ?{Force?|1|2|3|4|5|6|7|8|9|10}}}{{dice=[[((@{conjuring}+@{magic}+2+0)+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=[Spirit Resist](~@{character_name}|SpiritResistForce?{Force?})}}{{wilddie=[[@{wild_die}d6]]}}"><span data-i18n="summonspirit"></span></button>
+            <!-- hidden spirit resist buttons -->
+            <button class="btn ui-draggable" name="roll_SpiritResistForce1" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 1 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[2d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce2" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 2 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[4d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce3" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 3 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[6d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce4" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 4 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[8d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce5" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 5 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[10d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce6" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 6 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[12d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce7" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 7 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[14d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce8" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 8 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[16d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce9" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 9 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[18d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+            <button class="btn ui-draggable" name="roll_SpiritResistForce10" type="roll" style="display: none;" value="@{gm_toggle} &{template:rolls}{{header=^{force} 10 ^{spirit}}}{{base=Summoning Resist}}{{dice=[[20d6>5]]}}{{desc=Caster Resist Drain == Hits}}"></button>
+          </div>
           <div class="row-long headers">
             <h2 data-i18n="spirit">Spirit</h2>
             <h2 class="center" data-i18n="force">Force</h2>
           </div>
           <div class="rows repeating-container conjuration">
             <fieldset class="repeating_conjurations">
-            <button name="roll_conjuring" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=^{conjuring} @{spirit}\nForce @{force}}}{{dice=[[((@{conjuring}+@{magic}+@{dicepool_modifier}+@{spec}+@{expert})+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=@{notes}}}{{wilddie=[[@{wild_die}d6]]}}"><span name="attr_spirit"></span></button>
+            <button name="roll_conjuring" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=Conjuring Spirit of ?{Spirit Type?|Air|Beasts|Earth|Fire|Kin|Water} Force ?{Force?|1|2|3|4|5|6|7|8|9|10}}}{{dice=[[((@{conjuring}+@{magic}+2+0)+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=[Spirit Resist](~@{character_name}|SpiritResistForce?{Force?})}}{{wilddie=[[@{wild_die}d6]]}}"><span name="attr_spirit"></span></button>
             <span class="center" name="attr_force"></span>
               <input class="collapse-flag" name="attr_display_flag" type="checkbox"/><span class="pictos">i</span>
               <input class="settings-flag" name="attr_flag" title="Settings toggle" type="checkbox" checked="checked"/><span class="pictos">x</span>
@@ -3418,6 +3432,7 @@
     </div>
 
 	<div class="rows grunt vehicle repeating-container weapon-range">
+		<h1 data-i18n="rangedweapons">Ranged Weapons</h1>
 		<div class="row-long headers">
 			<h2 data-i18n="weapon">Weapon</h2>
 			<h2 data-i18n="pool">Pool</h2>
@@ -3527,51 +3542,7 @@
 			</div>
 		</fieldset>
 	</div>
-<!--
-    <div class="rows grunt vehicle repeating weapons">
-      <h1 data-i18n="weapons">Weapons</h1>
-      <fieldset class="repeating_weapon">
-        <input name="attr_flag" title="Settings toggle" type="checkbox" checked="checked"/><span class="pictos">x</span>
-        <input name="attr_" type="hidden" value=""/><span name="attr__dice"></span>
-        <button name="roll_weapon" type="roll" value="@{gm_toggle} &{template:rolls}{{mod=[[@{modifiers_toggle}]]}}{{wound=[[@{wounds_toggle}]]}}{{edge=[[@{edge_toggle}]]}}{{header=@{character_name}}}{{base=@{name} (@{weapon_type})}}{{dice=[[(@{weapon_dice}+@{wounds_toggle}+@{modifiers_toggle}+@{edge_toggle})d6>5@{explode_toggle}]]}}{{desc=DV @{weapon_dv}, Notes: @{notes}}}{{wilddie=[[@{wild_die}d6]]}}"><span name="attr__name"></span></button><span name="attr_"></span>
-        <div class="settings">
-          <input name="attr__range" type="hidden" value="range"/>
-          <h2 data-i18n="range">Range</h2>
-          <h2 data-i18n="dice">Dice</h2>
-          <h2 data-i18n="name">Name</h2>
-          <h2 data-i18n="type">Type</h2>
-          <h2 data-i18n="dam">Dam</h2>
-          <h2 data-i18n="modes">Modes</h2>
-          <h2 data-i18n="ammo">Ammo</h2>
-          <select name="attr__range" title="@{repeating_weapon_${x}_weapon_range}" value="range">
-            <option data-i18n="range" value="range" selected="selected">range</option>
-            <option data-i18n="melee" value="melee">melee</option>
-          </select>
-          <label data-i18n-title="dice" title="Dice">
-            <input name="attr__dice" placeholder="18" title="@{repeating_weapon_${x}_weapon_dice}" type="number" value=""/>
-          </label>
-          <label data-i18n-title="name" title="Name">
-            <input name="attr__name" placeholder="Ares Predator" title="@{repeating_weapon_${x}_weapon_name}" type="text" value=""/>
-          </label>
-          <label data-i18n-title="type" title="Type">
-            <input name="attr__type" placeholder="Heavy Pistol" title="@{repeating_weapon_${x}_weapon_type}" type="text" value=""/>
-          </label>
-          <label data-i18n-title="dam" title="Dam">
-            <input name="attr__dv" placeholder="9P" title="@{repeating_weapon_${x}_weapon_dv}" type="text" value=""/>
-          </label>
-          <label data-i18n-title="modes" title="Modes">
-            <input name="attr__mode" placeholder="SA/BF/FA" title="@{repeating_weapon_${x}_weapon_mode}" type="text" value=""/>
-          </label>
-          <label data-i18n-title="ammo" title="Ammo">
-            <input name="attr__ammo" placeholder="15" title="@{repeating_weapon_${x}_weapon_ammo}" type="number" value=""/>
-          </label>
-          <label data-i18n-title="notes" title="Notes">
-            <input name="attr__note" placeholder="w/ 3 clips of explosive rounds" title="@{repeating_weapon_${x}_weapon_note}" type="text" value=""/>
-          </label><span>(c)</span>
-        </div>
-      </fieldset>
-    </div>
--->
+
 
     <div class="rows grunt repeating spells hide-magic">
       <h1 data-i18n="spells">Spells</h1>
diff --git a/Shadowrun Sixth World/sheet.json b/Shadowrun Sixth World/sheet.json
index 2c20889eb3..83a482adf0 100644
--- a/Shadowrun Sixth World/sheet.json	
+++ b/Shadowrun Sixth World/sheet.json	
@@ -5,5 +5,6 @@
 	"roll20userid": "4306461",
 	"patreon": "https://www.patreon.com/ChuzGaming",
 	"preview": "preview.png",
+	"legacy": false,
 	"instructions": "This is a work in progress, once the PC part is mostly functional a thread will be started in the forums for feedback.  *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.*"
 }
diff --git a/Shadowrun Sixth World/translation.json b/Shadowrun Sixth World/translation.json
index cd9a6d55f3..4583093568 100644
--- a/Shadowrun Sixth World/translation.json	
+++ b/Shadowrun Sixth World/translation.json	
@@ -250,6 +250,7 @@
 	"maxspeed": "Max Speed",
 	"mediumdrone": "Medium Drone",
 	"melee": "Melee",
+	"meleeweapons": "Melee Weapons",
 	"memory": "Memory",
 	"mental": "Mental",
 	"meta": "Meta",
@@ -334,6 +335,7 @@
 	"radiationprotection": "Radiation Protection",
 	"range": "Range",
 	"ranged": "Ranged",
+	"rangedweapons": "Ranged Weapons",
 	"rating": "Rating",
 	"rating modifier": "rating modifier",
 	"rc": "RC",
@@ -400,6 +402,7 @@
 	"submarine": "Submarine",
 	"submersion": "Submersion",
 	"submersionlevel": "Submersion Level",
+	"summonspirit": "Summon Spirit",
 	"sustained": "Sustained",
 	"t": "T",
 	"t (a)": "T (A)",