diff --git a/conan-2d20/conan 2d20.html b/conan-2d20/conan 2d20.html
index 9baa1bcf31..2f140ff7d6 100644
--- a/conan-2d20/conan 2d20.html	
+++ b/conan-2d20/conan 2d20.html	
@@ -1,89 +1,120 @@
 
 <div class="sheet-section-basic sheet-section">
-<img class="sheet-logo" src="https://dl.dropboxusercontent.com/u/9743716/pictures/Infinityheader.png" alt="Infinity" />
+<img class="sheet-logo" src="https://dl.dropboxusercontent.com/u/9743716/pictures/Conan2d20.png" alt="Conan 2d20" />
 
 <div class="sheet-break"></div>
 <div class="sheet-section-skills sheet-section sheet-half">
             <div class="sheet-header">Character Sheet</div>
             <table border="1" style="width:100%">
-            <tr>
-    		<td>
-				<label>Name</label>
-				<input style=width:150px type="text" name="attr_character_name" />
-			</td>
-			<td>
-				<label>Melee</label>
-				<input style=width:40px type="text" name="attr_MDB" />
-			</td>
-                		<td>
-				<label>Psych</label>
-				<input style=width:40px type="text" name="attr_PDB" />
-			</td>
-                                	<td>
-				<label>Xp Total</label>
-				<input style=width:40px type="text" name="attr_XPT" />
-			</td>
-		    </tr>
-		    <tr>
-			<td>
-				<label>Faction</label>
-				<input style=width:150px type="text" name="attr_Faction" />
-			</td>
-			<td>
-				<label>Ranged</label>
-				<input style=width:40px type="text" name="attr_RDB" />
-			</td>
-                		<td>
-				<label>Infowar</label>
-				<input style=width:40px type="text" name="attr_IWDB" />
-    		</td>
-                                                <td>
-				<label>Xp Spent</label>
-				<input style=width:40px type="text" name="attr_XPS" />
-			</td>
-		    </tr>
-            </table>
-            <table border="1" style="width:100%">
-		    <tr>
-    		<td>
-				<label>Heritage</label>
-				<input style=width:130px type="text" name="attr_Heritage" />
-			</td>
-			<td>
-				<label>Homeworld</label>
-				<input style=width:130px type="text" name="attr_Homeworld" />
-			</td>
-                		<td>
-				<label>Social Status</label>
-				<input style=width:130px type="text" name="attr_Social_Status" />
-    		</td>
-	        </table>
 
+            <tr>
+            <td>
+            <label>Name</label>
+    		<input style=width:120px type="text" name="attr_character_name" />
+            </td>
+			<td>
+			<label>Gender/Age</label>
+			<input style=width:90px type="text" name="attr_Age" />
+            </td>
+			<td>
+			<label>Height/Weight</label>
+			<input style=width:100px type="text" name="attr_Height" />
+			</td>
+            <td>
+            <label>Gold</label>
+			<input style=width:30px type="text" name="attr_Gold" />
+			</td>
+            </tr>
+            </table>
+
+
+            <table border="1" style="width:100%">
+            <tr>
+            <td>
+            <label>Ethnicity</label>
+			<input style=width:130px type="text" name="attr_Ethnicity" />
+            </td>
+			<td>
+			<label>Archtype</label>
+			<input style=width:130px type="text" name="attr_Archtype" />
+            </td>
+			<td>
+			<label>Homeland</label>
+			<input style=width:130px type="text" name="attr_Homeland" />
+			</td>
+            </tr>
+            </table>
+           
 
             <div class="sheet-header">Trackers</div>
           
             <table border="1" style="width:100%">
-            <td><lable>Infinity Points</lable><td><lable>Refresh</lable><td><lable>Reaction Tracker</lable></td>
+            <td><lable>Fortune Points</lable><td><lable>Wounds</lable><td><lable>Trauma</lable></td>
                 
             </tr>
             <tr>
-			<td><input style=width:25px class="sheet-check-off" type="checkbox" name="attr_cp1">
-	    	<input style=width:25px class="sheet-check-off" type="checkbox" name="attr_cp2">
-			<input style=width:25px class="sheet-check-off" type="checkbox" name="attr_cp3">
-            <input style=width:25px class="sheet-check-off" type="checkbox" name="attr_cp4">
-            <input style=width:25px class="sheet-check-off" type="checkbox" name="attr_cp5">
+			<td><input style=width:20px class="sheet-check-off" type="checkbox" name="attr_fp1">
+	    	<input style=width:20px class="sheet-check-off" type="checkbox" name="attr_fp2">
+			<input style=width:20px class="sheet-check-off" type="checkbox" name="attr_fp3">
+            <input style=width:20px class="sheet-check-off" type="checkbox" name="attr_fp4">
+            <input style=width:20px class="sheet-check-off" type="checkbox" name="attr_fp5">
 </td>
 		
-            <td><input style=width:100px type="text" name="attr_Refresh">
+            <td><input style=width:20px class="sheet-check-off" type="checkbox" name="attr_wp1">
+	    	<input style=width:20px class="sheet-check-off" type="checkbox" name="attr_wp2">
+			<input style=width:20px class="sheet-check-off" type="checkbox" name="attr_wp3">
+            <input style=width:20px class="sheet-check-off" type="checkbox" name="attr_wp4">
+            <input style=width:20px class="sheet-check-off" type="checkbox" name="attr_wp5">
           
