diff --git a/Naruto d20 Modern/Naruto d20 Modern.html b/Naruto d20 Modern/Naruto d20 Modern.html
index ba9035a70d..8f8ffcb621 100644
--- a/Naruto d20 Modern/Naruto d20 Modern.html	
+++ b/Naruto d20 Modern/Naruto d20 Modern.html	
@@ -13,10 +13,12 @@
                     <tr>
                         <td><input type="text" class="sheet-text" name="attr_Starting_Occupation" style="width:100%"/></td>
                         <th><input type="number" class="sheet-text" name="attr_Character_Level" value="@{Class1-level}+@{Class2-level}+@{Class3-level}+@{Class4-level}+@{Class5-level}+@{Class6-level}" style="width:50px" disabled='true'/></th>
+                        <td><input type="text" class="sheet-text" name="attr_Challenge_Rating" style="width:100%"/></td>
                     </tr>
                     <tr>
                         <th>Starting Occupation</th>
                         <th>Character Level</th>
+                        <th>Challenge Rating</th>
                     </tr>
                 </table>
                 <div class="sheet-tooltipsdown"><h4>Class</h4>
@@ -1836,17 +1838,19 @@
                     <td><input type="number" class="sheet-number" name="attr_Defense-Size_Touch" value="0"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Defense-Misc_Touch" value="0"/></td>
             </table>
+            <br>
             <h4>Chakra Resistances</h4>
                 <fieldset class="repeating_resistances">    
                     <table class="sheet-tableII">
                         <tr>
+                            <th class="sheet-heading"/>Type</th>
                             <th class="sheet-heading"/>Total</th>
-                            <th class="sheet-heading"/></th>
                             <th class="sheet-heading"/>Base</th>
                             <th class="sheet-heading"/>Class</th>
                             <th class="sheet-heading"/>Other</th>
                         </tr>
                         <tr>
+                            <td><input type="text" class="sheet-number" name="attr_Type" value=""/></td>
                             <td><input type="number" class="sheet-number" name="attr_Resistance" value="[[@{Resistance-base}+@{Resistance-class}+@{Resistance-other}]]" disabled='true'/></td>
                             <td><input type="number" class="sheet-number" name="attr_Resistance-base" value="0"/></td>
                             <td><input type="number" class="sheet-number" name="attr_Resistance-class" value="0"/></td>
@@ -2068,7 +2072,47 @@
 </div>
 <!-- Tab 4 Equipment -->
 <div class="sheet-section-4">
-    <div class='sheet-3colrow'>
+    <h4>Carry Weight</h4>
+        <table class="sheet-tableII">
+            <tr>
+                <th class="sheet-heading">Light<br>Load</th>
+                <th class="sheet-heading">Medium<br>Load</th>
+                <th class="sheet-heading">Heavy<br>Load</th>
+                <th class="sheet-heading">Lift Over<br>Head</th>
+                <th class="sheet-heading">Lift Off<br>Ground</th>
+                <th class="sheet-heading">Push or<br>Drag</th>
+            </tr>
+            <tr>
+                <td><input type="number" class="sheet-number" name="attr_Light_Load" value="0" /></td>
+                <td><input type="number" class="sheet-number" name="attr_Medium_Load" value="0" /></td>
+                <td><input type="number" class="sheet-number" name="attr_Heavy_Load" value="0" /></td>
+                <td><input type="number" class="sheet-number" name="attr_Lift_Over_Head" value="0" /></td>
+                <td><input type="number" class="sheet-number" name="attr_Lift_Off_Ground" value="0" /></td>
+                <td><input type="number" class="sheet-number" name="attr_Push_or_Drag" value="0" /></td>
+            </tr>
+        </table>
+    <br>
+    <h4>Temporary Carry Weight</h4>
+        <table class="sheet-tableII">
+        <tr>
+            <th class="sheet-heading">Light<br>Load</th>
+            <th class="sheet-heading">Medium<br>Load</th>
+            <th class="sheet-heading">Heavy<br>Load</th>
+            <th class="sheet-heading">Lift Over<br>Head</th>
+            <th class="sheet-heading">Lift Off<br>Ground</th>
+            <th class="sheet-heading">Push or<br>Drag</th>
+        </tr>
+        <tr>
+            <td><input type="number" class="sheet-number" name="attr_Light_Load" value="0" /></td>
+            <td><input type="number" class="sheet-number" name="attr_Medium_Load" value="0" /></td>
+            <td><input type="number" class="sheet-number" name="attr_Heavy_Load" value="0" /></td>
+            <td><input type="number" class="sheet-number" name="attr_Lift_Over_Head" value="0" /></td>
+            <td><input type="number" class="sheet-number" name="attr_Lift_Off_Ground" value="0" /></td>
+            <td><input type="number" class="sheet-number" name="attr_Push_or_Drag" value="0" /></td>
+        </tr>
+    </table>
+    <br>
+    <div class='sheet-2colrow'>
         <div class='sheet-col'>
             <h4>Equipment Worn</h4>
             <div class="sheet-border">
