diff --git a/Wrath and Glory API/wrath_and_glory_api.html b/Wrath and Glory API/wrath_and_glory_api.html
index 9aa1767c0f..ff5ce4e3f2 100644
--- a/Wrath and Glory API/wrath_and_glory_api.html	
+++ b/Wrath and Glory API/wrath_and_glory_api.html	
@@ -173,29 +173,6 @@
 									</button>									
 								</td>
 							</tr>
-							<tr>
-								<td><H5>Agility</H5></td>
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBase" value="1" title="Base Agility rating."/></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLMod" value="0" title="Modifier to base Agility rating."/></td> 
-								<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_AGLAdj" disabled="true" value="((@{AGLBase} + @{AGLMod}))" title="Adjusted (Base + Modifier) Agility."/></span></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBonusRoll" value="0" title="Number of Bonus Dice added to the Agility roll."/></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
-								<td class="sheet-center">
-									<input type="hidden"  type="number" name="attr_AGLnewbase" value="0"  />
-									<input type="hidden"  type="number" name="attr_AGLwrath" value="0"  />
-
-									<button class="sheet-diebutton-api" type="roll" 
-										title="Click to make an Agility test." 
-										value="@{sendapistring} {{[[[[@{AGLnewbase}]]d6]]}} {{[[@{AGLwrath}d6]]}} --++Name++|@{character_name} --Attribute|Agility --Modifier|@{AGLRollMod} --Wrath Die|Test"
-										name="roll_agility" style="font-size: 175%;">F</button>
-									</button>
-									<button class="sheet-diebutton-simple" type="roll" 
-										title="Click to make a Agility test; bonus dice are added, modifiers are not applied." 
-										value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Agility}} {{dice=[[@{AGLAdj} + @{AGLBonusRoll}]]}} {{roll=[[[[@{AGLnewbase}]]d6>4cs>6cf<0]]}} {{wrath=[[@{AGLwrath}D6>4cs>6cf<1]]}}"
-										name="roll_dice4agility" style="font-size: 175%;">F</button>
-									</button>			
-								</td>
-							</tr>
 							<tr>
 								<td><H5>Toughness</H5></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TGHBase" value="1" title="Base Toughness rating."/></td> 
@@ -220,25 +197,48 @@
 								</td>
 							</tr>
 							<tr>
-								<td><H5>Intellect</H5></td>
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBase" value="1" title="Base Intellect rating."/></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTMod" value="0" title="Modifier to base Intellect rating."/></td> 
-								<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INTAdj" disabled="true" value="((@{INTBase} + @{INTMod}))" title="Adjusted (Base + Modifier) Intellect."/></span></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBonusRoll" value="0" title="Number of Bonus Dice added to the Intellect roll."/></td>
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTRollMod" value="0" title="Modifier to the result of the die roll."/></td>  
+								<td><H5>Agility</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBase" value="1" title="Base Agility rating."/></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLMod" value="0" title="Modifier to base Agility rating."/></td> 
+								<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_AGLAdj" disabled="true" value="((@{AGLBase} + @{AGLMod}))" title="Adjusted (Base + Modifier) Agility."/></span></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBonusRoll" value="0" title="Number of Bonus Dice added to the Agility roll."/></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 								<td class="sheet-center">
-									<input type="hidden"  type="number" name="attr_INTnewbase" value="0"  />
-									<input type="hidden"  type="number" name="attr_INTwrath" value="0"  />
-									
+									<input type="hidden"  type="number" name="attr_AGLnewbase" value="0"  />
+									<input type="hidden"  type="number" name="attr_AGLwrath" value="0"  />
+
 									<button class="sheet-diebutton-api" type="roll" 