-    		<td><input style=width:25px class="sheet-check-off" type="checkbox" name="attr_rt1">
-			<input style=width:25px class="sheet-check-off" type="checkbox" name="attr_rt2">
-			<input style=width:25px class="sheet-check-off" type="checkbox" name="attr_rt3">
-            <input style=width:25px class="sheet-check-off" type="checkbox" name="attr_rt4">
-            <input style=width:25px class="sheet-check-off" type="checkbox" name="attr_rt5">
+    		<td><input style=width:20px class="sheet-check-off" type="checkbox" name="attr_tp1">
+			<input style=width:20px class="sheet-check-off" type="checkbox" name="attr_tp2">
+			<input style=width:20px class="sheet-check-off" type="checkbox" name="attr_tp3">
+            <input style=width:20px class="sheet-check-off" type="checkbox" name="attr_tp4">
+            <input style=width:20px class="sheet-check-off" type="checkbox" name="attr_tp5">
 </td>
 		    </tr>
             </table>
+            <div class="sheet-header">Stress</div>
+            <table border="1" style="width:100%">
+            <tr>
+        <td>Vigor
+        <td>1<input  style=width:9px class="sheet-check-on" type="checkbox" name="attr_Vigor" checked='True' value = "1">
+        	2<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "2">
+			3<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "3">
+			4<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "4">
+            5<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "5">
+			6<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "6">
+            7<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "7">
+			8<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "8">
+            9<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "9">
+			10<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "10">
+			11<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "11">
+			12<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "12">
+            13<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "13">
+			14<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "14">
+			15<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Vigor" checked='false' value = "15">
+
+</tr>
+<td>Resolve
+        <td>1<input  style=width:9px class="sheet-check-on" type="checkbox" name="attr_Resolve" checked='True' value = "1">
+            2<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "2">
+			3<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "3">
+			4<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "4">
+            5<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "5">
+			6<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "6">
+            7<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "7">
+			8<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "8">
+            9<input  style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "9">
+			10<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "10">
+			11<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "11">
+			12<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "12">
+            13<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "13">
+			14<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "14">
+			15<input style=width:9px class="sheet-check-off" type="checkbox" name="attr_Resolve" checked='false' value = "15">
+
+</tr>
+            </td>
+</table>
             
             <div class="sheet-header">Momentum</div>
             <table border="1" style="width:100%">
@@ -106,186 +137,65 @@
 </table>
   
 
-            <div class="sheet-header">Damage</div>
+            <div class="sheet-header"> Bonus Damage</div>
             <table border="1" style="width:100%">
     	    <tr>
     		<td>
-				<label>Morale Soak</label>
-				<input style=width:130px type="text" name="attr_Morale_Soak" />
+				<label>Ranged</label>
+				<input style=width:130px type="text" name="attr_Ranged" />
 			</td>
 			<td>
-				<label>Security Soak</label>
-				<input style=width:130px type="text" name="attr_Security_Soak" />
+				<label>Melee</label>
+				<input style=width:130px type="text" name="attr_Melee" />
 			</td>
                 		<td>
-				<label>BTS</label>
-				<input style=width:130px type="text" name="attr_BTS" />
+				<label>Presance</label>
+				<input style=width:130px type="text" name="attr_Presance" />
     		</td>
 	        </table>
-            <div class="sheet-header">Armour Soak Location </div>
+            <div class="sheet-header">Armour Value and Type </div>
        <table border="1" style="width:100%">
-            <tr>
-			<td>1-2 Head<input style=width:130px type="text" name="attr_Head_Soak" />
-            <td>3-5 Right Arm<input style=width:130px type="text" name="attr_RA_Soak" />
-            <td>6-8 Left Arm<input style=width:130px type="text" name="attr_LA_Soak" />
-            </tr><tr>
-            <td>9-14 Torso<input style=width:130px type="text" name="attr_Torso_Soak" />
-            <td>15-17 Right Leg<input style=width:130px type="text" name="attr_RL_Soak" />
-            <td>18-20 Left Leg<input style=width:130px type="text" name="attr_LL_Soak" />
+            
+			<tr><td>1-2<td>Head<input style=width:30px type="text" name="attr_Head_Soak" value = "0"/>
+            <td>Armour Type<input style=width:100px type="text" name="attr_Head_Armour" value = "None"/>
+            <tr><td>3-5<td>Right Arm<input style=width:30px type="text" name="attr_RA_Soak" value = "0" />
+            <td>Armour Type<input style=width:100px type="text" name="attr_RA_Armour" value = "None"/>
+            <tr><td>6-8<td>Left Arm<input style=width:30px type="text" name="attr_LA_Soak" value = "0"/>
+            <td>Armour Type<input style=width:100px type="text" name="attr_LA_Armour" value = "None"/>
+            <tr><td>9-14<td>Torso<input style=width:30px type="text" name="attr_Torso_Soak" value = "0"/>
+            <td>Armour Type<input style=width:100px type="text" name="attr_Torso_Armour" value = "None"/>
+            <tr><td>15-17<td>Right Leg<input style=width:30px type="text" name="attr_RL_Soak" value = "0"/>
+            <td>Armour Type<input style=width:100px type="text" name="attr_RL_Armour" value = "None"/>
+            <tr><td>18-20<td>Left Leg<input style=width:30px type="text" name="attr_LL_Soak" value = "0"/>
+            <td>Armour Type<input style=width:100px type="text" name="attr_LL_Armour" value = "None"/>
       	</td>
           </tr>
 	        </table>