@@ -2087,16 +2131,17 @@
                 </fieldset>
             </div>
         </div>
-        <div class='sheet-col'>
+    </div>
+        <div class='sheet'>
             <h4>Notes</h4>
-            <div class="sheet-border">
-                <textarea wrap="soft" class="sheet-longnotes" name="attr_Notes" style="width:96%;"/></textarea>
+            <div class="sheet">
+                <textarea wrap="soft" class="sheet-longnotes" name="attr_Notes" text-align: center style="width:96%%;"/></textarea>
                 <fieldset class="repeating_notes">
-                    <textarea wrap="soft" class="sheet-longnotes" name="attr_Notes-r" style="width:96%;"/></textarea>
+                <textarea wrap="soft" class="sheet-longnotes" name="attr_Notes" text-align: center style="width:96%%;"/></textarea>                
                 </fieldset>
             </div>
         </div>
-    </div>
+    
 </div>
 <!-- Tab 5 Techniques -->
 <div class="sheet-section-5">
@@ -2117,8 +2162,6 @@
             <td><input type="number" class="sheet-number" name="attr_ChakraPool-current" value="@{ChakraPool}" disabled='true' /></td>
         </tr>
     </table>
-    
-
     <br>
     <h4>Chakra Control</h4>
     <table class="sheet-tableII">
@@ -2155,7 +2198,6 @@
             <th class="sheet-heading">Ranks</th>
             <th class="sheet-heading">Blood</th>
             <th class="sheet-heading">Occu</th>
-			<th class="sheet-heading">Talents</th>
             <th class="sheet-heading">Feats</th>
             <th class="sheet-heading">Synergy</th>
             <th class="sheet-heading">Items</th>
