diff --git a/Starfinder (simple)/Starfinder (simple).html b/Starfinder (simple)/Starfinder (simple).html
index e7b8e4fe80..04a311fe07 100644
--- a/Starfinder (simple)/Starfinder (simple).html	
+++ b/Starfinder (simple)/Starfinder (simple).html	
@@ -982,7 +982,7 @@
 		<div class="sheet-table">
 			<fieldset class="repeating_feat">
 				<span class="sheet-table-data-center" style="width:15%;">
-					<select title="repeating_feat_$X_type" name="attr_feat_type">
+					<select title="repeating_feat_$X_feat_type" name="attr_feat_type">
 						<option value="None" selected>None</option>
 						<option value="Racial">Racial</option>
 						<option value="Trait">Theme</option>
@@ -991,11 +991,11 @@
 						<option value="Other">Other</option>
 					</select>
 				</span>
-				<span class="sheet-table-data-center" style="width:40%;"><input title="repeating_feat_$X_name" type="text" name="attr_feat_name"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_feat_$X_used" type="number" name="attr_feat_used" value="0"></span>
+				<span class="sheet-table-data-center" style="width:40%;"><input title="repeating_feat_$X_feat_name" type="text" name="attr_feat_name"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_feat_$X_feat_used" type="number" name="attr_feat_used" value="0"></span>
 				<span class="sheet-table-data-center" style="width:2%;vertical-align:middle;font-size:150%;">/</span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_feat_$X_used|max" type="number" name="attr_feat_used_max" value="@{feat-max-calculation}" disabled></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_feat_$X_max-calculation" type="text" name="attr_feat-max-calculation" value="0"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_feat_$X_feat_used|max" type="number" name="attr_feat_used_max" value="@{feat-max-calculation}" disabled></span>
+				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_feat_$X_feat-max-calculation" type="text" name="attr_feat-max-calculation" value="0"></span>
 				<b>Show Description?</b>
 				<input type="checkbox" class="sheet-section-show" title="repeating_feat_$X_description-show" name="attr_description-show" value="1" checked/>
 				<textarea style="height:50px;" class="sheet-section" title="repeating_feat_$X_description" name="attr_description"></textarea>
@@ -1012,10 +1012,10 @@
     			<div class="sheet-table">
 					<div class="sheet-table-row1">
 						<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="roll_roll" title="%{repeating_pc-weapon_$X_roll}" value="@{macro-text}"></button></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_pc-weapon-name" title="@{repeating_pc-weapon_$X_name}" placeholder="Name" ><br>Name</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_pc-weapon-attack" title="@{repeating_pc-weapon_$X_attack}" placeholder="Attack Modifiers"value="0" ><br>Attack Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_pc-weapon-name" title="@{repeating_pc-weapon_$X_pc-weapon-name}" placeholder="Name" ><br>Name</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_pc-weapon-attack" title="@{repeating_pc-weapon_$X_pc-weapon-attack}" placeholder="Attack Modifiers"value="0" ><br>Attack Mods</span>
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-							<select title="@{repeating_pc-weapon_$X_attack-type}" name="attr_pc-attack-type">
+							<select title="@{repeating_pc-weapon_$X_pc-attack-type}" name="attr_pc-attack-type">
 								<option value="0" selected >None</option>
 								<option value="@{attk-melee}" >Melee</option>
 								<option value="@{attk-ranged}" >Ranged</option>