-            <div class="sheet-header">Host Attributes </div>
-       <table border="1" style="width:100%">
-            <tr>
-    		<td>AGI<input style=width:50px type="text" name="attr_Host_AGI" />
-            <td>AWA<input style=width:50px type="text" name="attr_Host_AWA" />
-            <td>BRW<input style=width:50px type="text" name="attr_Host_BRW" />
-            <td>COO<input style=width:50px type="text" name="attr_Host_COO" />
-            <td>INT<input style=width:50px type="text" name="attr_Host_INT" />
-            <td>PER<input style=width:50px type="text" name="attr_Host_PER" />
-            <td>WIL<input style=width:50px type="text" name="attr_Host_WIL" />
-            </tr>
-            </table>
-            <table border="1" style="width:100%">
-            <tr>
-            <td>Skills<input  style=width:350px type="text" name="attr_Host_Skills" />
-      	</td>
-          </tr>
-          </table>
-
-       <div class="sheet-header">Geist Attributes </div>
-       <table border="1" style="width:100%">
-            <tr>
-        	<td>AGI<input style=width:50px type="text" name="attr_Geist_AGI" />
-            <td>AWA<input style=width:50px type="text" name="attr_Geist_AWA" />
-            <td>BRW<input style=width:50px type="text" name="attr_Geist_BRW" />
-            <td>COO<input style=width:50px type="text" name="attr_Geist_COO" />
-            <td>INT<input style=width:50px type="text" name="attr_Geist_INT" />
-            <td>PER<input style=width:50px type="text" name="attr_Geist_PER" />
-            <td>WIL<input style=width:50px type="text" name="attr_Geist_WIL" />
-            </tr>
-            </table>
-            <table border="1" style="width:100%">
-            <tr>
-            <td>Skills<input style=width:350px type="text" name="attr_Geist_Skills" />
-          </td>
-          </tr>
-          </table>
-          
-            <table border="1" style="width:100%">
-            <tr>
-            <td>Vigor<input style=width:51px type="text" name="attr_Geist_Vigor" />
-            <td>Firewall<input style=width:51px type="text" name="attr_Geist_Firewall" />
-            <td>Resolve<input style=width:51px type="text" name="attr_Geist_Resolve" />
-            <td>Soak<input style=width:51px type="text" name="attr_Geist_Soak" />
-            </tr>
-      	</td>
-         
-	        </table>
-            <div class="sheet-header">Firewall (Infowar)</div>
-			<table border="1" style="width:100%">
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW1" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW2" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW3" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_MW4" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW5" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW6" /></td>
-    		<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW7" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW8" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW9" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW10" /></td>
-            </td>
-	        </table>
-            </tr>Breaches
-            <table border="1" style="width:100%">
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW11" /></td>
-    		<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW12" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW13" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW14" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_FW15" /></td>
-
-			
-			</td>
-		    </tr>
            
-            </table>
+
+       
+	       
         
-            <div class="sheet-header">Resolve (Mental)</div>
-    		<table border="1" style="width:100%">
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS1" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS2" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS3" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS4" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS5" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS6" /></td>
-    		<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS7" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS8" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS9" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS10" /></td>
-            </td>
-	        </table>
-            </tr>Trauma
-            <table border="1" style="width:100%">
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS11" /></td>
-    		<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS12" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS13" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS14" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RS15" /></td>
+          
 
-			
-			</td>
-		    </tr>
-           
-            </table>
-                        <div class="sheet-header">Physical (Vigor)</div>
-        	<table border="1" style="width:100%">
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH1" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH2" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH3" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH4" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH5" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH6" /></td>
-    		<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH7" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH8" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH9" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH10" /></td>
-            </td>
-	        </table>
-            </tr>Wounds
-            <table border="1" style="width:100%">
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH11" /></td>
-    		<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH12" /></td>
-			<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH13" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH14" /></td>
-            <td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_PH15" /></td>
-
-			
-			</td>
-		    </tr>
-           
-            </table>
-         
-
-                <div class="sheet-header">Traits</div>
+                <div class="sheet-header">Tactics & Abilities</div>
      <table border="1" style="width:100%">
      <tr>
 
-                <td>1<input  style=width:350px type="text" name="attr_Traits_Name1" />
-
-                         </td><tr>       
-                <td>2<input  style=width:350px type="text" name="attr_Traits_Name2" />
-
-                                </td><tr>
-                <td>3<input  style=width:350px type="text" name="attr_Traits_Name3" />
-
-                             </td><tr>
-                <td>4<input  style=width:350px type="text" name="attr_Traits_Name4" />
-
-                                </td><tr>
-                <td>5<input  style=width:350px type="text" name="attr_Traits_Name5" />
-                                                </td><tr>
-                <td>6<input  style=width:350px type="text" name="attr_Traits_Name6" />
+                <td>1<input  style=width:390px type="text" name="attr_Tactics_Name1" />
+                </td><tr>       
+                <td>2<input  style=width:390px type="text" name="attr_Tactics_Name2" />
+                </td><tr>
+                <td>3<input  style=width:390px type="text" name="attr_Tactics_Name3" />
+                </td><tr>
+                <td>4<input  style=width:390px type="text" name="attr_Tactics_Name4" />
+                </td><tr>
+                <td>5<input  style=width:390px type="text" name="attr_Tactics_Name5" />
+                </td><tr>
+                <td>6<input  style=width:390px type="text" name="attr_Tactics_Name6" />
+                <div class="sheet-section-stunts sheet-section">
+                <div class="sheet-header">Other Notes</div>
+	            <textarea name="attr_Other Notes"></textarea>
 
 
 