-										title="Click to make an Intellect test." 
-										value="@{sendapistring} {{[[[[@{INTnewbase}]]d6]]}} {{[[@{INTwrath}d6]]}} --++Name++|@{character_name} --Attribute|Intellect --Modifier|@{INTRollMod} --Wrath Die|Test"
-										name="roll_intellect" style="font-size: 175%;">F</button>
+										title="Click to make an Agility test." 
+										value="@{sendapistring} {{[[[[@{AGLnewbase}]]d6]]}} {{[[@{AGLwrath}d6]]}} --++Name++|@{character_name} --Attribute|Agility --Modifier|@{AGLRollMod} --Wrath Die|Test"
+										name="roll_agility" style="font-size: 175%;">F</button>
 									</button>
 									<button class="sheet-diebutton-simple" type="roll" 
-										title="Click to make an Intellect test; bonus dice are added, modifiers are not applied." 
-										value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Intellect}} {{dice=[[@{INTAdj} + @{INTBonusRoll}]]}} {{roll=[[[[@{INTnewbase}]]d6>4cs>6cf<0]]}} {{wrath=[[@{INTwrath}D6>4cs>6cf<1]]}}"
-										name="roll_dice4intellect" style="font-size: 175%;">F</button>
+										title="Click to make a Agility test; bonus dice are added, modifiers are not applied." 
+										value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Agility}} {{dice=[[@{AGLAdj} + @{AGLBonusRoll}]]}} {{roll=[[[[@{AGLnewbase}]]d6>4cs>6cf<0]]}} {{wrath=[[@{AGLwrath}D6>4cs>6cf<1]]}}"
+										name="roll_dice4agility" style="font-size: 175%;">F</button>
+									</button>			
+								</td>
+							</tr>
+							<tr>
+								<td><H5>Initiative</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBase" value="1" title="Base Initiative rating."/></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITMod" value="0" title="Modifier to base Initiative rating."/></td> 
+								<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INITAdj" disabled="true" value="((@{INITBase} + @{INITMod}))" title="Adjusted (Base + Modifier) Initiative."/></span></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBonusRoll" value="0" title="Number of Bonus Dice added to the Initiative roll."/></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
+								<td class="sheet-center">
+									<input type="hidden"  type="number" name="attr_INITnewbase" value="0"  />
+									<input type="hidden"  type="number" name="attr_INITwrath" value="0"  />
+									
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Initiative test; if this is a combat initiative roll, use 'roll initiative' on the combat tab." 
+										value="@{sendapistring} {{[[[[@{INITnewbase}]]d6]]}} {{[[@{INITwrath}d6]]}} --++Name++|@{character_name} --Attribute|Initiative --Modifier|@{INITRollMod} --Wrath Die|Test"
+										name="roll_initiative" style="font-size: 175%;">F</button>
+									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make an Initiative test; bonus dice are added, modifiers are not applied.  Use 'roll initiative' on the combat tab if this is a combat initiative roll." 
+										value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Initiative}} {{dice=[[@{INITAdj} + @{INITBonusRoll}]]}} {{roll=[[[[@{INITnewbase}]]d6>4cs>6cf<0]]}} {{wrath=[[@{INITwrath}D6>4cs>6cf<1]]}}"
+										name="roll_dice4initiative" style="font-size: 175%;">F</button>
 									</button>		
 								</td>
 							</tr>
@@ -265,6 +265,29 @@
 									</button>		
 								</td>
 							</tr>