@@ -1023,13 +1023,13 @@
 							</select>
 							<br>Attack Type
 						</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-total-attack" title="@{repeating_pc-weapon_$X_total-attack}" value="(@{pc-weapon-proficiency} + @{pc-weapon-attack} + @{pc-attack-type})" disabled><br>ATK</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-damage-dice-num" title="@{repeating_pc-weapon_$X_damage-dice-num}" min="0" value="1" ><br>Dice</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-total-attack" title="@{repeating_pc-weapon_$X_pc-weapon-total-attack}" value="(@{pc-weapon-proficiency} + @{pc-weapon-attack} + @{pc-attack-type})" disabled><br>ATK</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-damage-dice-num" title="@{repeating_pc-weapon_$X_pc-damage-dice-num}" min="0" value="1" ><br>Dice</span>
 						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;">d</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-damage-die" title="@{repeating_pc-weapon_$X_damage-die}" min="0" value="1" ><br>Die</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_pc-damage" title="@{repeating_pc-weapon_$X_damage}" placeholder="Damage Modifiers" value="0" ><br>Damage Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-damage-die" title="@{repeating_pc-weapon_$X_pc-damage-die}" min="0" value="1" ><br>Die</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_pc-damage" title="@{repeating_pc-weapon_$X_pc-damage}" placeholder="Damage Modifiers" value="0" ><br>Damage Mods</span>
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;">
-							<select title="@{repeating_pc-weapon_$X_damage-ability}" name="attr_pc-damage-ability">
+							<select title="@{repeating_pc-weapon_$X_pc-damage-ability}" name="attr_pc-damage-ability">
 								<option value="0" selected>None</option>
 								<option value="@{STR-mod}">STR</option>
 								<option value="@{DEX-mod}">DEX</option>
@@ -1040,23 +1040,23 @@
 							</select>
 							<br>Damage Ability
 						</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-total-damage" title="@{repeating_pc-weapon_$X_total-damage}" value="(@{pc-damage} + @{pc-damage-ability})" disabled><br>DMG</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-total-damage" title="@{repeating_pc-weapon_$X_pc-weapon-total-damage}" value="(@{pc-damage} + @{pc-damage-ability})" disabled><br>DMG</span>
 					</div>
 				</div>
 				<div class="sheet-table">
 					<div class="sheet-table-row1">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_pc-weapon-critical" title="@{repeating_pc-weapon_$X_critical}" placeholder="none"><br>Critical</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-range" title="@{repeating_pc-weapon_$X_range}"  min="0" value="0" ><br>Range</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_pc-weapon-type" title="@{repeating_pc-weapon_$X_type}" placeholder="Damage Type" ><br>Damage Type</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-ammo" title="@{repeating_pc-weapon_$X_ammo}" value="0" ><br>Ammo</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_pc-weapon-critical" title="@{repeating_pc-weapon_$X_pc-weapon-critical}" placeholder="none"><br>Critical</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-range" title="@{repeating_pc-weapon_$X_pc-weapon-range}"  min="0" value="0" ><br>Range</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_pc-weapon-type" title="@{repeating_pc-weapon_$X_pc-weapon-type}" placeholder="Damage Type" ><br>Damage Type</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_pc-weapon-ammo" title="@{repeating_pc-weapon_$X_pc-weapon-ammo}" value="0" ><br>Ammo</span>
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-							<select title="@{repeating_pc-weapon_$X_proficiency}" name="attr_pc-weapon-proficiency">
+							<select title="@{repeating_pc-weapon_$X_pc-weapon-proficiency}" name="attr_pc-weapon-proficiency">
 								<option value="0" selected>Yes</option>
 								<option value="-4">No</option>
 							</select>
 							<br>Proficiency
 						</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_pc-weapon-notes" title="@{repeating_pc-weapon_$X_notes}" placeholder="Attack Notes" ><br>Notes</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_pc-weapon-notes" title="@{repeating_pc-weapon_$X_pc-weapon-notes}" placeholder="Attack Notes" ><br>Notes</span>
 					</div>
 				</div>
 				<b>Macro Text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
@@ -1081,11 +1081,11 @@
 		</div>
 		<div class="sheet-table">
 			<fieldset class="repeating_item">
-				<span class="sheet-table-data-center" style="width:40%;"><input title="repeating_item_$X_name" type="text" name="attr_item-name"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_qty" type="number" name="attr_item-qty" value="1"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_level" type="number" name="attr_item-level" value="1"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_bulk" type="number" step="0.1" name="attr_item-bulk" value="0.1"></span>
-				<span class="sheet-table-data-center" style="width:50%;"><input title="repeating_item_$X_description" type="text" name="attr_item-description"></span>
+				<span class="sheet-table-data-center" style="width:40%;"><input title="repeating_item_$X_item-name" type="text" name="attr_item-name"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_item-qty" type="number" name="attr_item-qty" value="1"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_item-level" type="number" name="attr_item-level" value="1"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_item_$X_item-bulk" type="number" step="0.1" name="attr_item-bulk" value="0.1"></span>
+				<span class="sheet-table-data-center" style="width:50%;"><input title="repeating_item_$X_item-description" type="text" name="attr_item-description"></span>
 			</fieldset>
 		</div>
 	</div>