@@ -303,63 +213,63 @@
 
     <div class="sheet-header">Attibutes & Skills</div>
      <table border="1" style="width:100%">
-    <tr><td><label>Agility<td><td><input style=width:60px type="text" name="attr_Agility" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Agility}]]]] Unskilled Agility skill.'></button></td></label>
-    <tr><td style=width:120px>Acrobatics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Acrobatics" ><td>Expertise<input style=width:60px type="text" name="attr_Acrobatics_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Acrobatics_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Acrobatics_Focus}cf20<[[@{Agility}+@{Acrobatics_Expertise}]]]] Acrobatics skill.'></button></td>
-    <tr><td>Close Combat<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Close_Combat" ><td>Expertise<input style=width:60px type="text" name="attr_Close_Combat_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Close_Combat_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Close_Combat_Focus}cf20<[[@{Agility}+@{Close_Combat_Expertise}]]]] Close Combat skill.'></button></td>
-    <tr><td>Stealth<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Stealth" ><td>Expertise<input style=width:60px type="text" name="attr_Stealth_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Stealth_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sa<@{Stealth_Focus}cf20<[[@{Agility}+@{Stealth_Expertise}]]]] Stealth skill.'></button></td>
+    <tr><td><label>Agility<td><td><input style=width:60px type="text" name="attr_Agility" value = "0" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Agility}]]]] Unskilled Agility skill.'></button></td></label>
+    <tr><td style=width:120px>Acrobatics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Acrobatics" ><td>Expertise<input style=width:60px type="text" name="attr_Acrobatics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Acrobatics_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Acrobatics_Focus}cf20<[[@{Agility}+@{Acrobatics_Expertise}]]]] Acrobatics skill.'></button></td>
+    <tr><td>Melee<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Melee" ><td>Expertise<input style=width:60px type="text" name="attr_Melee_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Melee_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Melee_Focus}cf20<[[@{Agility}+@{Melee_Expertise}]]]] Melee skill.'></button></td>
+    <tr><td>Stealth<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Stealth" ><td>Expertise<input style=width:60px type="text" name="attr_Stealth_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Stealth_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sa<@{Stealth_Focus}cf20<[[@{Agility}+@{Stealth_Expertise}]]]] Stealth skill.'></button></td>
    
     </td>
     </tr>
     </table>
     
             <table border="1" style="width:100%">
-    <tr><td><label>Awareness<td><td><input style=width:60px type="text" name="attr_Awareness" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Awareness}]]]] Unskilled Awareness skill.'></button></td></label>
-    <tr><td style=width:120px>Analysis<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Analysis" ><td>Expertise<input style=width:60px type="text" name="attr_Analysis_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Analysis_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Analysis_Focus}cf20<[[@{Awareness}+@{Analysis_Expertise}]]]] Analysis skill.'></button></td>
-    <tr><td>Extraplanetary<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Extraplanetary" ><td>Expertise<input style=width:60px type="text" name="attr_Extraplanetary_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Extraplanetary_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Extraplanetary_Focus}cf20<[[@{Awareness}+@{Extraplanetary_Expertise}]]]] Extraplanetary skill.'></button></td>
-    <tr><td>Observation<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Observation" ><td>Expertise<input style=width:60px type="text" name="attr_Observation_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Observation_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Observation_Focus}cf20<[[@{Awareness}+@{Observation_Expertise}]]]] Observation skill.'></button></td>
-    <tr><td>Survival<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Survival" ><td>Expertise<input style=width:60px type="text" name="attr_Survival_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Survival_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Survival_Focus}cf20<[[@{Awareness}+@{Survival_Expertise}]]]] Survival skill.'></button></td>
-    <tr><td>Thievery<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Thievery" ><td>Expertise<input style=width:60px type="text" name="attr_Thievery_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Thievery_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Thievery_Focus}cf20<[[@{Awareness}+@{Thievery_Expertise}]]]] Thievery skill.'></button></td>
+    <tr><td><label>Awareness<td><td><input style=width:60px type="text" name="attr_Awareness" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Awareness}]]]] Unskilled Awareness skill.'></button></td></label>
+    <tr><td style=width:120px>Insight<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Insight" ><td>Expertise<input style=width:60px type="text" name="attr_Insight_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Insight_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Insight_Focus}cf20<[[@{Awareness}+@{Insight_Expertise}]]]] Insight skill.'></button></td>
+    <tr><td>Observation<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Observation" ><td>Expertise<input style=width:60px type="text" name="attr_Observation_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Observation_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Observation_Focus}cf20<[[@{Awareness}+@{Observation_Expertise}]]]] Observation skill.'></button></td>
+    <tr><td>Survival<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Survival" ><td>Expertise<input style=width:60px type="text" name="attr_Survival_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Survival_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Survival_Focus}cf20<[[@{Awareness}+@{Survival_Expertise}]]]] Survival skill.'></button></td>
+    <tr><td>Thievery<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Thievery" ><td>Expertise<input style=width:60px type="text" name="attr_Thievery_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Thievery_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Thievery_Focus}cf20<[[@{Awareness}+@{Thievery_Expertise}]]]] Thievery skill.'></button></td>
     
     </td>
     </tr>
     </table>
              <table border="1" style="width:100%">