+							<tr>
+								<td><H5>Intellect</H5></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBase" value="1" title="Base Intellect rating."/></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTMod" value="0" title="Modifier to base Intellect rating."/></td> 
+								<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INTAdj" disabled="true" value="((@{INTBase} + @{INTMod}))" title="Adjusted (Base + Modifier) Intellect."/></span></td> 
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBonusRoll" value="0" title="Number of Bonus Dice added to the Intellect roll."/></td>
+								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTRollMod" value="0" title="Modifier to the result of the die roll."/></td>  
+								<td class="sheet-center">
+									<input type="hidden"  type="number" name="attr_INTnewbase" value="0"  />
+									<input type="hidden"  type="number" name="attr_INTwrath" value="0"  />
+									
+									<button class="sheet-diebutton-api" type="roll" 
+										title="Click to make an Intellect test." 
+										value="@{sendapistring} {{[[[[@{INTnewbase}]]d6]]}} {{[[@{INTwrath}d6]]}} --++Name++|@{character_name} --Attribute|Intellect --Modifier|@{INTRollMod} --Wrath Die|Test"
+										name="roll_intellect" style="font-size: 175%;">F</button>
+									</button>
+									<button class="sheet-diebutton-simple" type="roll" 
+										title="Click to make an Intellect test; bonus dice are added, modifiers are not applied." 
+										value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Intellect}} {{dice=[[@{INTAdj} + @{INTBonusRoll}]]}} {{roll=[[[[@{INTnewbase}]]d6>4cs>6cf<0]]}} {{wrath=[[@{INTwrath}D6>4cs>6cf<1]]}}"
+										name="roll_dice4intellect" style="font-size: 175%;">F</button>
+									</button>		
+								</td>
+							</tr>
 							<tr>
 								<td><H5>Fellowship</H5></td>
 								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_FELBase" value="1" title="Base Fellowship rating."/></td> 
@@ -288,29 +311,6 @@
 									</button>		
 								</td>
 							</tr>
-							<tr>
-								<td><H5>Initiative</H5></td>
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBase" value="1" title="Base Initiative rating."/></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITMod" value="0" title="Modifier to base Initiative rating."/></td> 
-								<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INITAdj" disabled="true" value="((@{INITBase} + @{INITMod}))" title="Adjusted (Base + Modifier) Initiative."/></span></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBonusRoll" value="0" title="Number of Bonus Dice added to the Initiative roll."/></td> 
-								<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
-								<td class="sheet-center">
-									<input type="hidden"  type="number" name="attr_INITnewbase" value="0"  />
-									<input type="hidden"  type="number" name="attr_INITwrath" value="0"  />
-									
-									<button class="sheet-diebutton-api" type="roll" 
-										title="Click to make an Initiative test; if this is a combat initiative roll, use 'roll initiative' on the combat tab." 
-										value="@{sendapistring} {{[[[[@{INITnewbase}]]d6]]}} {{[[@{INITwrath}d6]]}} --++Name++|@{character_name} --Attribute|Initiative --Modifier|@{INITRollMod} --Wrath Die|Test"
-										name="roll_initiative" style="font-size: 175%;">F</button>
-									</button>
-									<button class="sheet-diebutton-simple" type="roll" 
-										title="Click to make an Initiative test; bonus dice are added, modifiers are not applied.  Use 'roll initiative' on the combat tab if this is a combat initiative roll." 
-										value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Initiative}} {{dice=[[@{INITAdj} + @{INITBonusRoll}]]}} {{roll=[[[[@{INITnewbase}]]d6>4cs>6cf<0]]}} {{wrath=[[@{INITwrath}D6>4cs>6cf<1]]}}"
-										name="roll_dice4initiative" style="font-size: 175%;">F</button>
-									</button>		
-								</td>
-							</tr>
 						</table>
 				</div>
 			