@@ -2149,21 +2149,21 @@
 		<div class="sheet-table">
 			<fieldset class="repeating_drone-feat">
 				<span class="sheet-table-data-center" style="width:15%;">
-					<select title="repeating_drone-feat_$X_type" name="attr_drone-feat_type">
+					<select title="repeating_drone-feat_$X_drone-feat_type" name="attr_drone-feat_type">
 						<option value="None" selected>None</option>
 						<option value="Feat">Feat</option>
 						<option value="Mod">Mod</option>
 						<option value="Special Ability">Special Ability</option>
 					</select>
 				</span>
-				<span class="sheet-table-data-center" style="width:40%;"><input title="repeating_drone-feat_$X_name" type="text" name="attr_drone-feat_name"></span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_drone-feat_$X_used" type="number" name="attr_drone-feat_used" value="0"></span>
+				<span class="sheet-table-data-center" style="width:40%;"><input title="repeating_drone-feat_$X_drone-feat_name" type="text" name="attr_drone-feat_name"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_drone-feat_$X_drone-feat_used" type="number" name="attr_drone-feat_used" value="0"></span>
 				<span class="sheet-table-data-center" style="width:2%;vertical-align:middle;font-size:150%;">/</span>
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_drone-feat_$X_used|max" type="number" name="attr_drone-feat_used_max" value="@{drone-feat-max-calculation}" disabled></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_drone-feat_$X_max-calculation" type="text" name="attr_drone-feat-max-calculation" value="0"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_drone-feat_$X_drone-feat_used|max" type="number" name="attr_drone-feat_used_max" value="@{drone-feat-max-calculation}" disabled></span>
+				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_drone-feat_$X_drone-feat-max-calculation" type="text" name="attr_drone-feat-max-calculation" value="0"></span>
 				<b>Show Description?</b>
-				<input type="checkbox" class="sheet-section-show" title="repeating_drone-feat_$X_description-show" name="attr_drone-feat-description-show" value="1" checked/>
-				<textarea style="height:50px;" class="sheet-section" title="repeating_drone-feat_$X_description" name="attr_drone-feat-description"></textarea>
+				<input type="checkbox" class="sheet-section-show" title="repeating_drone-feat_$X_drone-feat-description-show" name="attr_drone-feat-description-show" value="1" checked/>
+				<textarea style="height:50px;" class="sheet-section" title="repeating_drone-feat_$X_drone-feat-description" name="attr_drone-feat-description"></textarea>
 			</fieldset>
 		</div>
 	</div>
@@ -2177,10 +2177,10 @@
     			<div class="sheet-table">
 					<div class="sheet-table-row1">
 						<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="roll_roll" title="%{repeating_drone-weapon_$X_roll}" value="@{drone-macro-text}"></button></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_drone-weapon-name" title="@{repeating_drone-weapon_$X_name}" placeholder="Name" ><br>Name</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_drone-weapon-attack" title="@{repeating_drone-weapon_$X_attack}" placeholder="Attack Modifiers"value="0" ><br>Attack Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_drone-weapon-name" title="@{repeating_drone-weapon_$X_drone-weapon-name}" placeholder="Name" ><br>Name</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_drone-weapon-attack" title="@{repeating_drone-weapon_$X_drone-weapon-attack}" placeholder="Attack Modifiers"value="0" ><br>Attack Mods</span>
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-							<select title="@{repeating_drone-weapon_$X_attack-type}" name="attr_drone-attack-type">
+							<select title="@{repeating_drone-weapon_$X_drone-attack-type}" name="attr_drone-attack-type">
 								<option value="0" selected >None</option>
 								<option value="@{drone-attk-melee}" >Melee</option>
 								<option value="@{drone-attk-range}" >Ranged</option>