-    <tr><td><label>Brawn<td><td><input style=width:60px type="text" name="attr_Brawn" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Brawn}]]]] Unskilled Brawn skill.'></button></td></label>         
-    <tr><td style=width:120px>Athletics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Athletics" ><td>Expertise<input style=width:60px type="text" name="attr_Athletics_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Athletics_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Athletics_Focus}cf20<[[@{Brawn}+@{Athletics_Expertise}]]]] Athletics skill.'></button></td>
-    <tr><td>Resistance<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Resistance" ><td>Expertise<input style=width:60px type="text" name="attr_Resistance_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Resistance_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Resistance_Focus}cf20<[[@{Brawn}+@{Resistance_Expertise}]]]] Resistance skill.'></button></td>
+    <tr><td><label>Brawn<td><td><input style=width:60px type="text" name="attr_Brawn" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Brawn}]]]] Unskilled Brawn skill.'></button></td></label>         
+    <tr><td style=width:120px>Athletics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Athletics" ><td>Expertise<input style=width:60px type="text" name="attr_Athletics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Athletics_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Athletics_Focus}cf20<[[@{Brawn}+@{Athletics_Expertise}]]]] Athletics skill.'></button></td>
+    <tr><td>Resistance<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Resistance" ><td>Expertise<input style=width:60px type="text" name="attr_Resistance_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Resistance_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Resistance_Focus}cf20<[[@{Brawn}+@{Resistance_Expertise}]]]] Resistance skill.'></button></td>
    
     </td>
     </tr>
     </table>
     
             <table border="1" style="width:100%">
-    <tr><td><label>Coordination<td><td><input style=width:60px type="text" name="attr_Coordination" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Coordination}]]]] Unskilled Coordination skill.'></button></td></label>
-    <tr><td style=width:120px>Ballistics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Ballistics" ><td>Expertise<input style=width:60px type="text" name="attr_Ballistics_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Ballistics_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Ballistics_Focus}cf20<[[@{Coordination}+@{Ballistics_Expertise}]]]] Ballistics skill.'></button></td>
-    <tr><td>Pilot<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Pilot" ><td>Expertise<input style=width:60px type="text" name="attr_Pilot_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Pilot_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Pilot_Focus}cf20<[[@{Coordination}+@{Pilot_Expertise}]]]] Pilot skill.'></button></td>
-    <tr><td>Space<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Space" ><td>Expertise<input style=width:60px type="text" name="attr_Space_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Space_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Space_Focus}cf20<[[@{Coordination}+@{Space_Expertise}]]]] Space skill.'></button></td>
+    <tr><td><label>Coordination<td><td><input style=width:60px type="text" name="attr_Coordination" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20}<[[@{Coordination}]]]] Unskilled Coordination skill.'></button></td></label>
+    <tr><td style=width:120px>Parry<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Parry" ><td>Expertise<input style=width:60px type="text" name="attr_Parry_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Parry_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Parry_Focus}cf20<[[@{Coordination}+@{Parry_Expertise}]]]] Parry skill.'></button></td>
+    <tr><td>Ranged Weapons<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Ranged_Weapons" ><td>Expertise<input style=width:60px type="text" name="attr_Ranged_Weapons_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Ranged_Weapons_Focus" value = "0" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Ranged_Weapons_Focus}cf20<[[@{Coordination}+@{Ranged_Weapons_Expertise}]]]] Ranged Weapons skill.'></button></td>
+    <tr><td>Sailing<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Sailing" ><td>Expertise<input style=width:60px type="text" name="attr_Sailing_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Sailing_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Sailing_Focus}cf20<[[@{Coordination}+@{Sailing_Expertise}]]]] Sailing skill.'></button></td>
     
     </td>
     </tr>
     </table>
             <table border="1" style="width:100%">