@@ -2163,7 +2205,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_ID_Chakra_Control" value="/e rolls Chakra Control ID [[1d20+@{ID_Chakra_Control}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Chakra_Control" value="[[@{ID_Chakra_Control-ability}+@{ID_Chakra_Control-Ranks}+@{ID_Chakra_Control-Blood}+@{ID_Chakra_Control-Occu}+@{ID_Chakra_Control-Talents}+@{ID_Chakra_Control-Feats}+@{ID_Chakra_Control-Synergy}+@{ID_Chakra_Control-Items}+@{ID_Chakra_Control-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Chakra_Control" value="[[@{ID_Chakra_Control-ability}+@{ID_Chakra_Control-Ranks}+@{ID_Chakra_Control-Blood}+@{ID_Chakra_Control-Occu}+@{ID_Chakra_Control-Feats}+@{ID_Chakra_Control-Synergy}+@{ID_Chakra_Control-Items}+@{ID_Chakra_Control-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Chakra_Control-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2177,7 +2219,6 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Ranks" value="@{Chakra_Control-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Chakra_Control-Items" value="0"/></td>
@@ -2185,7 +2226,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Chakra_Control" value="/e rolls Chakra Control Learn [[1d20+@{Learn_Chakra_Control}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Chakra_Control" value="[[@{Learn_Chakra_Control-ability}+@{Learn_Chakra_Control-Level}+@{Learn_Chakra_Control-Blood}+@{Learn_Chakra_Control-Occu}+@{Learn_Chakra_Control-Talents}+@{Learn_Chakra_Control-Feats}+@{Learn_Chakra_Control-Synergy}+@{Learn_Chakra_Control-Items}+@{Learn_Chakra_Control-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Chakra_Control" value="[[@{Learn_Chakra_Control-ability}+@{Learn_Chakra_Control-Ranks}+@{Learn_Chakra_Control-Blood}+@{Learn_Chakra_Control-Occu}+@{Learn_Chakra_Control-Feats}+@{Learn_Chakra_Control-Synergy}+@{Learn_Chakra_Control-Items}+@{Learn_Chakra_Control-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Chakra_Control-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2196,10 +2237,9 @@
                     <option value="@{Charisma-mod}">Cha</option>
                 </select>
             </td>
-            <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Level" value="@{Character_Level}" disabled='true'/></td>
+            <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Ranks" value="@{Chakra_Control-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Chakra_Control-Items" value="0"/></td>
@@ -2542,7 +2582,6 @@
             <th class="sheet-heading">Ranks</th>
             <th class="sheet-heading">Blood</th>
             <th class="sheet-heading">Occu</th>
-			<th class="sheet-heading">Talents</th>
             <th class="sheet-heading">Feats</th>
             <th class="sheet-heading">Synergy</th>
             <th class="sheet-heading">Items</th>
@@ -2550,7 +2589,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Fuinjutsu" value="/e rolls Fuinjutsu ID [[1d20+@{ID_Fuinjutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Fuinjutsu" value="[[@{ID_Fuinjutsu-ability}+@{ID_Fuinjutsu-Ranks}+@{ID_Fuinjutsu-Blood}+@{ID_Fuinjutsu-Occu}+@{ID_Fuinjutsu-Talents}+@{ID_Fuinjutsu-Feats}+@{ID_Fuinjutsu-Synergy}+@{ID_Fuinjutsu-Items}+@{ID_Fuinjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Fuinjutsu" value="[[@{ID_Fuinjutsu-ability}+@{ID_Fuinjutsu-Ranks}+@{ID_Fuinjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Fuinjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2564,15 +2603,14 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Ranks" value="@{Fuinjutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Synergy" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Syn" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Fuinjutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Fuinjutsu" value="/e rolls Fuinjutsu Learn [[1d20+@{Learn_Fuinjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Fuinjutsu" value="[[@{Learn_Fuinjutsu-ability}+@{Learn_Fuinjutsu-Level}+@{Learn_Fuinjutsu-Blood}+@{Learn_Fuinjutsu-Occu}+@{Learn_Fuinjutsu-Talents}+@{Learn_Fuinjutsu-Feats}+@{Learn_Fuinjutsu-Synergy}+@{Learn_Fuinjutsu-Items}+@{Learn_Fuinjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Fuinjutsu" value="[[@{Learn_Fuinjutsu-ability}+@{Learn_Fuinjutsu-Ranks}+@{Learn_Fuinjutsu-Blood}+@{Learn_Fuinjutsu-Occu}+@{Learn_Fuinjutsu-Feats}+@{Learn_Fuinjutsu-Synergy}+@{Learn_Fuinjutsu-Items}+@{Learn_Fuinjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Fuinjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2583,10 +2621,9 @@
                     <option value="@{Charisma-mod}">Cha</option>
                 </select>
             </td>
-            <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Level" value="@{Character_Level}" disabled='true'/></td>
+            <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Ranks" value="@{Fuinjutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Fuinjutsu-Items" value="0"/></td>
@@ -2931,7 +2968,6 @@
             <th class="sheet-heading">Ranks</th>
             <th class="sheet-heading">Blood</th>
             <th class="sheet-heading">Occu</th>
-			<th class="sheet-heading">Talents</th>
             <th class="sheet-heading">Feats</th>
             <th class="sheet-heading">Synergy</th>
             <th class="sheet-heading">Items</th>
@@ -2939,7 +2975,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Genjutsu" value="/e rolls Genjutsu ID [[1d20+@{ID_Genjutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Genjutsu" value="[[@{ID_Genjutsu-ability}+@{ID_Genjutsu-Ranks}+@{ID_Genjutsu-Blood}+@{ID_Genjutsu-Occu}+@{ID_Genjutsu-Talents}+@{ID_Genjutsu-Feats}+@{ID_Genjutsu-Synergy}+@{ID_Genjutsu-Items}+@{ID_Genjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Genjutsu" value="[[@{ID_Genjutsu-ability}+@{ID_Genjutsu-Ranks}+@{ID_Genjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Genjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2953,15 +2989,14 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Ranks" value="@{Genjutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Synergy" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Syn" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Genjutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Genjutsu" value="/e rolls Genjutsu Learn [[1d20+@{Learn_Genjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Genjutsu" value="[[@{Learn_Genjutsu-ability}+@{Learn_Genjutsu-Level}+@{Learn_Genjutsu-Blood}+@{Learn_Genjutsu-Occu}+@{Learn_Genjutsu-Talents}+@{Learn_Genjutsu-Feats}+@{Learn_Genjutsu-Synergy}+@{Learn_Genjutsu-Items}+@{Learn_Genjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Genjutsu" value="[[@{Learn_Genjutsu-ability}+@{Learn_Genjutsu-Ranks}+@{Learn_Genjutsu-Blood}+@{Learn_Genjutsu-Occu}+@{Learn_Genjutsu-Feats}+@{Learn_Genjutsu-Synergy}+@{Learn_Genjutsu-Items}+@{Learn_Genjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Genjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2972,10 +3007,9 @@
                     <option value="@{Charisma-mod}"selected>Cha</option>
                 </select>
             </td>
-            <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Level" value="@{Character_Level}" disabled='true'/></td>
+            <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Ranks" value="@{Genjutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Genjutsu-Items" value="0"/></td>
@@ -3319,7 +3353,6 @@
             <th class="sheet-heading">Ranks</th>
             <th class="sheet-heading">Blood</th>
             <th class="sheet-heading">Occu</th>
-			<th class="sheet-heading">Talents</th>
             <th class="sheet-heading">Feats</th>
             <th class="sheet-heading">Synergy</th>
             <th class="sheet-heading">Items</th>
@@ -3327,7 +3360,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Ninjutsu" value="/e rolls Ninjutsu ID [[1d20+@{ID_Ninjutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Ninjutsu" value="[[@{ID_Ninjutsu-ability}+@{ID_Ninjutsu-Ranks}+@{ID_Ninjutsu-Blood}+@{ID_Ninjutsu-Occu}+@{ID_Ninjutsu-Talents}+@{ID_Ninjutsu-Feats}+@{ID_Ninjutsu-Synergy}+@{ID_Ninjutsu-Items}+@{ID_Ninjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Ninjutsu" value="[[@{ID_Ninjutsu-ability}+@{ID_Ninjutsu-Ranks}+@{ID_Ninjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Ninjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -3341,15 +3374,14 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Ranks" value="@{Ninjutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Synergy" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Syn" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Ninjutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Ninjutsu" value="/e rolls Ninjutsu Learn [[1d20+@{Learn_Ninjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Ninjutsu" value="[[@{Learn_Ninjutsu-ability}+@{Learn_Ninjutsu-Level}+@{Learn_Ninjutsu-Blood}+@{Learn_Ninjutsu-Occu}+@{Learn_Ninjutsu-Talents}+@{Learn_Ninjutsu-Feats}+@{Learn_Ninjutsu-Synergy}+@{Learn_Ninjutsu-Items}+@{Learn_Ninjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Ninjutsu" value="[[@{Learn_Ninjutsu-ability}+@{Learn_Ninjutsu-Ranks}+@{Learn_Ninjutsu-Blood}+@{Learn_Ninjutsu-Occu}+@{Learn_Ninjutsu-Feats}+@{Learn_Ninjutsu-Synergy}+@{Learn_Ninjutsu-Items}+@{Learn_Ninjutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Ninjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -3360,10 +3392,9 @@
                     <option value="@{Charisma-mod}">Cha</option>
                 </select>
             </td>
-            <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Level" value="@{Character_Level}" disabled='true'/></td>
+            <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Ranks" value="@{Ninjutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Ninjutsu-Items" value="0"/></td>
@@ -3425,11 +3456,11 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Range-Opt}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Ranni-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Range</th>
                             <div name="attr_ni-TX-Range"></div>
                             <td>
-                                <select class="sheet-number" name="attr_ni-TX-Range-Opt" title="@{ni-TX-Range-Opt}" style="width:50px">
+                                <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='[[@{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>
@@ -3573,11 +3604,11 @@
                         </tr>
                         <tr>
                             <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="" checked/><span></span></th>
-                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Range-Opt}}}" /><span></span></th>
+                            <th class="sheet-heading"><input type="radio" class="sheet-bigcheck sheet-white" name="attr_ni-TX-include5" value="{{Range= @{ni-TX-Ranni-Opt}}}" /><span></span></th>
                             <th class="sheet-heading">Range</th>
                             <div name="attr_ni-TX-Range"></div>
                             <td>
-                                <select class="sheet-number" name="attr_TX-Range-Opt" title="@{ni-TX-Range-Opt}" style="width:50px">
+                                <select class="sheet-number" name="attr_TX-Ranni-Opt" title="@{ni-TX-Ranni-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</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>
@@ -3708,7 +3739,6 @@
             <th class="sheet-heading">Ranks</th>
             <th class="sheet-heading">Blood</th>
             <th class="sheet-heading">Occu</th>
-			<th class="sheet-heading">Talents</th>
             <th class="sheet-heading">Feats</th>
             <th class="sheet-heading">Synergy</th>
             <th class="sheet-heading">Items</th>
@@ -3716,7 +3746,7 @@
         </tr>
         <tr>                  
             <td><button type="roll" class="sheet-btn" name="roll_ID_Taijutsu" value="/e rolls Taijutsu ID [[1d20+@{ID_Taijutsu}]]" >ID</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_ID_Taijutsu" value="[[@{ID_Taijutsu-ability}+@{ID_Taijutsu-Ranks}+@{ID_Taijutsu-Blood}+@{ID_Taijutsu-Occu}+@{ID_Taijutsu-Talents}+@{ID_Taijutsu-Feats}+@{ID_Taijutsu-Synergy}+@{ID_Taijutsu-Items}+@{ID_Taijutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_ID_Taijutsu" value="[[@{ID_Taijutsu-ability}+@{ID_Taijutsu-Ranks}+@{ID_Taijutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_ID_Taijutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}"selected>Str</option>
@@ -3730,15 +3760,14 @@
             <td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Ranks" value="@{Taijutsu-Ranks}" disabled='true'/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Blood" value="0"/></td>
 		   	<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Talents" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Feats" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Synergy" value="0"/></td>
+			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Syn" value="0"/></td>
 			<td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Items" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_ID_Taijutsu-Misc" value="0" /></td>
         </tr>
 		<tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Taijutsu" value="/e rolls Taijutsu Learn [[1d20+@{Learn_Taijutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Taijutsu" value="[[@{Learn_Taijutsu-ability}+@{Learn_Taijutsu-Level}+@{Learn_Taijutsu-Blood}+@{Learn_Taijutsu-Occu}+@{Learn_Taijutsu-Talents}+@{Learn_Taijutsu-Feats}+@{Learn_Taijutsu-Synergy}+@{Learn_Taijutsu-Items}+@{Learn_Taijutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Taijutsu" value="[[@{Learn_Taijutsu-ability}+@{Learn_Taijutsu-Ranks}+@{Learn_Taijutsu-Blood}+@{Learn_Taijutsu-Occu}+@{Learn_Taijutsu-Feats}+@{Learn_Taijutsu-Synergy}+@{Learn_Taijutsu-Items}+@{Learn_Taijutsu-Misc}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Taijutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}"selected>Str</option>
@@ -3749,10 +3778,9 @@
                     <option value="@{Charisma-mod}">Cha</option>
                 </select>
             </td>
-            <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Level" value="@{Character_Level}" disabled='true'/></td>
+            <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Ranks" value="@{Taijutsu-Ranks}" disabled='true'/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Blood" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Occu" value="0"/></td>
-			<td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Talents" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Feats" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Synergy" value="0"/></td>
             <td><input type="number" class="sheet-number" name="attr_Learn_Taijutsu-Items" value="0"/></td>