@@ -468,12 +468,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_AthLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})" selected="true" >Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_AthAttrRat" disabled="true" value="((@{AthLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -516,12 +516,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_AwareLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})" selected="true" >Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})" selected="true" >Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_AwareAttrRat" disabled="true" value="((@{AwareLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -564,12 +564,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_BallLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})" selected="true" >Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})" selected="true" >Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_BallAttrRat" disabled="true" value="((@{BallLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -612,12 +612,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_CunnLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_CunnAttrRat" disabled="true" value="((@{CunnLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -660,12 +660,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_DecepLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_DecepAttrRat" disabled="true" value="((@{DecepLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -708,12 +708,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_insightLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_insightAttrRat" disabled="true" value="((@{insightLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -756,12 +756,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_IntimLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_IntimAttrRat" disabled="true" value="((@{IntimLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -804,12 +804,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_InvestLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})" selected="true" >Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})" selected="true" >Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_InvestAttrRat" disabled="true" value="((@{InvestLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -852,12 +852,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_LeadLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_LeadAttrRat" disabled="true" value="((@{LeadLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -900,12 +900,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_MediLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})" selected="true" >Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})" selected="true" >Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_MediAttrRat" disabled="true" value="((@{MediLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -948,12 +948,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_PersLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})" selected="true" >Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_PersAttrRat" disabled="true" value="((@{PersLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -996,12 +996,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_PilotLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})" selected="true" >Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})" selected="true" >Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_PilotAttrRat" disabled="true" value="((@{PilotLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1044,12 +1044,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_PsychicLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_PsychicAttrRat" disabled="true" value="((@{PsychicLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1092,12 +1092,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_SchoLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})" selected="true" >Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})" selected="true" >Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_SchoAttrRat" disabled="true" value="((@{SchoLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1140,12 +1140,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_StealthLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})" selected="true" >Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})" selected="true" >Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_StealthAttrRat" disabled="true" value="((@{StealthLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1188,12 +1188,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_SurvLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_SurvAttrRat" disabled="true" value="((@{SurvLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1236,12 +1236,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_TechLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})" selected="true" >Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})" selected="true" >Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_TechAttrRat" disabled="true" value="((@{TechLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1284,12 +1284,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_WpnSkillLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})" selected="true" >Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_WpnSkillAttrRat" disabled="true" value="((@{WpnSkillLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1335,12 +1335,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_repSkillLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)" selected="true" >None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})">Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})">Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-width-W9 sheet-center"><span class="sheet-circle"><input type="number" name="attr_repSkillAttrRat" disabled="true" value="((@{repSkillLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -1764,12 +1764,12 @@
 								<select class="sheet-verylargedropdown sheet-smaller-text" name="attr_psyPowerTestLinkedAttr" value="0"  title="Select the attribute associated with the power; default is WLP - Willpower.">
 									<option value="(0)" selected="true">None</option>
 									<option value="(@{STRAdj})">Strength</option>
-									<option value="(@{AGLAdj})">Agility</option>
 									<option value="(@{TGHAdj})">Toughness</option>
-									<option value="(@{INTAdj})">Intelligence</option>
-									<option value="(@{WILLAdj})" selected="true" >Willpower</option>
-									<option value="(@{FELAdj})">Fellowship</option>
+									<option value="(@{AGLAdj})">Agility</option>
 									<option value="(@{INITAdj})">Initiative</option>
+									<option value="(@{WILLAdj})" selected="true" >Willpower</option>
+									<option value="(@{INTAdj})">Intelligence</option>
+									<option value="(@{FELAdj})">Fellowship</option>
 								</select>
 							</td>	
 							<td class="sheet-width-W3 sheet-left"><span class="sheet-circle"><input type="number"  type="number" name="attr_psyPowerTestAttrRat" disabled="true" value="((@{psyPowerTestLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -2282,26 +2282,6 @@
 										</button>									
 									</td>
 								</tr>
-								<tr>
-									<td><H5>Agility</H5></td>
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBase" value="1" title="Base Agility rating."/></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLMod" value="0" title="Modifier to base Agility rating."/></td> 
-									<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_AGLAdj" disabled="true" value="((@{AGLBase} + @{AGLMod}))" title="Adjusted (Base + Modifier) Agility."/></span></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBonusRoll" value="0" title="Number of Bonus Dice added to the Agility roll."/></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
-									<td class="sheet-center">
-										<button class="sheet-diebutton-api" type="roll" 
-											title="Click to make an Agility test." 
-											value="@{sendapistring} {{[[[[@{AGLAdj} + @{AGLBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --++Name++|@{character_name} --Attribute|Agility --Modifier|@{AGLRollMod} --Wrath Die|Test"
-											name="roll_NPCagility" style="font-size: 175%;">F</button>
-										</button>
-										<button class="sheet-diebutton-simple" type="roll" 
-											title="Click to make a Agility test; bonus dice are added, modifiers are not applied." 
-											value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Agility}} {{dice=[[@{AGLAdj} + @{AGLBonusRoll}]]}} {{roll=[[[[@{AGLAdj} + @{AGLBonusRoll} - {1}]]d6>4cs>6cf<0]]}} {{wrath=[[1D6>4cs>6cf<1]]}}"
-											name="roll_NPCdice4agility" style="font-size: 175%;">F</button>
-										</button>			
-									</td>
-								</tr>
 								<tr>
 									<td><H5>Toughness</H5></td>
 									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_TGHBase" value="1" title="Base Toughness rating."/></td> 
@@ -2323,22 +2303,42 @@
 									</td>
 								</tr>
 								<tr>
-									<td><H5>Intellect</H5></td>
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBase" value="1" title="Base Intellect rating."/></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTMod" value="0" title="Modifier to base Intellect rating."/></td> 
-									<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INTAdj" disabled="true" value="((@{INTBase} + @{INTMod}))" title="Adjusted (Base + Modifier) Intellect."/></span></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBonusRoll" value="0" title="Number of Bonus Dice added to the Intellect roll."/></td>
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTRollMod" value="0" title="Modifier to the result of the die roll."/></td>  
+									<td><H5>Agility</H5></td>
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBase" value="1" title="Base Agility rating."/></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLMod" value="0" title="Modifier to base Agility rating."/></td> 
+									<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_AGLAdj" disabled="true" value="((@{AGLBase} + @{AGLMod}))" title="Adjusted (Base + Modifier) Agility."/></span></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLBonusRoll" value="0" title="Number of Bonus Dice added to the Agility roll."/></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_AGLRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
 									<td class="sheet-center">
 										<button class="sheet-diebutton-api" type="roll" 
-											title="Click to make an Intellect test." 
-											value="@{sendapistring} {{[[[[@{INTAdj} + @{INTBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --++Name++|@{character_name} --Attribute|Intellect --Modifier|@{INTRollMod} --Wrath Die|Test"
-											name="roll_NPCintellect" style="font-size: 175%;">F</button>
+											title="Click to make an Agility test." 
+											value="@{sendapistring} {{[[[[@{AGLAdj} + @{AGLBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --++Name++|@{character_name} --Attribute|Agility --Modifier|@{AGLRollMod} --Wrath Die|Test"
+											name="roll_NPCagility" style="font-size: 175%;">F</button>
 										</button>
 										<button class="sheet-diebutton-simple" type="roll" 
-											title="Click to make an Intellect test; bonus dice are added, modifiers are not applied." 
-											value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Intellect}} {{dice=[[@{INTAdj} + @{INTBonusRoll}]]}} {{roll=[[[[@{INTAdj} + @{INTBonusRoll} - {1}]]d6>4cs>6cf<0]]}} {{wrath=[[1D6>4cs>6cf<1]]}}"
-											name="roll_NPCdice4intellect" style="font-size: 175%;">F</button>
+											title="Click to make a Agility test; bonus dice are added, modifiers are not applied." 
+											value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Agility}} {{dice=[[@{AGLAdj} + @{AGLBonusRoll}]]}} {{roll=[[[[@{AGLAdj} + @{AGLBonusRoll} - {1}]]d6>4cs>6cf<0]]}} {{wrath=[[1D6>4cs>6cf<1]]}}"
+											name="roll_NPCdice4agility" style="font-size: 175%;">F</button>
+										</button>			
+									</td>
+								</tr>
+								<tr>
+									<td><H5>Initiative</H5></td>
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBase" value="1" title="Base Initiative rating."/></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITMod" value="0" title="Modifier to base Initiative rating."/></td> 
+									<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INITAdj" disabled="true" value="((@{INITBase} + @{INITMod}))" title="Adjusted (Base + Modifier) Initiative."/></span></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBonusRoll" value="0" title="Number of Bonus Dice added to the Initiative roll."/></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
+									<td class="sheet-center">
+										<button class="sheet-diebutton-api" type="roll" 
+											title="Click to make an Initiative test; if this is a combat initiative roll, use 'roll initiative' on the combat tab." 
+											value="@{sendapistring} {{[[[[@{INITAdj} + @{INITBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --++Name++|@{character_name} --Attribute|Initiative --Modifier|@{INITRollMod} --Wrath Die|Test"
+											name="roll_NPCinitiative" style="font-size: 175%;">F</button>
+										</button>
+										<button class="sheet-diebutton-simple" type="roll" 
+											title="Click to make an Initiative test; bonus dice are added, modifiers are not applied.  Use 'roll initiative' on the combat tab if this is a combat initiative roll." 
+											value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Initiative}} {{dice=[[@{INITAdj} + @{INITBonusRoll}]]}} {{roll=[[[[@{INITAdj} + @{INITBonusRoll} - {1}]]d6>4cs>6cf<0]]}} {{wrath=[[1D6>4cs>6cf<1]]}}"
+											name="roll_NPCdice4initiative" style="font-size: 175%;">F</button>
 										</button>		
 									</td>
 								</tr>
@@ -2362,6 +2362,26 @@
 										</button>		
 									</td>
 								</tr>
+								<tr>
+									<td><H5>Intellect</H5></td>
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBase" value="1" title="Base Intellect rating."/></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTMod" value="0" title="Modifier to base Intellect rating."/></td> 
+									<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INTAdj" disabled="true" value="((@{INTBase} + @{INTMod}))" title="Adjusted (Base + Modifier) Intellect."/></span></td> 
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTBonusRoll" value="0" title="Number of Bonus Dice added to the Intellect roll."/></td>
+									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INTRollMod" value="0" title="Modifier to the result of the die roll."/></td>  
+									<td class="sheet-center">
+										<button class="sheet-diebutton-api" type="roll" 
+											title="Click to make an Intellect test." 
+											value="@{sendapistring} {{[[[[@{INTAdj} + @{INTBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --++Name++|@{character_name} --Attribute|Intellect --Modifier|@{INTRollMod} --Wrath Die|Test"
+											name="roll_NPCintellect" style="font-size: 175%;">F</button>
+										</button>
+										<button class="sheet-diebutton-simple" type="roll" 
+											title="Click to make an Intellect test; bonus dice are added, modifiers are not applied." 
+											value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Intellect}} {{dice=[[@{INTAdj} + @{INTBonusRoll}]]}} {{roll=[[[[@{INTAdj} + @{INTBonusRoll} - {1}]]d6>4cs>6cf<0]]}} {{wrath=[[1D6>4cs>6cf<1]]}}"
+											name="roll_NPCdice4intellect" style="font-size: 175%;">F</button>
+										</button>		
+									</td>
+								</tr>
 								<tr>
 									<td><H5>Fellowship</H5></td>
 									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_FELBase" value="1" title="Base Fellowship rating."/></td> 
@@ -2382,26 +2402,6 @@
 										</button>		
 									</td>
 								</tr>
-								<tr>
-									<td><H5>Initiative</H5></td>
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBase" value="1" title="Base Initiative rating."/></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITMod" value="0" title="Modifier to base Initiative rating."/></td> 
-									<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_INITAdj" disabled="true" value="((@{INITBase} + @{INITMod}))" title="Adjusted (Base + Modifier) Initiative."/></span></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITBonusRoll" value="0" title="Number of Bonus Dice added to the Initiative roll."/></td> 
-									<td class="sheet-center"><input class="sheet-spin-button" type="number" name="attr_INITRollMod" value="0" title="Modifier to the result of the die roll."/></td> 
-									<td class="sheet-center">
-										<button class="sheet-diebutton-api" type="roll" 
-											title="Click to make an Initiative test; if this is a combat initiative roll, use 'roll initiative' on the combat tab." 
-											value="@{sendapistring} {{[[[[@{INITAdj} + @{INITBonusRoll} - 1]]d6]]}} {{[[1d6]]}} --++Name++|@{character_name} --Attribute|Initiative --Modifier|@{INITRollMod} --Wrath Die|Test"
-											name="roll_NPCinitiative" style="font-size: 175%;">F</button>
-										</button>
-										<button class="sheet-diebutton-simple" type="roll" 
-											title="Click to make an Initiative test; bonus dice are added, modifiers are not applied.  Use 'roll initiative' on the combat tab if this is a combat initiative roll." 
-											value="@{sendinlinestring}{template:roll_dicepool} {{name=@{character_name} Tests Initiative}} {{dice=[[@{INITAdj} + @{INITBonusRoll}]]}} {{roll=[[[[@{INITAdj} + @{INITBonusRoll} - {1}]]d6>4cs>6cf<0]]}} {{wrath=[[1D6>4cs>6cf<1]]}}"
-											name="roll_NPCdice4initiative" style="font-size: 175%;">F</button>
-										</button>		
-									</td>
-								</tr>
 								<tr>
 									<td><H5>Conviction</H5></td>									
 									<td class="sheet-center"><span class="sheet-circle"><input type="number" readonly name="attr_ConvBase" value="1" title="Base Conviction rating."/></span></span></td> 
@@ -2587,12 +2587,12 @@
 							<select class="sheet-width-W95 sheet-dropdown" name="attr_defaultLinkedAttr" value="0"  title="Select the attribute associated with the default skill.">
 								<option value="(0)">None</option>
 								<option value="(@{STRAdj})" selected="true" >Strength</option>
-								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{TGHAdj})">Toughness</option>
-								<option value="(@{INTAdj})">Intellect</option>
-								<option value="(@{WILLAdj})">Willpower</option>
-								<option value="(@{FELAdj})">Fellowship</option>
+								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{INITAdj})">Initiative</option>
+								<option value="(@{WILLAdj})">Willpower</option>
+								<option value="(@{INTAdj})">Intellect</option>
+								<option value="(@{FELAdj})">Fellowship</option>
 							</select>
 						</td>	
 						<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_defaultAttrRat" disabled="true" value="((@{defaultLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -2619,12 +2619,12 @@
 							<select class="sheet-width-W95 sheet-dropdown" name="attr_AwareLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 								<option value="(0)">None</option>
 								<option value="(@{STRAdj})">Strength</option>
-								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{TGHAdj})">Toughness</option>
-								<option value="(@{INTAdj})" selected="true" >Intellect</option>
-								<option value="(@{WILLAdj})">Willpower</option>
-								<option value="(@{FELAdj})">Fellowship</option>
+								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{INITAdj})">Initiative</option>
+								<option value="(@{WILLAdj})">Willpower</option>
+								<option value="(@{INTAdj})" selected="true" >Intellect</option>
+								<option value="(@{FELAdj})">Fellowship</option>
 							</select>
 						</td>	
 						<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_AwareAttrRat" disabled="true" value="((@{AwareLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -2651,12 +2651,12 @@
 							<select class="sheet-width-W95 sheet-dropdown" name="attr_BallLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 								<option value="(0)">None</option>
 								<option value="(@{STRAdj})">Strength</option>
-								<option value="(@{AGLAdj})" selected="true" >Agility</option>
 								<option value="(@{TGHAdj})">Toughness</option>
-								<option value="(@{INTAdj})">Intellect</option>
-								<option value="(@{WILLAdj})">Willpower</option>
-								<option value="(@{FELAdj})">Fellowship</option>
+								<option value="(@{AGLAdj})" selected="true" >Agility</option>
 								<option value="(@{INITAdj})">Initiative</option>
+								<option value="(@{WILLAdj})">Willpower</option>
+								<option value="(@{INTAdj})">Intellect</option>
+								<option value="(@{FELAdj})">Fellowship</option>
 							</select>
 						</td>	
 						<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_BallAttrRat" disabled="true" value="((@{BallLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -2683,12 +2683,12 @@
 						<select class="sheet-width-W95 sheet-dropdown" name="attr_PsychicLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 							<option value="(0)">None</option>
 							<option value="(@{STRAdj})">Strength</option>
-							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{TGHAdj})">Toughness</option>
-							<option value="(@{INTAdj})">Intellect</option>
-							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
-							<option value="(@{FELAdj})">Fellowship</option>
+							<option value="(@{AGLAdj})">Agility</option>
 							<option value="(@{INITAdj})">Initiative</option>
+							<option value="(@{WILLAdj})" selected="true" >Willpower</option>
+							<option value="(@{INTAdj})">Intellect</option>
+							<option value="(@{FELAdj})">Fellowship</option>
 						</select>
 					</td>	
 					<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_PsychicAttrRat" disabled="true" value="((@{PsychicLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -2714,12 +2714,12 @@
 							<select class="sheet-width-W95 sheet-dropdown" name="attr_WpnSkillLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 								<option value="(0)">None</option>
 								<option value="(@{STRAdj})">Strength</option>
-								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{TGHAdj})">Toughness</option>
-								<option value="(@{INTAdj})">Intellect</option>
-								<option value="(@{WILLAdj})">Willpower</option>
-								<option value="(@{FELAdj})">Fellowship</option>
+								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{INITAdj})" selected="true" >Initiative</option>
+								<option value="(@{WILLAdj})">Willpower</option>
+								<option value="(@{INTAdj})">Intellect</option>
+								<option value="(@{FELAdj})">Fellowship</option>
 							</select>
 						</td>	
 						<td class="sheet-center"><span class="sheet-circle"><input type="number"  type="number" name="attr_WpnSkillAttrRat" disabled="true" value="((@{WpnSkillLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -2749,12 +2749,12 @@
 							<select class="sheet-width-W95 sheet-dropdown" name="attr_repSkillLinkedAttr" value="0"  title="Select the attribute associated with the skill.">
 								<option value="(0)" selected="true" >None</option>
 								<option value="(@{STRAdj})">Strength</option>
-								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{TGHAdj})">Toughness</option>
-								<option value="(@{INTAdj})">Intellect</option>
-								<option value="(@{WILLAdj})">Willpower</option>
-								<option value="(@{FELAdj})">Fellowship</option>
+								<option value="(@{AGLAdj})">Agility</option>
 								<option value="(@{INITAdj})">Initiative</option>
+								<option value="(@{WILLAdj})">Willpower</option>
+								<option value="(@{INTAdj})">Intellect</option>
+								<option value="(@{FELAdj})">Fellowship</option>
 							</select>
 						</td>	
 						<td class="sheet-width-W10 sheet-center"><span class="sheet-circle"><input type="number" name="attr_repSkillAttrRat" disabled="true" value="((@{repSkillLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td> 
@@ -2933,12 +2933,12 @@
 									<select class="sheet-verylargedropdown sheet-smaller-text" name="attr_psyPowerTestLinkedAttr" value="0"  title="Select the attribute associated with the power; default is WLP - Willpower.">
 										<option value="(0)" selected="true">None</option>
 										<option value="(@{STRAdj})">Strength</option>
-										<option value="(@{AGLAdj})">Agility</option>
 										<option value="(@{TGHAdj})">Toughness</option>
-										<option value="(@{INTAdj})">Intelligence</option>
-										<option value="(@{WILLAdj})" selected="true" >Willpower</option>
-										<option value="(@{FELAdj})">Fellowship</option>
+										<option value="(@{AGLAdj})">Agility</option>
 										<option value="(@{INITAdj})">Initiative</option>
+										<option value="(@{WILLAdj})" selected="true" >Willpower</option>
+										<option value="(@{INTAdj})">Intelligence</option>
+										<option value="(@{FELAdj})">Fellowship</option>
 									</select>
 								</td>	
 								<td class="sheet-width-W3 sheet-left"><span class="sheet-circle"><input type="number"  type="number" name="attr_psyPowerTestAttrRat" disabled="true" value="((@{psyPowerTestLinkedAttr}))"  title="Attribute adjusted rating to be added to the skill rating."/></span></td>