-    <tr><td><label>Intelligence<td><td><input style=width:60px type="text" name="attr_Intelligence" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Intelligence}]]]] Unskilled Intelligence skill.'></button></td></label>         
-    <tr><td style=width:120px>Education<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Education" ><td>Expertise<input style=width:60px type="text" name="attr_Education_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Education_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Education_Focus}cf20<[[@{Intelligence}+@{Education_Expertise}]]]] Education skill.'></button></td>
-    <tr><td>Hacking<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Hacking" ><td>Expertise<input style=width:60px type="text" name="attr_Heavy_Hacking_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Hacking_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Hacking_Focus}cf20<[[@{Intelligence}+@{Hacking_Expertise}]]]] Hacking skill.'></button></td>
-    <tr><td>Medicine<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Medicine" ><td>Expertise<input style=width:60px type="text" name="attr_Medicine_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Medicine_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Medicine_Focus}cf20<[[@{Intelligence}+@{Medicine_Expertise}]]]] Medicine skill.'></button></td>
-    <tr><td>Psychology<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Psychology" ><td>Expertise<input style=width:60px type="text" name="attr_Psychology_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Psychology_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Psychology_Focus}cf20<[[@{Intelligence}+@{Psychology_Expertise}]]]] Psychology skill.'></button></td> 
-    <tr><td>Science<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Science" ><td>Expertise<input style=width:60px type="text" name="attr_Science_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Science_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Science_Focus}cf20<[[@{Intelligence}+@{Science_Expertise}]]]] Science skill.'></button></td>
-    <tr><td>Tech<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Tech" ><td>Expertise<input style=width:60px type="text" name="attr_Tech_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Tech_Focus" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Tech_Focus}cf20<[[@{Intelligence}+@{Techs_Expertise}]]]] Tech skill.'></button></td>
+    <tr><td><label>Intelligence<td><td><input style=width:60px type="text" name="attr_Intelligence" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Intelligence}]]]] Unskilled Intelligence skill.'></button></td></label>         
+    <tr><td style=width:120px>Alchemy<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Alchemy" ><td>Expertise<input style=width:60px type="text" name="attr_Alchemy_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Alchemy_Focus" value = "0" ><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Alchemy_Focus}cf20<[[@{Intelligence}+@{Alchemy_Expertise}]]]] Alchemy skill.'></button></td>
+    <tr><td>Craft<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Craft" ><td>Expertise<input style=width:60px type="text" name="attr_Craft_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Craft_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Craft_Focus}cf20<[[@{Intelligence}+@{Craft_Expertise}]]]] Craft skill.'></button></td>
+    <tr><td>Healing<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Healing" ><td>Expertise<input style=width:60px type="text" name="attr_Healing_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Healing_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Healing_Focus}cf20<[[@{Intelligence}+@{Healing_Expertise}]]]] Healing skill.'></button></td>
+    <tr><td>Linguistics<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Linguistics" ><td>Expertise<input style=width:60px type="text" name="attr_Linguistics_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Linguistics_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Linguistics_Focus}cf20<[[@{Intelligence}+@{Linguistics_Expertise}]]]] Linguistics skill.'></button></td> 
+    <tr><td>Lore<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Lore" ><td>Expertise<input style=width:60px type="text" name="attr_Lore_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Lore_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Lore_Focus}cf20<[[@{Intelligence}+@{Lore_Expertise}]]]] Lore skill.'></button></td>
+    <tr><td>Siegecraft<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Siegecraft" ><td>Expertise<input style=width:60px type="text" name="attr_Siegecraft_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Siegecraft_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Siegecraft_Focus}cf20<[[@{Intelligence}+@{Siegecraft_Expertise}]]]] Siegecraft skill.'></button></td>
     
     </td>
     </tr>
     </table>
         
         <table border="1" style="width:100%">
-    <tr><td><label>Personality<td><td><input style=width:60px type="text" name="attr_Personality" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Personality}]]]] Unskilled Personality skill.'></button></td></label>         
-    <tr><td style=width:120px>Animal Handling<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Animal_Handling" ><td>Expertise<input style=width:60px type="text" name="attr_Animal_Handling_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Animal_Handling_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Animal_Handling_Focus}cf20<[[@{Personality}+@{Animal_Handling_Expertise}]]]] Animal Handling skill.'></button></td>
-    <tr><td>Command<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Command" ><td>Expertise<input style=width:60px type="text" name="attr_Command_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Command_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Command_Focus}cf20<[[@{Personality}+@{Command_Expertise}]]]] Command skill.'></button></td>
-    <tr><td>Lifestyle<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Lifestyle" ><td>Expertise<input style=width:60px type="text" name="attr_Lifestyle_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Lifestyle_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Lifestyle_Focus}cf20<[[@{Personality}+@{Lifestyle_Expertise}]]]] Lifestyle skill.'></button></td>
-    <tr><td>Persuade<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Persuade" ><td>Expertise<input style=width:60px type="text" name="attr_Persuade_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Persuade_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Persuade_Focus}cf20<[[@{Personality}+@{Persuade_Expertise}]]]] Persuade skill.'></button></td>
+    <tr><td><label>Personality<td><td><input style=width:60px type="text" name="attr_Personality" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Personality}]]]] Unskilled Personality skill.'></button></td></label>         
+    <tr><td style=width:120px>Animal Handling<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Animal_Handling" ><td>Expertise<input style=width:60px type="text" name="attr_Animal_Handling_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Animal_Handling_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Animal_Handling_Focus}cf20<[[@{Personality}+@{Animal_Handling_Expertise}]]]] Animal Handling skill.'></button></td>
+    <tr><td>Command<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Command" ><td>Expertise<input style=width:60px type="text" name="attr_Command_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Command_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Command_Focus}cf20}<[[@{Personality}+@{Command_Expertise}]]]] Command skill.'></button></td>
+    <tr><td>Counsel<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Counsel" ><td>Expertise<input style=width:60px type="text" name="attr_Counsel_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Counsel_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Counsel_Focus}cf20<[[@{Personality}+@{Counsel_Expertise}]]]] Counsel skill.'></button></td>
+    <tr><td>Persuade<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Persuade" ><td>Expertise<input style=width:60px type="text" name="attr_Persuade_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Persuade_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Persuade_Focus}cf20<[[@{Personality}+@{Persuade_Expertise}]]]] Persuade skill.'></button></td>
+    <tr><td>Society<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Society" ><td>Expertise<input style=width:60px type="text" name="attr_Society_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Society_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Society_Focus}cf20<[[@{Personality}+@{Society_Expertise}]]]] Society skill.'></button></td>
    
     </td>
     </tr>
@@ -367,49 +277,20 @@
     
     
                   <table border="1" style="width:100%">
