diff --git a/Naruto d20 Modern/Naruto d20 Modern.css b/Naruto d20 Modern/Naruto d20 Modern.css
index 186754f7e8..d0527c280b 100644
--- a/Naruto d20 Modern/Naruto d20 Modern.css	
+++ b/Naruto d20 Modern/Naruto d20 Modern.css	
@@ -168,11 +168,13 @@ div.sheet-core-content {
     background:#000;
     color:white;
     font-size:9px;
+	text-align: center;
 }
 
 .sheet-tableIII th {
     background:#000;
     color:white;
+	
 }
 .sheet-tableIII {
     background:transparent;
@@ -184,6 +186,15 @@ div.sheet-core-content {
     background:#000;
     color:white;
     font-size:9px;
+	text-align:center;
+}
+
+.sheet-tableIII th.sheet-headingLanguages {
+    background:#000;
+    color:white;
+    font-size:9px;
+	text-align:left;
+	width:100px;
 }
 
 .sheet-text {
@@ -273,6 +284,17 @@ input.sheet-title[type="text"]:focus {
   -webkit-appearance: none; 
   margin: 0; 
 }
+
+.sheet-numberLanguages[type="text"] {
+    background: transparent;
+    border:none;
+    border-radius:0px;
+    box-shadow:none;
+    text-align:left;
+    border-bottom:1px solid #000;
+    width:100px;
+}
+
 .sheet-number[type="text"] {
     background: transparent;
     border:none;
@@ -940,6 +962,23 @@ input.sheet-bigcheck[type="Checkbox"]:checked + span::before
 .sheet-rolltemplate-attack .inlinerollresult.importantroll {
     border: none;
 }
+
+        /*=== show ===*/
+.sheet-rolltemplate-tap table {
+    width: 100%;
+    border-radius:15px 15px 15px 15px;
+    color: #7F2108;
+    font-size: 1em;
+    font-variant: small-caps;
+    box-shadow: none;
+    background: #F3F8F6;
+    box-shadow: 0px 0px 2px #7F2108, 0px 0px 2px #7F2108, 0px 0px 2px #7F2108;
+}
+
+.sheet-rolltemplate-tap td {
+    padding: 5px;
+}
+
         /*=== show ===*/
 .sheet-rolltemplate-tx table {
     width: 100%;
diff --git a/Naruto d20 Modern/Naruto d20 Modern.html b/Naruto d20 Modern/Naruto d20 Modern.html
index 9a8e841003..abc8a6fa73 100644
--- a/Naruto d20 Modern/Naruto d20 Modern.html	
+++ b/Naruto d20 Modern/Naruto d20 Modern.html	
@@ -179,7 +179,7 @@
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Strength" value="/e rolls Strength [[1d20+@{Strength-mod}]]">STR<br>Strength</button></th>
                     <th><input type="number" class="sheet-ability" name="attr_Strength" value="@{Strength-Base}+@{Strength-Equipment}+@{Strength-Other}" disabled="true"/></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Strength-mod" value="[[floor((@{Strength}-10)/2)]]" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Strength-mod" title="@{Strength-mod}" value="[[floor((@{Strength}-10)/2)]]" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Strength-Base" value="10"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Strength-Equipment" value="0"/></d>
                     <td><input type="number" class="sheet-number" name="attr_Strength-Other" value="0"/></td>
@@ -187,7 +187,7 @@
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Dexterity" value="/e rolls Dexterity [[1d20+@{Dexterity-mod}]]">DEX<br>Dexterity</button></th>
                     <th><input type="number" class="sheet-ability" name="attr_Dexterity" value="@{Dexterity-Base}+@{Dexterity-Equipment}+@{Dexterity-Other}" disabled="true"/></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Dexterity-mod" value="[[floor((@{Dexterity}-10)/2)]]" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Dexterity-mod" title="@{Dexterity-mod}" value="[[floor((@{Dexterity}-10)/2)]]" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Dexterity-Base" value="10"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Dexterity-Equipment" value="0"/></d>
                     <td><input type="number" class="sheet-number" name="attr_Dexterity-Other" value="0"/></td>
@@ -195,7 +195,7 @@
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Constitution" value="/e rolls Constitution [[1d20+@{Constitution-mod}]]">CON<br>Constitution</button></th>
                     <th><input type="number" class="sheet-ability" name="attr_Constitution" value="@{Constitution-Base}+@{Constitution-Equipment}+@{Constitution-Other}" disabled="true"/></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Constitution-mod" value="[[floor((@{Constitution}-10)/2)]]" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Constitution-mod" title="@{Constitution-mod}" value="[[floor((@{Constitution}-10)/2)]]" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Constitution-Base" value="10"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Constitution-Equipment" value="0"/></d>
                     <td><input type="number" class="sheet-number" name="attr_Constitution-Other" value="0"/></td>
@@ -203,7 +203,7 @@
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Intelligence" value="/e rolls Intelligence [[1d20+@{Intelligence-mod}]]">INT<br>Intelligence</button></th>
                     <th><input type="number" class="sheet-ability" name="attr_Intelligence" value="@{Intelligence-Base}+@{Intelligence-Equipment}+@{Intelligence-Other}" disabled="true"/></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Intelligence-mod" value="[[floor((@{Intelligence}-10)/2)]]" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Intelligence-mod" title="@{Intelligence-mod}" value="[[floor((@{Intelligence}-10)/2)]]" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Intelligence-Base" value="10"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Intelligence-Equipment" value="0"/></d>
                     <td><input type="number" class="sheet-number" name="attr_Intelligence-Other" value="0"/></td>
@@ -211,7 +211,7 @@
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Wisdom" value="/e rolls Wisdom [[1d20+@{Wisdom-mod}]]">WIS<br>Wisdom</button></th>
                     <th><input type="number" class="sheet-ability" name="attr_Wisdom" value="@{Wisdom-Base}+@{Wisdom-Equipment}+@{Wisdom-Other}" disabled="true"/></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Wisdom-mod" value="[[floor((@{Wisdom}-10)/2)]]" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Wisdom-mod" title="@{Wisdom-mod}" value="[[floor((@{Wisdom}-10)/2)]]" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Wisdom-Base" value="10"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Wisdom-Equipment" value="0"/></d>
                     <td><input type="number" class="sheet-number" name="attr_Wisdom-Other" value="0"/></td>
@@ -219,7 +219,7 @@
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Charisma" value="/e rolls Charisma [[1d20+@{Charisma-mod}]]">CHA<br>Charisma</button></th>
                     <th><input type="number" class="sheet-ability" name="attr_Charisma" value="@{Charisma-Base}+@{Charisma-Equipment}+@{Charisma-Other}" disabled="true"/></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Charisma-mod" value="[[floor((@{Charisma}-10)/2)]]" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Charisma-mod" title="@{Charisma-mod}" value="[[floor((@{Charisma}-10)/2)]]" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Charisma-Base" value="10"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Charisma-Equipment" value="0"/></d>
                     <td><input type="number" class="sheet-number" name="attr_Charisma-Other" value="0"/></td>
@@ -358,19 +358,21 @@
             
             <br>
             <h4>Languages</h4>
-                <table class="sheet-tableIII" style="width:300px">
+                <table class="sheet-tableIII">
                         <tr>
-                            <th class="sheet-heading">Name</th>
-                            <th class="sheet-heading">Read/Write</th>
-                            <th class="sheet-heading">Speak</th>
+                            <th class="sheet-headingLanguages">Name</th>
+                            <th class="sheet-headingLanguages">Read/Write</th>
+                            <th class="sheet-headingLanguages">Speak</th>
+							<th class="sheet-headingLanguages">Sign</th>
                         </tr>
                 </table>
             <fieldset class="repeating_languages">
-                <table class="sheet-tableIII" style="width:300px">
+                <table class="sheet-tableIII">
                     <tr>
-                        <td><input type="text" class="sheet-number" name="attr_Language" value="" /></td>
-                        <td><input type="text" class="sheet-number" name="attr_Language-RW" value="" /></td>
-                        <td><input type="text" class="sheet-number" name="attr_Speak" value=""/></td>
+                        <td><input type="text" class="sheet-numberLanguages" name="attr_Language" value="" /></td>
+                        <td><input type="text" class="sheet-numberLanguages" name="attr_Language-RW" value="" /></td>
+                        <td><input type="text" class="sheet-numberLanguages" name="attr_Speak" value=""/></td>
+						<td><input type="text" class="sheet-numberLanguages" name="attr_Sign" value=""/></td>
                     </tr>
                 </table>
             </fieldset>
@@ -1890,6 +1892,77 @@
                 </tr>
             </table>
             <br>
+			
+			<table class="sheet-tableII" style="width:100%">	
+				<tr>
+					<th>
+					</th>
+					<td>
+					    <th>Tap Total</th>
+					</td>
+					<td>
+					    <th>Tap CC</th>
+					</td>
+					<td>
+					    <th>Tap Misc</th>
+					</td>
+				</tr>
+				<tr>
+					<th>
+						<button type="roll" class="sheet-skillbtn" name="roll_TapReserves" title="roll_TapReserves" value="&{template:tap} {{character= @{character_name}}} {{TapDC= [[@{TapDC}]]}} {{Tap_Reserves_Total= [[1d20+@{Tap_Reserves_Total}]]}}">Tap Reserves</button>
+					</th>
+					<td>
+					    <th><input type="number" class="sheet-ability" name="attr_Tap_Reserves_Total" title="@{Tap_Reserves_Total}" value="[[@{Chakra_Control}]]+[[@{TapReserveMisc}]]" disabled="true" /></th>
+					</td>
+					<td>
+					    <th><input type="number" class="sheet-ability" name="attr_TapReserveRanks" title="@{Chakra_Control}" value="@{Chakra_Control}" disabled="true"/></th>
+					</td>
+					<td>
+					    <th><input type="number" class="sheet-ability" name="attr_TapReserveMisc" title="@{TapReserveMisc}" value="0" /></th>
+					</td>
+				</tr>
+			</table>
+			
+			<br>
+			
+			<table class="sheet-tableII" style="width:100%">	
+				<tr>
+					<td>
+						<th>Tap DC <br> Total</th>
+					</td>
+					<td>
+					    <th>Base <br> DC</th>
+					</td>
+					<td>
+					    <th>Chakra <br> Tapped</th>
+					</td>					
+					<td>
+						<th>Hand Seal?</th>
+                    </td>
+				</tr>
+				<tr>
+					<td>
+					    <th><input type="number" class="sheet-ability" name="attr_TapDC" title="@{TapDC}" value="@{BaseTapDC}+@{ChakraTapped}" disabled="true"/></th>
+					</td>
+					<td>
+					    <th><input type="number" class="sheet-ability" name="attr_BaseTapDC" title="@{BaseTapDC}" value="10+(@{TapSeal})" disabled="true" /></th>
+					</td>
+					<td>
+					    <th><input type="number" class="sheet-ability" name="attr_ChakraTapped" title="How much Chakra you're trying to tap" value="0"/></th>
+					</td>
+					<td>
+						<th>
+						<select name="attr_TapSeal" title="@{TapSeal}" style="width:135px">
+                            <option value="0" selected>No Hand Seal(0)</option>
+                            <option value="-2">Half Seal(-2)</option>
+                            <option value="-5">Hand Seal(-5)</option>                            
+                        </select>
+						</th>
+					</td>
+				</tr>
+			</table>
+			
+			<br>
             <h4>Defenses</h4>
             <table class="sheet-tableII">
                 <tr>
@@ -2109,6 +2182,24 @@
                         </tr>
                     </table>
                 </div>
+            </fieldset>
+			<h4>Occupation Feats</h4>
+            <fieldset class="repeating_OccupationFeats">
+                <table class="sheet-table">
+                    <tr>
+                        <td><button type="roll" class="sheet-btn" name="roll_Feat-show" value="&{template:show}{{character= @{character_name}}}  {{title= @{OFeat-name}}}{{details= @{OFeat-details}}}" style="width:60px;">Show</button></td>
+                        <td><input type="text" class="sheet-number" name="attr_OFeat-name" placeholder="Feat Name" style="width:200px"/></td>
+                        <th><input type="checkbox" class="sheet-bigcheck" name="attr_OFeat-show" value="1"/><span></span></th>
+                    </tr>
+                </table>
+                <input type="checkbox" class="sheet-hidden sheet-hider" name="attr_OFeat-show" value="1"/><span></span>
+                <div class="sheet-hold">
+                    <table class="sheet-table" style="width:100%;">
+                        <tr>
+                            <td><textarea class="sheet-notes" name="attr_OFeat-details" wrap="soft" placeholder="Feat Details"></textarea></td>
+                        </tr>
+                    </table>
+                </div>
             </fieldset>
             <h4>Free Feats</h4>
             <fieldset class="repeating_FreeFeats">
@@ -2242,6 +2333,10 @@
         </div>
     
 </div>
+
+
+
+
 <!-- Tab 5 Techniques -->
 <div class="sheet-section-5">
     <h4>General Info</h4>
@@ -2406,11 +2501,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_cc-TX-Range-Opt" title="@{cc-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}'>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{cc-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{cc-TX-Range} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*((round(2/@{cc-Character_Level}) + @{cc-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*((round(2/@{cc-Character_Level}) + @{cc-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*((round(2/@{cc-Character_Level}) + @{cc-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_cc-TX-Range" title="@{cc-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -2419,13 +2516,29 @@
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include6" value="" checked/><span></span></th>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include6" value="{{Effect= @{cc-TX-Effect}}}" /><span></span></th>
                             <th class="sheet-heading">Effect</th>
-                            <td><input type="text" class="sheet-number" name="attr_cc-TX-Effect" style="width:200px"/></td>
+							<td><input type="text" class="sheet-number" name="attr_cc-TX-Effect" style="width:200px"/></td>
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include7" value="{{Area= @{cc-TX-Area}}}" /><span></span></th>
-                            <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_cc-TX-Area" style="width:200px"/></td>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include7" value="{{Area= @{cc-TX-Area-Opt}}}" /><span></span></th>
+                            <th class="sheet-heading">Area</th>                            
+							<td>
+                                <select class="sheet-number" name="attr_cc-TX-Area-Opt" title="@{cc-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Area}'>User Defined</option>
+									<option value="[[@{cc-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{cc-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{cc-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{cc-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{cc-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{cc-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{cc-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{cc-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{cc-TX-Area} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{cc-TX-Area} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_cc-TX-Area" style="width:150px"/>
+							</td>
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include8" value="" checked/><span></span></th>
@@ -2555,11 +2668,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_cc-TX-Range-Opt" title="@{cc-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{cc-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{cc-TX-Range} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{cc-Character_Level}) + @{cc-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{cc-Character_Level}) + @{cc-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{cc-Character_Level}) + @{cc-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_cc-TX-Range" title="@{cc-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -2572,10 +2687,26 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include7" value="{{Area= @{cc-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include7" value="{{Area= @{cc-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_cc-TX-Area" style="width:200px"/></td>
-                        </tr>
+							<td>
+                                <select class="sheet-number" name="attr_cc-TX-Area-Opt" title="@{cc-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Area}'>User Defined</option>
+									<option value="[[@{cc-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{cc-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{cc-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{cc-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{cc-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{cc-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{cc-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{cc-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{cc-TX-Area} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{cc-TX-Area} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_cc-TX-Area" style="width:150px"/>
+							</td>                        
+						</tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include8" value="" checked/><span></span></th>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_cc-TX-include8" value="{{Duration= @{cc-TX-Duration-Opt}}}" /><span></span></th>
@@ -2793,11 +2924,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_fu-TX-Range-Opt" title="@{fu-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{fu-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{fu-TX-Range} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{fu-Character_Level}) + @{fu-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{fu-Character_Level}) + @{fu-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{fu-Character_Level}) + @{fu-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_fu-TX-Range" title="@{fu-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -2810,9 +2943,25 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include7" value="{{Area= @{fu-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include7" value="{{Area= @{fu-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_fu-TX-Area" style="width:200px"/></td>
+                            <td>
+                                <select class="sheet-number" name="attr_fu-TX-Area-Opt" title="@{fu-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{fu-TX-Area}'>User Defined</option>
+									<option value="[[@{fu-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{fu-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{fu-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{fu-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{fu-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{fu-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{fu-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{fu-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{fu-TX-Area} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{fu-TX-Area} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_fu-TX-Area" style="width:150px"/>
+							</td>
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include8" value="" checked/><span></span></th>
@@ -2942,11 +3091,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_fu-TX-Range-Opt" title="@{fu-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{fu-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{fu-TX-Range} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{fu-Character_Level}) + @{fu-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{fu-Character_Level}) + @{fu-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{fu-Character_Level}) + @{fu-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_fu-TX-Range" title="@{fu-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -2959,9 +3110,25 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include7" value="{{Area= @{fu-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include7" value="{{Area= @{fu-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_fu-TX-Area" style="width:200px"/></td>
+                            <td>
+                                <select class="sheet-number" name="attr_fu-TX-Area-Opt" title="@{fu-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{fu-TX-Area}'>User Defined</option>
+									<option value="[[@{fu-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{fu-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{fu-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{fu-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{fu-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{fu-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{fu-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{fu-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{fu-TX-Area} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{fu-TX-Area} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_fu-TX-Area" style="width:150px"/>
+							</td>
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_fu-TX-include8" value="" checked/><span></span></th>
@@ -3180,11 +3347,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_ge-TX-Range-Opt" title="@{ge-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{ge-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ge-TX-Range} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{ge-Character_Level}) + @{ge-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{ge-Character_Level}) + @{ge-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{ge-Character_Level}) + @{ge-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ge-TX-Range" title="@{ge-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -3197,9 +3366,25 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include7" value="{{Area= @{ge-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include7" value="{{Area= @{ge-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_ge-TX-Area" style="width:200px"/></td>
+							<td>
+                                <select class="sheet-number" name="attr_ge-TX-Area-Opt" title="@{ge-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{ge-TX-Area}'>User Defined</option>
+									<option value="[[@{ge-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{ge-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{ge-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{ge-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{ge-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{ge-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{ge-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{ge-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{ge-TX-Area} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{ge-TX-Area} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_ge-TX-Area" style="width:150px"/>
+							</td>                            
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include8" value="" checked/><span></span></th>
@@ -3329,11 +3514,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_ge-TX-Range-Opt" title="@{ge-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{ge-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ge-TX-Range} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{ge-Character_Level}) + @{ge-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{ge-Character_Level}) + @{ge-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{ge-Character_Level}) + @{ge-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ge-TX-Range" title="@{ge-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -3348,8 +3535,24 @@
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include7" value="" checked/><span></span></th>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include7" value="{{Area= @{ge-TX-Area}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_ge-TX-Area" style="width:200px"/></td>
-                        </tr>
+							<td>
+                                <select class="sheet-number" name="attr_ge-TX-Area-Opt" title="@{ge-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{ge-TX-Area}'>User Defined</option>
+									<option value="[[@{ge-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{ge-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{ge-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{ge-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{ge-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{ge-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{ge-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{ge-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{ge-TX-Area} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{ge-TX-Area} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_ge-TX-Area" style="width:150px"/>
+							</td>                            
+						</tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include8" value="" checked/><span></span></th>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ge-TX-include8" value="{{Duration= @{ge-TX-Duration-Opt}}}" /><span></span></th>
@@ -3567,11 +3770,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_ni-TX-Ranni-Opt" title="@{ni-TX-Ranni-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{ni-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ni-TX-Range} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{ni-Character_Level}) + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{ni-Character_Level}) + @{ni-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{ni-Character_Level}) + @{ni-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ni-TX-Range" title="@{ni-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -3584,9 +3789,25 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include7" value="{{Area= @{ni-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include7" value="{{Area= @{ni-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_ni-TX-Area" style="width:200px"/></td>
+                            <td>
+                                <select class="sheet-number" name="attr_ni-TX-Area-Opt" title="@{ni-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{ni-TX-Area}'>User Defined</option>
+									<option value="[[@{ni-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{ni-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{ni-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{ni-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{ni-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{ni-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{ni-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{ni-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{ni-TX-Area} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{ni-TX-Area} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_ni-TX-Area" style="width:150px"/>
+							</td>                            
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include8" value="" checked/><span></span></th>
@@ -3716,11 +3937,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_ni-TX-Ranni-Opt" title="@{ni-TX-Ranni-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{ni-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ni-TX-Range} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{ni-Character_Level}) + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{ni-Character_Level}) + @{ni-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{ni-Character_Level}) + @{ni-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ni-TX-Range" title="@{ni-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -3733,10 +3956,26 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include7" value="{{Area= @{ni-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include7" value="{{Area= @{ni-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_ni-TX-Area" style="width:200px"/></td>
-                        </tr>
+							<td>
+                                <select class="sheet-number" name="attr_ni-TX-Area-Opt" title="@{ni-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{ni-TX-Area}'>User Defined</option>
+									<option value="[[@{ni-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{ni-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{ni-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{ni-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{ni-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{ni-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{ni-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{ni-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{ni-TX-Area} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{ni-TX-Area} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_ni-TX-Area" style="width:150px"/>
+							</td>                            
+							</tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include8" value="" checked/><span></span></th>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include8" value="{{Duration= @{ni-TX-Duration-Opt}}}" /><span></span></th>
@@ -3955,11 +4194,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_ta-TX-Ranta-Opt" title="@{ta-TX-Ranta-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{ta-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ta-TX-Range} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{ta-Character_Level}) + @{ta-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{ta-Character_Level}) + @{ta-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{ta-Character_Level}) + @{ta-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ta-TX-Range" title="@{ta-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -3972,10 +4213,26 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include7" value="{{Area= @{ta-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include7" value="{{Area= @{ta-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_ta-TX-Area" style="width:200px"/></td>
-                        </tr>
+							<td>
+                                <select class="sheet-number" name="attr_ta-TX-Area-Opt" title="@{ta-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{ta-TX-Area}'>User Defined</option>
+									<option value="[[@{ta-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{ta-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{ta-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{ta-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{ta-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{ta-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{ta-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{ta-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{ta-TX-Area} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{ta-TX-Area} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_ta-TX-Area" style="width:150px"/>
+							</td>
+							</tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include8" value="" checked/><span></span></th>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include8" value="{{Duration= @{ta-TX-Duration-Opt}}}" /><span></span></th>
@@ -4104,11 +4361,13 @@
                             <td>
                                 <select class="sheet-number" name="attr_ta-TX-Ranta-Opt" title="@{ta-TX-Ranta-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='@{cc-TX-Range}' selected>User Defined</option>
+									<option value="Personal">Personal</option>
 									<option value='[[@{ta-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ta-TX-Range} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
-                                    <option value='[[10 + (5*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Close</option>
-                                    <option value='[[20 + (10*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Medium</option>
-                                    <option value='[[30 + (15*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Long</option>
+                                    <option value='[[10 + (5*(round(2/@{ta-Character_Level}) + @{ta-TX-masLevel}) ) ) ]] ft.'>Close</option>
+                                    <option value='[[20 + (10*(round(2/@{ta-Character_Level}) + @{ta-TX-masLevel}) ) ) ]] ft.'>Medium</option>
+                                    <option value='[[30 + (15*(round(2/@{ta-Character_Level}) + @{ta-TX-masLevel}) ) ) ]] ft.'>Long</option>
                                 </select>
                                 <input type="text" class="sheet-number" name="attr_ta-TX-Range" title="@{ta-TX-Range}" value="" style="width:150px"/>
                             </td>
@@ -4121,10 +4380,26 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include7" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include7" value="{{Area= @{ta-TX-Area}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include7" value="{{Area= @{ta-TX-Area-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Area</th>
-                            <td><input type="text" class="sheet-number" name="attr_ta-TX-Area" style="width:200px"/></td>
-                        </tr>
+							<td>
+                                <select class="sheet-number" name="attr_ta-TX-Area-Opt" title="@{ta-TX-Area-Opt}" style="width:50px">
+                                    <option value="N/A" selected>N/A</option>
+									<option value='@{ta-TX-Area}'>User Defined</option>
+									<option value="[[@{ta-TX-Area}]] ft. Burst">Burst</option>
+									<option value="[[@{ta-TX-Area}]] ft. Burst centered on user">Burst Centered</option>
+									<option value="[[@{ta-TX-Area}]] ft. Cone">Cone</option>
+									<option value="[[@{ta-TX-Area}]] ft. Emanation">Emanation</option>
+									<option value="[[@{ta-TX-Area}]] ft. Radius Sphere">Radius Sphere</option>
+									<option value="[[@{ta-TX-Area}]] ft. Sphere">Sphere</option>
+									<option value='[[@{ta-TX-Area}]] ft. Spread'>Spread</option>
+									<option value='[[@{ta-TX-Area}]] ft.'>Feet</option>
+                                    <option value='[[@{ta-TX-Area} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
+									<option value='[[@{ta-TX-Area} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft. cube'>Cube/Lvl</option>
+                                </select>
+								<input type="text" class="sheet-number" name="attr_ta-TX-Area" style="width:150px"/>
+							</td>
+							</tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include8" value="" checked/><span></span></th>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ta-TX-include8" value="{{Duration= @{ta-TX-Duration-Opt}}}" /><span></span></th>
@@ -4515,6 +4790,9 @@
         </div>
     </div>    
 <br>
+
+
+
 <!-- rolltemplates -->
 <rolltemplate class="sheet-rolltemplate-show">
     <table>
@@ -4526,6 +4804,23 @@
         </tr>
 </rolltemplate>
 
+<rolltemplate class="sheet-rolltemplate-tap">
+    <table>
+        <tr>
+            <td class="sheet-detail" colspan="2"><i><b>{{character}}</b> tap's their Chakra Reserves </i></td>    
+        </tr>
+		
+        <tr>
+			<td>Tap DC</td>
+            <td><i>{{TapDC}}</i></td>
+        </tr>
+		
+		<tr>
+			<td>Tap Reserves Roll</td>
+            <td><i>{{Tap_Reserves_Total}}</i></td>
+        </tr>
+</rolltemplate>
+
 <rolltemplate class="sheet-rolltemplate-attack">
     <table>
         <tr>