@@ -2188,13 +2188,13 @@
 							</select>
 							<br>Attack Type
 						</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-weapon-total-attack" title="@{repeating_drone-weapon_$X_total-attack}" value="(@{drone-proficiency} + @{drone-weapon-attack} + @{drone-attack-type})" disabled><br>ATK</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-damage-dice-num" title="@{repeating_drone-weapon_$X_damage-dice-num}" min="0" value="1" ><br>Dice</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-weapon-total-attack" title="@{repeating_drone-weapon_$X_drone-weapon-total-attack}" value="(@{drone-proficiency} + @{drone-weapon-attack} + @{drone-attack-type})" disabled><br>ATK</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-damage-dice-num" title="@{repeating_drone-weapon_$X_drone-damage-dice-num}" min="0" value="1" ><br>Dice</span>
 						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;">d</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-damage-die" title="@{repeating_drone-weapon_$X_damage-die}" min="0" value="1" ><br>Die</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_drone-damage" title="@{repeating_drone-weapon_$X_damage}" placeholder="Damage Modifiers" value="0" ><br>Damage Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-damage-die" title="@{repeating_drone-weapon_$X_drone-damage-die}" min="0" value="1" ><br>Die</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_drone-damage" title="@{repeating_drone-weapon_$X_drone-damage}" placeholder="Damage Modifiers" value="0" ><br>Damage Mods</span>
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;">
-							<select title="@{repeating_drone-weapon_$X_damage-ability}" name="attr_drone-damage-ability">
+							<select title="@{repeating_drone-weapon_$X_drone-damage-ability}" name="attr_drone-damage-ability">
 								<option value="0" selected>None</option>
 								<option value="@{drone-STR-mod}">STR</option>
 								<option value="@{drone-DEX-mod}">DEX</option>
@@ -2205,28 +2205,28 @@
 							</select>
 							<br>Damage Ability
 						</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-weapon-total-damage" title="@{repeating_drone-weapon_$X_total-damage}" value="(@{drone-damage} + @{drone-damage-ability})" disabled><br>DMG</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-weapon-total-damage" title="@{repeating_drone-weapon_$X_drone-weapon-total-damage}" value="(@{drone-damage} + @{drone-damage-ability})" disabled><br>DMG</span>
 					</div>
 				</div>
 				<div class="sheet-table">
 					<div class="sheet-table-row1">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_drone-weapon-critical" title="@{repeating_drone-weapon_$X_critical}" placeholder="none"><br>Critical</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-weapon-range" title="@{repeating_drone-weapon_$X_range}"  min="0" value="0" ><br>Range</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_drone-weapon-type" title="@{repeating_drone-weapon_$X_type}" placeholder="Damage Type" ><br>Damage Type</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-ammo" title="@{repeating_drone-weapon_$X_ammo}" value="0" ><br>Ammo</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_drone-weapon-critical" title="@{repeating_drone-weapon_$X_drone-weapon-critical}" placeholder="none"><br>Critical</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-weapon-range" title="@{repeating_drone-weapon_$X_drone-weapon-range}"  min="0" value="0" ><br>Range</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_drone-weapon-type" title="@{repeating_drone-weapon_$X_drone-weapon-type}" placeholder="Damage Type" ><br>Damage Type</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_drone-ammo" title="@{repeating_drone-weapon_$X_drone-ammo}" value="0" ><br>Ammo</span>
 						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;">
-							<select title="@{repeating_drone-weapon_$X_proficiency}" name="attr_drone-proficiency">
+							<select title="@{repeating_drone-weapon_$X_drone-proficiency}" name="attr_drone-proficiency">
 								<option value="0" selected>Yes</option>
 								<option value="-4">No</option>
 							</select>
 							<br>Proficiency
 						</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_drone-weapon-notes" title="@{repeating_drone-weapon_$X_notes}" placeholder="Weapon Notes" ><br>Notes</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_drone-weapon-notes" title="@{repeating_drone-weapon_$X_drone-weapon-notes}" placeholder="Weapon Notes" ><br>Notes</span>
 					</div>
 				</div>
 				<b>Macro Text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-				<input type="checkbox" class="sheet-macro-show" title="@{repeating_drone-weapon_$X_macro-text-show}" name="attr_drone-macro-text-show" value="1" />