-    <tr><td><label>Willpower<td><td><input style=width:60px type="text" name="attr_Willpower" /><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Willpower}]]]] Unskilled Willpower skill.'></button></td></label>         
-    <tr><td style=width:120px>Discipline<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Discipline" ><td>Expertise<input style=width:60px type="text" name="attr_Discipline_Expertise" /><td>Focus<input style=width:60px type="text" name="attr_Discipline_Focus"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Discipline_Focus}cf20<[[@{Willpower}+@{Discipline_Expertise}]]]] Discipline skill.'></button></td>
+    <tr><td><label>Willpower<td><td><input style=width:60px type="text" name="attr_Willpower" value = "0"/><td>Unskilled<td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacf19cf20<[[@{Willpower}]]]] Unskilled Willpower skill.'></button></td></label>         
+    <tr><td style=width:120px>Discipline<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Discipline" ><td>Expertise<input style=width:60px type="text" name="attr_Discipline_Expertise" value = "0" /><td>Focus<input style=width:60px type="text" name="attr_Discipline_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Discipline_Focus}cf20<[[@{Willpower}+@{Discipline_Expertise}]]]] Discipline skill.'></button></td>
+    <tr><td style=width:120px>Sorcery<td><input class="sheet-check-off" style=width:15px type="checkbox" name="attr_Sorcery" ><td>Expertise<input style=width:60px type="text" name="attr_Sorcery_Expertise" value = "0"/><td>Focus<input style=width:60px type="text" name="attr_Sorcery_Focus" value = "0"><td><button type='roll' name='roll_skill' value='/me rolls [[ ?{Dice|2}d20sacs<@{Sorcery_Focus}cf20<[[@{Willpower}+@{Sorcery_Expertise}]]]] Sorcery skill.'></button></td>
+   
+       
    </td>
     </tr>
     </table>
 
-
-    
-    
-                    <div class="sheet-header">Faction Handler</div>
-     <table border="1" style="width:100%">
-     <tr>
-    		
-
-
-               
-                <td>Identity<td><input  style=width:250px type="text" name="attr_FactionHandler_Name1" />
-
-                         </td><tr>       
-                <td>Faction<td><input  style=width:250px type="text" name="attr_FactionHandler_Name2" />
-
-                                </td><tr>
-                <td>Current Faction Goal<td><input  style=width:250px type="text" name="attr_FactionHandler_Name3" />
-
-                             </td><tr>
-                <td>Contact Protocal<td><input  style=width:250px type="text" name="attr_FactionHandler_Name4" />
-                    </td>
-    </tr>
-    </table>
-                <div class="sheet-header">Faction Handler Notes</div>
-                <table>
-                                             <tr>
-                <td><input  style=width:408px type="text" name="attr_FactionHandler_Name5" />
-
-                       </td>
-    </tr>
-    </table>
-
     </div>
     </div>
 
     <div class="sheet-break"></div>
-     <div class="sheet-header">Tallents</div>
+     <div class="sheet-header">Talents</div>
      <table border="1" style="width:100%">
      <tr>
         		<td><label>Name</label>
@@ -468,14 +349,29 @@
                 <td><input style=width:220px type="text" name="attr_ATallent_Effect12" />
 
 
+
+
 </td>
-		    </tr>
+    	    </tr>
  </table>
-           
+                 <div class="sheet-repitem">
+             <fieldset class="repeating_talents">
+           <table border="1" style="width:100%">
+                <td><input style=width:90px type="text" name="attr_ATallent_Namerep1" />
+                <td><input style=width:90px type="text" name="attr_ATallent_Skillrep1" />
+                <td><input style=width:220px type="text" name="attr_ATallent_Effectrep1" />
+                
+                <td><input style=width:90px type="text" name="attr_ATallent_Namerep2" />
+                <td><input style=width:90px type="text" name="attr_ATallent_Skillrep2" />
+                <td><input style=width:220px type="text" name="attr_ATallent_Effectrep2" />
+                       
+                           
+                           
+                       </td></table></tr></fieldset>
 
     
 <div class="sheet-header">Weapons</div>
-<b>you need to create a rollable table called "Combat-Dice" with name values of "Hit","Hit+Hit","-","-","-","Hit+Special"</b>
+<b>create a rollable table called "Combat-Dice" with name values of "1","2","-","-","1 + Special Event","1 + Special Event"</b>
                     
                 
                 <div class="sheet-repitem">
@@ -483,24 +379,21 @@
                              <table border="1" style="width:100%">
       
 <tr>                
-                <td>Name<input style=width:150px type="text" name="attr_weapon_Name_rep" value='0'/>
-                <td>Range<input style=width:70px type="text" name="attr_weapon_Range_rep" value='0'/>
-                <td>Damage Bonus Hit<input style=width:60px type="text" name="attr_weapon_Damagebonus_rep" value='0'>
-                <td>Damage<input style=width:60px type="text" name="attr_weapon_Damage_rep" value='0'><button type='roll' name="attr_Combat-Dice" value="/me rolls [[(?{Damage Dice|0}+@{weapon_Damage_rep})t[Combat-Dice]]]+@{weapon_Damagebonus_rep} Hits , Hover mouse over result to get full result"></button></td>
-                <td>Mode<input style=width:150px  type="text" name="attr_weapon_Mode_rep" value='0'/>
+                <td>Name<input style=width:90px type="text" name="attr_weapon_Name_rep"/>
+                <td>Reach<input style=width:20px type="text" name="attr_weapon_Reach_rep" />
+                <td>Range<input style=width:60px type="text" name="attr_weapon_Range_rep" />
+                <td>Attribute Bonus Dice<input style=width:20px  type="text" name="attr_weapon_Attribute_rep" value='0'/>
+                <td>Base Damage<input style=width:20px type="text" name="attr_weapon_Damagebonus_rep" value='0'>
+                <td>Damage<input style=width:20px type="text" name="attr_weapon_Damage_rep" value='0'>
+                <td>Hands<input style=width:20px  type="text" name="attr_weapon_Hands_rep" value='0'/>
+                <td>Notes<input style=width:90px type="text" name="attr_weapon_Notes_rep" value='0'/>
+                <button type='roll' name="attr_Combat-Dice" value="/me rolls  @{weapon_Name_rep} [[(?{Modifier to Damage Dice|0}+@{weapon_Damage_rep}+@{weapon_Attribute_rep})t[Combat-Dice]]]+@{weapon_Damagebonus_rep} Hits , Hover mouse over result to get full result"></button></td>
+                
                             </td>
                             </table>
                              <table border="1" style="width:100%">
                             <tr>
             
-                <td>Burst<input style=width:80px  type="text" name="attr_weapon_Burst_rep" value='0'/>
-                <td>Size<input style=width:100px type="text" name="attr_weapon_Size_rep" value='0'/>
-                <td>Qualities<input style=width:380px type="text" name="attr_weapon_Qualities_rep" value='0'/>
-                <td>Reloads<input class="sheet-check-off" style=width:20px type="checkbox" name="attr_RL1"/>
-                <input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RL2"/>
-                <input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RL3"/>
-                <input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RL4"/>
-                <input class="sheet-check-off" style=width:15px type="checkbox" name="attr_RL5"/>
             </td>
              </table>
  
@@ -515,7 +408,7 @@
 <div class="sheet-break"></div>
 
 
-            <div class="sheet-header">Lifepath Characteristics</div>
+            <div class="sheet-header">Character Creation</div>
             <table border="1" style="width:100%">
               <tr><td>           
               <label>Age</label>
@@ -525,62 +418,91 @@
 		    </td>
 			<td>
              <label>Languages</label>
-        		<input style=width:784px type="text" name="attr_Additional_Notes" />
+        		<input style=width:784px type="text" name="attr_Languages" />
             </td>
             </tr>
+
             
             
               </table>
              <table border="1" style="width:100%">
     		<tr>
 			<td>
-				<label>Family Social Status</label>
-				<input style=width:204px type="text" name="attr_Family_Social_Status" />
+				<label>Homeland:</label>
+				<input style=width:204px type="text" name="attr_homeland" />
     		</td>
 			<td>
-				<label>Home Enviroment</label>
-				<input style=width:204px type="text" name="attr_Home_Enviroment" />
+				<label>Starting Talent:</label>
+				<input style=width:204px type="text" name="attr_Starting_Talent" />
     		</td>
 			<td>
-    			<label>Youth Event</label>
-				<input style=width:204px type="text" name="attr_Youth_Event" />
+    			<label>Caste:</label>
+				<input style=width:204px type="text" name="attr_Caste" />
     		</td>
 			<td>
-				<label>Education</label>
-				<input style=width:204px type="text" name="attr_Education" />
+				<label>Caste Tallents:</label>
+				<input style=width:204px type="text" name="attr_Caste_Tallents" />
     		</td>
 		    </tr>
 		    <tr>
 			<td>
                 
-             <label>Adolesent Event</label>
-				<input style=width:204px type="text" name="attr_Adolesent_Event" />
+             <label>Character Stories:</label>
+				<input style=width:204px type="text" name="attr_Character_Stories" />
     		</td>
 			<td>
-             <label>First Career</label>
-				<input style=width:204px type="text" name="attr_First_Career" />
+             <label>Archtype:</label>
+				<input style=width:204px type="text" name="attr_Archtype" />
      		</td>
 			<td>
-             <label>Second Career</label>
-    			<input style=width:204px type="text" name="attr_Second_Career" />
+             <label>Career Skill:</label>
+    			<input style=width:204px type="text" name="attr_Career_Skill" />
       		</td>
 			<td>
-             <label>Third Career</label>
-    			<input style=width:204px type="text" name="attr_Third_Career" />
+             <label>Career Talent:</label>
+    			<input style=width:204px type="text" name="attr_Career_Talent" />
     		</td>
 		    </tr>
             </table>
             <table border="1" style="width:100%">
 		    <tr>
 			<td>
-             <label>Forth Career</label>
-    			<input style=width:204px type="text" name="attr_Forth_Career" />
+             <label>Mandatory Skills:</label>
+    			<input style=width:412px type="text" name="attr_Mandatory_Skills" />
     		</td>
 			<td>
-             <label>Additional Notes</label>
-        		<input style=width:620px type="text" name="attr_Additional_Notes" />
+             <label>Elective Skills:</label>
+        		<input style=width:412px type="text" name="attr_Elective_Skills" />
 
-            
+        	</td>
+		    </tr>
+            </table>
+            <table border="1" style="width:100%">
+		    <tr>
+			<td>
+                         <label>Equipment:</label>
+            	<input style=width:824px type="text" name="attr_Equipment" />
+                            </td>
+		    </tr>
+            </table>
+            <table border="1" style="width:100%">
+		    <tr>
+			<td>
+                
+            <label>Nature:</label>
+                <input style=width:204px type="text" name="attr_Nature" />
+          	</td>
+			<td>
+                         <label>Education:</label>
+                <input style=width:204px type="text" name="attr_Education" />
+          	</td>
+			<td>
+             <label>War Story:</label>
+                <input style=width:204px type="text" name="attr_War_Story" />
+                              </td>
+			<td>
+             <label>Weapon Povenance:</label>
+                <input style=width:204px type="text" name="attr_Weapon_Povenance" />
             </td>
              </tr>
              </table>
@@ -588,3 +510,7 @@
 
 
 
+
+
+
+