-				<textarea class="sheet-macro" title="@{repeating_drone-weapon_$X_macro-text}" name="attr_drone-macro-text">&{template:pf_attack} {{name=@{drone_name}'s @{drone-weapon-name}}} {{subtags=@{drone-weapon-type}}} {{attack=[[1d20cs>20 + [[@{drone-weapon-total-attack}]] ]]}} {{damage=[[@{drone-damage-dice-num}d@{drone-damage-die}+@{drone-weapon-total-damage}]]}} {{dmgcrit=[[@{drone-damage-dice-num}d@{drone-damage-die}+@{drone-weapon-total-damage}]] and @{drone-weapon-critical}}} {{notes=@{drone-weapon-notes}}} {{attk-notes=@{drone-attack-notes}}}</textarea>
+				<input type="checkbox" class="sheet-macro-show" title="@{repeating_drone-weapon_$X_drone-macro-text-show}" name="attr_drone-macro-text-show" value="1" />
+				<textarea class="sheet-macro" title="@{repeating_drone-weapon_$X_drone-macro-text}" name="attr_drone-macro-text">&{template:pf_attack} {{name=@{drone_name}'s @{drone-weapon-name}}} {{subtags=@{drone-weapon-type}}} {{attack=[[1d20cs>20 + [[@{drone-weapon-total-attack}]] ]]}} {{damage=[[@{drone-damage-dice-num}d@{drone-damage-die}+@{drone-weapon-total-damage}]]}} {{dmgcrit=[[@{drone-damage-dice-num}d@{drone-damage-die}+@{drone-weapon-total-damage}]] and @{drone-weapon-critical}}} {{notes=@{drone-weapon-notes}}} {{attk-notes=@{drone-attack-notes}}}</textarea>
 			</fieldset>
 		</div>
 	</div>
@@ -2907,28 +2907,28 @@
     			<div class="sheet-table">
 					<div class="sheet-table-row1">
 						<span class="sheet-table-data sheet-center" style="width:5%;"><button type="roll" name="attr_roll" title="%{repeating_npc-weapon_$X_roll}" value="@{macro-text-npc}"></button></span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_npc-weapon-name" title="@{repeating_npc-weapon_$X_name}" placeholder="Name" ><br>Name</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_npc-weapon-attack" title="@{repeating_npc-weapon_$X_attack}" placeholder="Attack Modifiers"value="0" ><br>Attack Mods</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-weapon-total-attack" title="@{repeating_npc-weapon_$X_total-attack}" value="@{npc-weapon-attack}" disabled><br>ATK</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-damage-dice-num" title="@{repeating_npc-weapon_$X_damage-dice-num}" min="0" value="1" ><br>Dice</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_npc-weapon-name" title="@{repeating_npc-weapon_$X_npc-weapon-name}" placeholder="Name" ><br>Name</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_npc-weapon-attack" title="@{repeating_npc-weapon_$X_npc-weapon-attack}" placeholder="Attack Modifiers"value="0" ><br>Attack Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-weapon-total-attack" title="@{repeating_npc-weapon_$X_npc-weapon-total-attack}" value="@{npc-weapon-attack}" disabled><br>ATK</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-damage-dice-num" title="@{repeating_npc-weapon_$X_npc-damage-dice-num}" min="0" value="1" ><br>Dice</span>
 						<span class="sheet-table-data sheet-center" style="vertical-align:middle;font-size:150%;width:2%;">d</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-damage-die" title="@{repeating_npc-weapon_$X_damage-die}" min="0" value="1" ><br>Die</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_npc-weapon-damage" title="@{repeating_npc-weapon_$X_damage}" placeholder="Damage Modifiers" value="0" ><br>Dmg Mods</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-weapon-total-damage" title="@{repeating_npc-weapon_$X_total-damage}" value="@{npc-weapon-damage}" disabled><br>DMG</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_npc-weapon-critical" title="@{repeating_npc-weapon_$X_critical}" placeholder="none"><br>Critical</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-weapon-range" title="@{repeating_npc-weapon_$X_range}"  min="0" value="0" ><br>Range</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_npc-weapon-type" title="@{repeating_npc-weapon_$X_type}" placeholder="Damage Type" ><br>Damage Type</span>
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-ammo" title="@{repeating_npc-weapon_$X_ammo}" value="0" ><br>Ammo</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-damage-die" title="@{repeating_npc-weapon_$X_npc-damage-die}" min="0" value="1" ><br>Die</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:10%;"><input type="text" name="attr_npc-weapon-damage" title="@{repeating_npc-weapon_$X_npc-weapon-damage}" placeholder="Damage Modifiers" value="0" ><br>Dmg Mods</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-weapon-total-damage" title="@{repeating_npc-weapon_$X_npc-weapon-total-damage}" value="@{npc-weapon-damage}" disabled><br>DMG</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:15%;"><input type="text" name="attr_npc-weapon-critical" title="@{repeating_npc-weapon_$X_npc-weapon-critical}" placeholder="none"><br>Critical</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-weapon-range" title="@{repeating_npc-weapon_$X_npc-weapon-range}"  min="0" value="0" ><br>Range</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:20%;"><input type="text" name="attr_npc-weapon-type" title="@{repeating_npc-weapon_$X_npc-weapon-type}" placeholder="Damage Type" ><br>Damage Type</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:5%;"><input type="number" name="attr_npc-ammo" title="@{repeating_npc-weapon_$X_npc-ammo}" value="0" ><br>Ammo</span>
 					</div>
 				</div>
 				<div class="sheet-table">
 					<div class="sheet-table-row1">
-						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_npc-weapon-notes" title="@{repeating_weapon_$X_notes}" placeholder="Attack Notes" ><br>Notes</span>
+						<span class="sheet-table-data sheet-center sheet-small-label" style="width:48%;"><input type="text" name="attr_npc-weapon-notes" title="@{repeating_npc-weapon_$X_npc-weapon-notes}" placeholder="Attack Notes" ><br>Notes</span>
 					</div>
 				</div>
 				<b>Macro Text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b>
-				<input type="checkbox" class="sheet-macro-show" title="@{repeating_weapon_$X_macro-text-show}" name="attr_macro-text-show" value="1"  />
-				<textarea class="sheet-macro" title="@{repeating_npc-weapon_$X_macro-text}" name="attr_macro-text-npc">/w GM &{template:pf_attack} {{name=@{character_name}'s @{npc-weapon-name}}} {{subtags=@{npc-weapon-type}}} {{attack=[[1d20cs>20 + [[@{npc-weapon-total-attack}]] ]]}} {{damage=[[@{npc-damage-dice-num}d@{npc-damage-die}+@{npc-weapon-total-damage}]]}} {{dmgcrit=[[@{npc-damage-dice-num}d@{npc-damage-die}+@{npc-weapon-total-damage}]] and @{npc-weapon-critical}}} {{notes=@{npc-weapon-notes}}}</textarea>
+				<input type="checkbox" class="sheet-macro-show" title="@{repeating_npc_weapon_$X_macro-text-show}" name="attr_macro-text-show" value="1"  />
+				<textarea class="sheet-macro" title="@{repeating_npc-weapon_$X_macro-text-npc}" name="attr_macro-text-npc">/w GM &{template:pf_attack} {{name=@{character_name}'s @{npc-weapon-name}}} {{subtags=@{npc-weapon-type}}} {{attack=[[1d20cs>20 + [[@{npc-weapon-total-attack}]] ]]}} {{damage=[[@{npc-damage-dice-num}d@{npc-damage-die}+@{npc-weapon-total-damage}]]}} {{dmgcrit=[[@{npc-damage-dice-num}d@{npc-damage-die}+@{npc-weapon-total-damage}]] and @{npc-weapon-critical}}} {{notes=@{npc-weapon-notes}}}</textarea>
 				<br>
 				<span>&nbsp;</span>
 			</fieldset>
@@ -2959,13 +2959,13 @@
 				</div>
 			</div>
 			<fieldset class="repeating_npc-spell-like-abilities">
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_usage" type="text" name="attr_npc-abil-usage"></span>
-				<span class="sheet-table-data-center" style="width:52%;"><input title="repeating_npc-spell-like-abilities_$X_name" type="text" name="attr_npc-abil-name"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_duration" type="text" name="attr_npc-abil-duration"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_range" type="text" name="attr_npc-abil-range"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_save" type="text" name="attr_npc-abil-save"></span>
+				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_npc-abil-usage" type="text" name="attr_npc-abil-usage"></span>
+				<span class="sheet-table-data-center" style="width:52%;"><input title="repeating_npc-spell-like-abilities_$X_npc-abil-name" type="text" name="attr_npc-abil-name"></span>
+				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_npc-abil-duration" type="text" name="attr_npc-abil-duration"></span>
+				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_npc-abil-range" type="text" name="attr_npc-abil-range"></span>
+				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_npc-spell-like-abilities_$X_npc-abil-save" type="text" name="attr_npc-abil-save"></span>
 				<span class="sheet-table-data-center" style="width:8%;">
-					<select title="repeating_npc-spell-like-abilities_$X_sr" name="attr_npc-abil-sr">
+					<select title="repeating_npc-spell-like-abilities_$X_npc-abil-sr" name="attr_npc-abil-sr">
 						<option value="Yes">Yes</option>
 						<option value="No" selected>No</option>
 					</select>
@@ -2987,9 +2987,9 @@
 				</div>
 			</div>
 			<fieldset class="repeating_spells">
-				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_spells_$X_level" type="number" name="attr_npc-spell-level" value="0"></span>
-				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_spells_$X_usage" type="text" name="attr_npc-spell-usage"></span>
-				<span class="sheet-table-data-center" style="width:47%;"><input title="List spells here, include (save DC)" type="text" name="attr_npc-spell-list"></span>
+				<span class="sheet-table-data-center" style="width:5%;"><input title="repeating_spells_$X_npc-spell-level" type="number" name="attr_npc-spell-level" value="0"></span>
+				<span class="sheet-table-data-center" style="width:10%;"><input title="repeating_spells_$X_npc-spell-usage" type="text" name="attr_npc-spell-usage"></span>
+				<span class="sheet-table-data-center" style="width:47%;"><input title="repeating_spells_$X_npc-spell-list" type="text" name="attr_npc-spell-list"></span>
 				<br>
 				<span>&nbsp;</span>
 			</fieldset>
@@ -3189,10 +3189,10 @@
 		    <div class="sheet-table">
 			    <div class="sheet-table-row">
 			        <fieldset class="repeating_npc-feat">
-				        <span class="sheet-table-data-center" style="width:50%"><input title="repeating_npc-feat_$X_name" type="text" name="attr_npc-feat-name" placeholder="Feat name"></span>
+				        <span class="sheet-table-data-center" style="width:50%"><input title="repeating_npc-feat_$X_npc-feat-name" type="text" name="attr_npc-feat-name" placeholder="Feat name"></span>
 				        <b>Show Description?</b>
-				        <input type="checkbox" class="sheet-section-show" title="repeating_npc-feat_$X_description-show" name="attr_npc-feat-description-show" value="1" checked/>
-				        <textarea style="height:50px;" class="sheet-section" style="width:97%;" title="repeating_npc-feat_$X_description" name="attr_npc-feat-description"></textarea>
+				        <input type="checkbox" class="sheet-section-show" title="repeating_npc-feat_$X_npc-feat-description-show" name="attr_npc-feat-description-show" value="1" checked/>
+				        <textarea style="height:50px;" class="sheet-section" style="width:97%;" title="repeating_npc-feat_$X_npc-feat-description" name="attr_npc-feat-description"></textarea>
 				        <br>
 				        <span>&nbsp;</span>
 			        </fieldset>
@@ -3228,9 +3228,9 @@
 	<hr/>
 	<div style="text-align:left;" class="sheet-npc-special-abilities">
 		<fieldset class="repeating_special-ability">
-			<input type="text" style="width:50%" title="repeating_special-ability_$X_name" name="attr_npc-spec-abil-name" placeholder="Ability Name"/>
+			<input type="text" style="width:50%" title="repeating_special-ability_$X_npc-spec-abil-name" name="attr_npc-spec-abil-name" placeholder="Ability Name"/>
 			<br>
-			<textarea title="repeating_special-ability_$X_description" name="attr_npc-spec-abil-description" placeholder="List special ability info here. Special abilities (including special qualities) are all explained here, in alphabetical order."></textarea>
+			<textarea title="repeating_special-ability_$X_npc-spec-abil-description" name="attr_npc-spec-abil-description" placeholder="List special ability info here. Special abilities (including special qualities) are all explained here, in alphabetical order."></textarea>
 			<br>
 			<span>&nbsp;</span>
 		</fieldset>