diff --git a/Spycraft_2.0/spycraft2.html b/Spycraft_2.0/spycraft2.html
index 5f7de06d20..1acbcfba70 100644
--- a/Spycraft_2.0/spycraft2.html
+++ b/Spycraft_2.0/spycraft2.html
@@ -596,483 +596,787 @@
         <td class="sheet-superTinyTextCenter">Threat Range</td>
     </tr>
 
-
             <tr>
- 	    	<td><button type="roll" value="&{template:default} {{name=Acrobatics (Str)}} {{attack=[[1d20cs>@{AcrobaticsThreatRange}cf<@{AcrobaticsErrorRange}+@{AcrobaticsStrBonus}]]}}" name="attr_AcrobaticsStrRoll"/></td>
+                <!-- Acrobatics Str -->
+
+                <td><button type="roll" value="&{template:default} {{name=Acrobatics (Str)}} {{attack=[[1d20cs>@{AcrobaticsThreatRange}cf<@{AcrobaticsErrorRange}+@{AcrobaticsStrBonus}]]}}" name="attr_AcrobaticsStrRoll"/></td>
                 <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_AcrobaticsClassSkill" ></td>
                 <td style="vertical-align:text-top;" rowspan='2'>Acrobatics</td>
                 <td>Str</td>
                 <td><input type="number" style="width:40px;" name="attr_AcrobaticsSkillCap" value="15"/></td>
-		<td><input type="number" class="sheet-short" name="attr_AcrobaticsStrBonus" value="(@{AcrobaticsRanks}+@{AcrobaticsStrMod}+@{AcrobaticsMiscMod})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_AcrobaticsStrBonus" value="(@{AcrobaticsRanks}+@{AcrobaticsStrMod}+@{AcrobaticsMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_AcrobaticsRanks" value="0"></td>
-		<td><input type="number" class="sheet-input-small" name="attr_AcrobaticsStrMod" value="(@{StrengthMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AcrobaticsStrMod" value="(@{StrengthMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_AcrobaticsMiscMod" value="0"></td>
                 <td><input type="number" class="sheet-input-small" name="attr_AcrobaticsErrorRange" value="1"></td>
                 <td><input type="number" class="sheet-input-small" name="attr_AcrobaticsThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
- 	    	<td><button type="roll" value="&{template:default} {{name=Mechanics (Int)}} {{attack=[[1d20cs>@{MechanicsThreatRange}cf<@{MechanicsErrorRange}+@{MechanicsIntBonus}]]}}" name="attr_MechanicsIntRoll"/></td>
+                <!-- Mechanics Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Mechanics (Int)}} {{attack=[[1d20cs>@{MechanicsThreatRange}cf<@{MechanicsErrorRange}+@{MechanicsIntBonus}]]}}" name="attr_MechanicsIntRoll"/></td>
                 <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_MechanicsClassSkill" ></td>
-                <td rowspan='2' style="vertical-align:text-top;">Mechanics</td>
+                <td style="vertical-align:text-top;" rowspan='2'>Mechanics</td>
                 <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_MechanicsSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_MechanicsIntBonus" value="(@{MechanicsRanks}+@{MechanicsIntMod}+@{MechanicsMiscMod})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_MechanicsIntBonus" value="(@{MechanicsRanks}+@{MechanicsIntMod}+@{MechanicsMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_MechanicsRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MechanicsIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MechanicsIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_MechanicsMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MechanicsErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MechanicsThreatRange" value="20"></td>
-            </tr>
+                <td><input type="number" class="sheet-input-small" name="attr_MechanicsErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MechanicsThreatRange" value="20"></td>
 
-	    <tr>
-		<!-- Acrobatics -->
- 	    	<td><button type="roll" value="&{template:default} {{name=Acrobatics (Dex)}} {{attack=[[1d20cs>@{AcrobaticsThreatRange}cf<@{AcrobaticsErrorRange}+@{AcrobaticsDexBonus}]]}}" name="attr_AcrobaticsDexRoll"/></td>
+            </tr>
+            <tr>
+                <!-- Acrobatics Dex -->
+
+                <td><button type="roll" value="&{template:default} {{name=Acrobatics (Dex)}} {{attack=[[1d20cs>@{AcrobaticsThreatRange}cf<@{AcrobaticsErrorRange}+@{AcrobaticsDexBonus}]]}}" name="attr_AcrobaticsDexRoll"/></td>
                 <td>Dex</td>
-		<td><input type="number" style="width:40px;" name="attr_AcrobaticsSkillCap2" value="(@{AcrobaticsSkillCap})" disabled="true"/></td>
-		<td><input type="number" class="sheet-short" name="attr_AcrobaticsDexBonus" value="(@{AcrobaticsRanks}+@{AcrobaticsDexMod}+@{AcrobaticsMiscMod})" disabled="true"/></td>
+                <td><input type="number" style="width:40px;" name="attr_AcrobaticsSkillCap2" value="(@{AcrobaticsSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_AcrobaticsDexBonus" value="(@{AcrobaticsRanks}+@{AcrobaticsDexMod}+@{AcrobaticsMiscMod})" disabled="true"/></td>
                 <td>=</td>
-		<td><input type="number" style="width:40px;"  name="attr_AcrobaticsRanks2" value="(@{AcrobaticsRanks})" disabled="true"></td>
-		<td><input type="number" class="sheet-input-small" name="attr_AcrobaticsDexMod" value="(@{DexterityMod})" disabled="true"></td>
-		<td><input type="number" style="width:40px;" name="attr_AcrobaticsMiscMod2" value="(@{AcrobaticsMiscMod})" disabled="true"></td>
-		<td><input type="number" class="sheet-input-small" name="attr_AcrobaticsErrorRange2" value="(@{AcrobaticsErrorRange})" disabled="true"></td>
-		<td><input type="number" class="sheet-input-small" name="attr_AcrobaticsThreatRange2" value="(@{AcrobaticsThreatRange})" disabled="true"></td>
+                <td><input type="number" style="width:40px;"  name="attr_AcrobaticsRanks2" value="(@{AcrobaticsRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AcrobaticsDexMod" value="(@{DexterityMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_AcrobaticsMiscMod2" value="(@{AcrobaticsMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AcrobaticsErrorRange2" value="(@{AcrobaticsErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AcrobaticsThreatRange2" value="(@{AcrobaticsThreatRange})" disabled="true"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-		<!-- Mechanics -->
- 	    	<td><button type="roll" value="&{template:default} {{name=Mechanics (Wis)}} {{attack=[[1d20cs>@{MechanicsThreatRange}cf<@{MechanicsErrorRange}+@{MechanicsWisBonus}]]}}" name="attr_MechanicsWisRoll"/></td>
-                <td>Wis</td>
-                <td><input type="number" style="width:40px;" name="attr_MechanicsSkillCap2" value="@{MechanicsSkillCap}"/></td>
-                <td><input type="text" class="sheet-short" name="attr_MechanicsWisBonus" value="(@{MechanicsRanks}+@{MechanicsWisMod}+@{MechanicsMiscMod})" disabled="true"/></td>
-                <td>=</td>
-                <td><input type="number" style="width:40px;" name="attr_MechanicsRanks2" value="@{MechanicsRanks}" disabled="true"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MechanicsWisMod" value="(@{WisdomMod})" disabled="true"></td>
-                <td><input type="number" style="width:40px;" name="attr_MechanicsMiscMod2" value="@{MechanicsMiscMod}" disabled="true"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MechanicsErrorRange2" value="@{MechanicsErrorRange}" disabled="true"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MechanicsThreatRange2" value="@MechanicsThreatRange}" disabled="true"></td>
-            </tr>
+                <!-- Mechanics Wis -->
 
+                <td><button type="roll" value="&{template:default} {{name=Mechanics (Wis)}} {{attack=[[1d20cs>@{MechanicsThreatRange}cf<@{MechanicsErrorRange}+@{MechanicsWisBonus}]]}}" name="attr_MechanicsWisRoll"/></td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_MechanicsSkillCap2" value="(@{MechanicsSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_MechanicsWisBonus" value="(@{MechanicsRanks}+@{MechanicsWisMod}+@{MechanicsMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_MechanicsRanks2" value="(@{MechanicsRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MechanicsWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_MechanicsMiscMod2" value="(@{MechanicsMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MechanicsErrorRange2" value="(@{MechanicsErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MechanicsThreatRange2" value="(@{MechanicsThreatRange})" disabled="true"></td>
+
+            </tr>
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_AnalysisClassSkill" ></td>
-                <td>Analysis</td>
-                <td>Int/Wis</td>
+                <!-- Analysis Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Analysis (Int)}} {{attack=[[1d20cs>@{AnalysisThreatRange}cf<@{AnalysisErrorRange}+@{AnalysisIntBonus}]]}}" name="attr_AnalysisIntRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_AnalysisClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Analysis</td>
+                <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_AnalysisSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_AnalysisSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_AnalysisIntBonus" value="(@{AnalysisRanks}+@{AnalysisIntMod}+@{AnalysisMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_AnalysisRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_AnalysisAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AnalysisIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_AnalysisMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_AnalysisErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_AnalysisThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AnalysisErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AnalysisThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
+                <!-- Medicine Int -->
 
-                <td><input type="checkbox" name="attr_MedicineClassSkill" ></td>
-                <td>Medicine</td>
-                <td>Int/Wis</td>
+                <td><button type="roll" value="&{template:default} {{name=Medicine (Int)}} {{attack=[[1d20cs>@{MedicineThreatRange}cf<@{MedicineErrorRange}+@{MedicineIntBonus}]]}}" name="attr_MedicineIntRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_MedicineClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Medicine</td>
+                <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_MedicineSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_MedicineSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_MedicineIntBonus" value="(@{MedicineRanks}+@{MedicineIntMod}+@{MedicineMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_MedicineRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MedicineAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MedicineIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_MedicineMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MedicineErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_MedicineThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MedicineErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MedicineThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_AthleticsClassSkill" ></td>
-                <td>Athletics</td>
-                <td>Str/Con</td>
+                <!-- Analysis Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Analysis (Wis)}} {{attack=[[1d20cs>@{AnalysisThreatRange}cf<@{AnalysisErrorRange}+@{AnalysisWisBonus}]]}}" name="attr_AnalysisWisRoll"/></td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_AnalysisSkillCap2" value="(@{AnalysisSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_AnalysisWisBonus" value="(@{AnalysisRanks}+@{AnalysisWisMod}+@{AnalysisMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_AnalysisRanks2" value="(@{AnalysisRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AnalysisWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_AnalysisMiscMod2" value="(@{AnalysisMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AnalysisErrorRange2" value="(@{AnalysisErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AnalysisThreatRange2" value="(@{AnalysisThreatRange})" disabled="true"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Medicine Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Medicine (Wis)}} {{attack=[[1d20cs>@{MedicineThreatRange}cf<@{MedicineErrorRange}+@{MedicineWisBonus}]]}}" name="attr_MedicineWisRoll"/></td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_MedicineSkillCap2" value="(@{MedicineSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_MedicineWisBonus" value="(@{MedicineRanks}+@{MedicineWisMod}+@{MedicineMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_MedicineRanks2" value="(@{MedicineRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MedicineWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_MedicineMiscMod2" value="(@{MedicineMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MedicineErrorRange2" value="(@{MedicineErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_MedicineThreatRange2" value="(@{MedicineThreatRange})" disabled="true"></td>
+
+            </tr>
+            <tr>
+                <!-- Athletics Str -->
+
+                <td><button type="roll" value="&{template:default} {{name=Athletics (Str)}} {{attack=[[1d20cs>@{AthleticsThreatRange}cf<@{AthleticsErrorRange}+@{AthleticsStrBonus}]]}}" name="attr_AthleticsStrRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_AthleticsClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Athletics</td>
+                <td>Str</td>
                 <td><input type="number" style="width:40px;" name="attr_AthleticsSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_AthleticsSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_AthleticsStrBonus" value="(@{AthleticsRanks}+@{AthleticsStrMod}+@{AthleticsMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_AthleticsRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_AthleticsAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AthleticsStrMod" value="(@{StrengthMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_AthleticsMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_AthleticsErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_AthleticsThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AthleticsErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AthleticsThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_NetworkingClassSkill" ></td>
-                <td style="padding:5px;">Networking</td>
-                <td>Wis/Cha</td>
+                <!-- Networking Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Networking (Wis)}} {{attack=[[1d20cs>@{NetworkingThreatRange}cf<@{NetworkingErrorRange}+@{NetworkingWisBonus}]]}}" name="attr_NetworkingWisRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_NetworkingClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Networking</td>
+                <td>Wis</td>
                 <td><input type="number" style="width:40px;" name="attr_NetworkingSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_NetworkingSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_NetworkingWisBonus" value="(@{NetworkingRanks}+@{NetworkingWisMod}+@{NetworkingMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_NetworkingRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_NetworkingAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NetworkingWisMod" value="(@{WisdomMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_NetworkingMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_NetworkingErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_NetworkingThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NetworkingErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NetworkingThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_BlendClassSkill" ></td>
-                <td>Blend</td>
-                <td>Dex/Cha</td>
+                <!-- Athletics Con -->
+
+                <td><button type="roll" value="&{template:default} {{name=Athletics (Con)}} {{attack=[[1d20cs>@{AthleticsThreatRange}cf<@{AthleticsErrorRange}+@{AthleticsConBonus}]]}}" name="attr_AthleticsConRoll"/></td>
+                <td>Con</td>
+                <td><input type="number" style="width:40px;" name="attr_AthleticsSkillCap2" value="(@{AthleticsSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_AthleticsConBonus" value="(@{AthleticsRanks}+@{AthleticsConMod}+@{AthleticsMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_AthleticsRanks2" value="(@{AthleticsRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AthleticsConMod" value="(@{ConstitutionMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_AthleticsMiscMod2" value="(@{AthleticsMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AthleticsErrorRange2" value="(@{AthleticsErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_AthleticsThreatRange2" value="(@{AthleticsThreatRange})" disabled="true"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Networking Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Networking (Cha)}} {{attack=[[1d20cs>@{NetworkingThreatRange}cf<@{NetworkingErrorRange}+@{NetworkingChaBonus}]]}}" name="attr_NetworkingChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_NetworkingSkillCap2" value="(@{NetworkingSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_NetworkingChaBonus" value="(@{NetworkingRanks}+@{NetworkingChaMod}+@{NetworkingMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_NetworkingRanks2" value="(@{NetworkingRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NetworkingChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_NetworkingMiscMod2" value="(@{NetworkingMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NetworkingErrorRange2" value="(@{NetworkingErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NetworkingThreatRange2" value="(@{NetworkingThreatRange})" disabled="true"></td>
+
+            </tr>
+            <tr>
+                <!-- Blend Dex -->
+
+                <td><button type="roll" value="&{template:default} {{name=Blend (Dex)}} {{attack=[[1d20cs>@{BlendThreatRange}cf<@{BlendErrorRange}+@{BlendDexBonus}]]}}" name="attr_BlendDexRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_BlendClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Blend</td>
+                <td>Dex</td>
                 <td><input type="number" style="width:40px;" name="attr_BlendSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_BlendSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_BlendDexBonus" value="(@{BlendRanks}+@{BlendDexMod}+@{BlendMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_BlendRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BlendAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BlendDexMod" value="(@{DexterityMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_BlendMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BlendErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BlendThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BlendErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BlendThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_NoticeClassSkill" ></td>
-                <td>Notice</td>
+                <!-- Notice Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Notice (Wis)}} {{attack=[[1d20cs>@{NoticeThreatRange}cf<@{NoticeErrorRange}+@{NoticeWisBonus}]]}}" name="attr_NoticeWisRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_NoticeClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Notice</td>
                 <td>Wis</td>
                 <td><input type="number" style="width:40px;" name="attr_NoticeSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_NoticeSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_NoticeWisBonus" value="(@{NoticeRanks}+@{NoticeWisMod}+@{NoticeMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_NoticeRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_NoticeAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NoticeWisMod" value="(@{WisdomMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_NoticeMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_NoticeErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_NoticeThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NoticeErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_NoticeThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_BluffClassSkill" ></td>
-                <td>Bluff</td>
+                <!-- Blend Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Blend (Cha)}} {{attack=[[1d20cs>@{BlendThreatRange}cf<@{BlendErrorRange}+@{BlendChaBonus}]]}}" name="attr_BlendChaRoll"/></td>
                 <td>Cha</td>
-                <td><input type="number" style="width:40px;" name="attr_BluffSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_BluffSkillBonus" value="0/0"/></td>
+                <td><input type="number" style="width:40px;" name="attr_BlendSkillCap2" value="(@{BlendSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_BlendChaBonus" value="(@{BlendRanks}+@{BlendChaMod}+@{BlendMiscMod})" disabled="true"/></td>
                 <td>=</td>
-                <td><input type="number" style="width:40px;" name="attr_BluffRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BluffAttributeMods" value="0/0"></td>
-                <td><input type="number" style="width:40px;" name="attr_BluffMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BluffErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BluffThreatRange" value="20"></td>
+                <td><input type="number" style="width:40px;"  name="attr_BlendRanks2" value="(@{BlendRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BlendChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_BlendMiscMod2" value="(@{BlendMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BlendErrorRange2" value="(@{BlendErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BlendThreatRange2" value="(@{BlendThreatRange})" disabled="true"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_ProfessionClassSkill" ></td>
-                <td>Profession</td>
+                <!-- Profession Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Profession (Cha)}} {{attack=[[1d20cs>@{ProfessionThreatRange}cf<@{ProfessionErrorRange}+@{ProfessionChaBonus}]]}}" name="attr_ProfessionChaRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_ProfessionClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Profession</td>
                 <td>Cha</td>
                 <td><input type="number" style="width:40px;" name="attr_ProfessionSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_ProfessionSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ProfessionChaBonus" value="(@{ProfessionRanks}+@{ProfessionChaMod}+@{ProfessionMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_ProfessionRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ProfessionAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ProfessionChaMod" value="(@{CharismaMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_ProfessionMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ProfessionErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ProfessionThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ProfessionErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ProfessionThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_BureaucracyClassSkill" ></td>
-                <td style="padding:5px;">Bureaucracy</td>
+                <!-- Bluff Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Bluff (Cha)}} {{attack=[[1d20cs>@{BluffThreatRange}cf<@{BluffErrorRange}+@{BluffChaBonus}]]}}" name="attr_BluffChaRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_BluffClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Bluff</td>
                 <td>Cha</td>
-                <td><input type="number" style="width:40px;" name="attr_BureaucracySkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_BureaucracySkillBonus" value="0/0"/></td>
+                <td><input type="number" style="width:40px;" name="attr_BluffSkillCap" value="15"/></td>
+                <td><input type="number" class="sheet-short" name="attr_BluffChaBonus" value="(@{BluffRanks}+@{BluffChaMod}+@{BluffMiscMod})" disabled="true"/></td>
                 <td>=</td>
-                <td><input type="number" style="width:40px;" name="attr_BureaucracyRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BureaucracyAttributeMods" value="0/0"></td>
-                <td><input type="number" style="width:40px;" name="attr_BureaucracyMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BureaucracyErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_BureaucracyThreatRange" value="20"></td>
+                <td><input type="number" style="width:40px;" name="attr_BluffRanks" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BluffChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_BluffMiscMod" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BluffErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BluffThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
-                
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_ResolveClassSkill" ></td>
-                <td>Resolve</td>
-                <td>Con/Wis</td>
+
+                <!-- Resolve Con -->
+
+                <td><button type="roll" value="&{template:default} {{name=Resolve (Con)}} {{attack=[[1d20cs>@{ResolveThreatRange}cf<@{ResolveErrorRange}+@{ResolveConBonus}]]}}" name="attr_ResolveConRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_ResolveClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Resolve</td>
+                <td>Con</td>
                 <td><input type="number" style="width:40px;" name="attr_ResolveSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_ResolveSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ResolveConBonus" value="(@{ResolveRanks}+@{ResolveConMod}+@{ResolveMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_ResolveRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ResolveAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ResolveConMod" value="(@{ConstitutionMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_ResolveMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ResolveErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ResolveThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ResolveErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ResolveThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_ComputersClassSkill" ></td>
-                <td>Computers</td>
+                <!-- Bureaucracy Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Bureaucracy (Cha)}} {{attack=[[1d20cs>@{BureaucracyThreatRange}cf<@{BureaucracyErrorRange}+@{BureaucracyChaBonus}]]}}" name="attr_BureaucracyChaRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_BureaucracyClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Bureaucracy</td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_BureaucracySkillCap" value="15"/></td>
+                <td><input type="number" class="sheet-short" name="attr_BureaucracyChaBonus" value="(@{BureaucracyRanks}+@{BureaucracyChaMod}+@{BureaucracyMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;" name="attr_BureaucracyRanks" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BureaucracyChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_BureaucracyMiscMod" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BureaucracyErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_BureaucracyThreatRange" value="20"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Resolve Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Resolve (Wis)}} {{attack=[[1d20cs>@{ResolveThreatRange}cf<@{ResolveErrorRange}+@{ResolveWisBonus}]]}}" name="attr_ResolveWisRoll"/></td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_ResolveSkillCap2" value="(@{ResolveSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ResolveWisBonus" value="(@{ResolveRanks}+@{ResolveWisMod}+@{ResolveMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_ResolveRanks2" value="(@{ResolveRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ResolveWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_ResolveMiscMod2" value="(@{ResolveMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ResolveErrorRange2" value="(@{ResolveErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ResolveThreatRange2" value="(@{ResolveThreatRange})" disabled="true"></td>
+
+            </tr>
+            <tr>
+                <!-- Computers Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Computers (Int)}} {{attack=[[1d20cs>@{ComputersThreatRange}cf<@{ComputersErrorRange}+@{ComputersIntBonus}]]}}" name="attr_ComputersIntRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_ComputersClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Computers</td>
                 <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_ComputersSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_ComputersSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ComputersIntBonus" value="(@{ComputersRanks}+@{ComputersIntMod}+@{ComputersMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_ComputersRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ComputersAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ComputersIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_ComputersMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ComputersErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ComputersThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ComputersErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ComputersThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_ScienceClassSkill" ></td>
-                <td>Science</td>
+                <!-- Science Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Science (Int)}} {{attack=[[1d20cs>@{ScienceThreatRange}cf<@{ScienceErrorRange}+@{ScienceIntBonus}]]}}" name="attr_ScienceIntRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_ScienceClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Science</td>
                 <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_ScienceSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_ScienceSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ScienceIntBonus" value="(@{ScienceRanks}+@{ScienceIntMod}+@{ScienceMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_ScienceRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ScienceAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ScienceIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_ScienceMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ScienceErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ScienceThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ScienceErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ScienceThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_CulturesClassSkill" ></td>
-                <td>Cultures</td>
+                <!-- Cultures Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Cultures (Int)}} {{attack=[[1d20cs>@{CulturesThreatRange}cf<@{CulturesErrorRange}+@{CulturesIntBonus}]]}}" name="attr_CulturesIntRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_CulturesClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Cultures</td>
                 <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_CulturesSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_CulturesSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_CulturesIntBonus" value="(@{CulturesRanks}+@{CulturesIntMod}+@{CulturesMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_CulturesRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_CulturesAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_CulturesIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_CulturesMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_CulturesErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_CulturesThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_CulturesErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_CulturesThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_SearchClassSkill" ></td>
-                <td>Search</td>
+                <!-- Search Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Search (Int)}} {{attack=[[1d20cs>@{SearchThreatRange}cf<@{SearchErrorRange}+@{SearchIntBonus}]]}}" name="attr_SearchIntRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_SearchClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Search</td>
                 <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_SearchSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_SearchSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SearchIntBonus" value="(@{SearchRanks}+@{SearchIntMod}+@{SearchMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_SearchRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SearchAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SearchIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_SearchMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SearchErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SearchThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SearchErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SearchThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_DriveClassSkill" ></td>
-                <td>Drive</td>
+                <!-- Drive Dex -->
+
+                <td><button type="roll" value="&{template:default} {{name=Drive (Dex)}} {{attack=[[1d20cs>@{DriveThreatRange}cf<@{DriveErrorRange}+@{DriveDexBonus}]]}}" name="attr_DriveDexRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_DriveClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Drive</td>
                 <td>Dex</td>
                 <td><input type="number" style="width:40px;" name="attr_DriveSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_DriveSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_DriveDexBonus" value="(@{DriveRanks}+@{DriveDexMod}+@{DriveMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_DriveRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_DriveAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_DriveDexMod" value="(@{DexterityMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_DriveMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_DriveErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_DriveThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_DriveErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_DriveThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_SecurityClassSkill" ></td>
-                <td>Security</td>
+                <!-- Security Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Security (Int)}} {{attack=[[1d20cs>@{SecurityThreatRange}cf<@{SecurityErrorRange}+@{SecurityIntBonus}]]}}" name="attr_SecurityIntRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_SecurityClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Security</td>
                 <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_SecuritySkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_SecuritySkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SecurityIntBonus" value="(@{SecurityRanks}+@{SecurityIntMod}+@{SecurityMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_SecurityRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SecurityAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SecurityIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_SecurityMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SecurityErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SecurityThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SecurityErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SecurityThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_ElectronicsClassSkill" ></td>
-                <td>Electronics</td>
-                <td>Int/Wis</td>
+                <!-- Electronics Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Electronics (Int)}} {{attack=[[1d20cs>@{ElectronicsThreatRange}cf<@{ElectronicsErrorRange}+@{ElectronicsIntBonus}]]}}" name="attr_ElectronicsIntRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_ElectronicsClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Electronics</td>
+                <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_ElectronicsSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_ElectronicsSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ElectronicsIntBonus" value="(@{ElectronicsRanks}+@{ElectronicsIntMod}+@{ElectronicsMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_ElectronicsRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ElectronicsAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ElectronicsIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_ElectronicsMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ElectronicsErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ElectronicsThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ElectronicsErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ElectronicsThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
-                
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_SenseMotiveClassSkill" ></td>
-                <td>Sense Motive</td>
-                <td>Wis/Cha</td>
+
+                <!-- Sense Motive Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=SenseMotive (Wis)}} {{attack=[[1d20cs>@{SenseMotiveThreatRange}cf<@{SenseMotiveErrorRange}+@{SenseMotiveWisBonus}]]}}" name="attr_SenseMotiveWisRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_SenseMotiveClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>SenseMotive</td>
+                <td>Wis</td>
                 <td><input type="number" style="width:40px;" name="attr_SenseMotiveSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_SenseMotiveSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SenseMotiveWisBonus" value="(@{SenseMotiveRanks}+@{SenseMotiveWisMod}+@{SenseMotiveMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_SenseMotiveRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SenseMotiveAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SenseMotiveWisMod" value="(@{WisdomMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_SenseMotiveMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SenseMotiveErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SenseMotiveThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SenseMotiveErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SenseMotiveThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_FalsifyClassSkill" ></td>
-                <td>Falsify</td>
-                <td>Int/Wis</td>
+                <!-- Electronics Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Electronics (Wis)}} {{attack=[[1d20cs>@{ElectronicsThreatRange}cf<@{ElectronicsErrorRange}+@{ElectronicsWisBonus}]]}}" name="attr_ElectronicsWisRoll"/></td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_ElectronicsSkillCap2" value="(@{ElectronicsSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ElectronicsWisBonus" value="(@{ElectronicsRanks}+@{ElectronicsWisMod}+@{ElectronicsMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_ElectronicsRanks2" value="(@{ElectronicsRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ElectronicsWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_ElectronicsMiscMod2" value="(@{ElectronicsMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ElectronicsErrorRange2" value="(@{ElectronicsErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ElectronicsThreatRange2" value="(@{ElectronicsThreatRange})" disabled="true"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Sense Motive Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=SenseMotive (Cha)}} {{attack=[[1d20cs>@{SenseMotiveThreatRange}cf<@{SenseMotiveErrorRange}+@{SenseMotiveChaBonus}]]}}" name="attr_SenseMotiveChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_SenseMotiveSkillCap2" value="(@{SenseMotiveSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SenseMotiveChaBonus" value="(@{SenseMotiveRanks}+@{SenseMotiveChaMod}+@{SenseMotiveMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_SenseMotiveRanks2" value="(@{SenseMotiveRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SenseMotiveChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_SenseMotiveMiscMod2" value="(@{SenseMotiveMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SenseMotiveErrorRange2" value="(@{SenseMotiveErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SenseMotiveThreatRange2" value="(@{SenseMotiveThreatRange})" disabled="true"></td>
+
+            </tr>
+            <tr>
+                <!-- Falsify Int -->
+
+                <td><button type="roll" value="&{template:default} {{name=Falsify (Int)}} {{attack=[[1d20cs>@{FalsifyThreatRange}cf<@{FalsifyErrorRange}+@{FalsifyIntBonus}]]}}" name="attr_FalsifyIntRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_FalsifyClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Falsify</td>
+                <td>Int</td>
                 <td><input type="number" style="width:40px;" name="attr_FalsifySkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_FalsifySkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_FalsifyIntBonus" value="(@{FalsifyRanks}+@{FalsifyIntMod}+@{FalsifyMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_FalsifyRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_FalsifyAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_FalsifyIntMod" value="(@{IntelligenceMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_FalsifyMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_FalsifyErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_FalsifyThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_FalsifyErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_FalsifyThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_SleightOfHandClassSkill" ></td>
-                <td>Sleight Of Hand</td>
+                <!-- Sleight of Hand Dex -->
+
+                <td><button type="roll" value="&{template:default} {{name=SleightofHand (Dex)}} {{attack=[[1d20cs>@{SleightofHandThreatRange}cf<@{SleightofHandErrorRange}+@{SleightofHandDexBonus}]]}}" name="attr_SleightofHandDexRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_SleightofHandClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>SleightofHand</td>
                 <td>Dex</td>
-                <td><input type="number" style="width:40px;" name="attr_SleightOfHandSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_SleightOfHandSkillBonus" value="0/0"/></td>
+                <td><input type="number" style="width:40px;" name="attr_SleightofHandSkillCap" value="15"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SleightofHandDexBonus" value="(@{SleightofHandRanks}+@{SleightofHandDexMod}+@{SleightofHandMiscMod})" disabled="true"/></td>
                 <td>=</td>
-                <td><input type="number" style="width:40px;" name="attr_SleightOfHandRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SleightOfHandAttributeMods" value="0/0"></td>
-                <td><input type="number" style="width:40px;" name="attr_SleightOfHandMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SleightOfHandErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SleightOfHandThreatRange" value="20"></td>
+                <td><input type="number" style="width:40px;" name="attr_SleightofHandRanks" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SleightofHandDexMod" value="(@{DexterityMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_SleightofHandMiscMod" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SleightofHandErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SleightofHandThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_ImpressClassSkill" ></td>
-                <td>Impress</td>
-                <td>Cha</td>
-                <td><input type="number" style="width:40px;" name="attr_ImpressSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_ImpressSkillBonus" value="0/0"/></td>
+                <!-- Falsify Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Falsify (Wis)}} {{attack=[[1d20cs>@{FalsifyThreatRange}cf<@{FalsifyErrorRange}+@{FalsifyWisBonus}]]}}" name="attr_FalsifyWisRoll"/></td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_FalsifySkillCap2" value="(@{FalsifySkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_FalsifyWisBonus" value="(@{FalsifyRanks}+@{FalsifyWisMod}+@{FalsifyMiscMod})" disabled="true"/></td>
                 <td>=</td>
-                <td><input type="number" style="width:40px;" name="attr_ImpressRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ImpressAttributeMods" value="0/0"></td>
-                <td><input type="number" style="width:40px;" name="attr_ImpressMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ImpressErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ImpressThreatRange" value="20"></td>
+                <td><input type="number" style="width:40px;"  name="attr_FalsifyRanks2" value="(@{FalsifyRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_FalsifyWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_FalsifyMiscMod2" value="(@{FalsifyMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_FalsifyErrorRange2" value="(@{FalsifyErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_FalsifyThreatRange2" value="(@{FalsifyThreatRange})" disabled="true"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_SneakClassSkill" ></td>
-                <td>Sneak</td>
-                <td>Dex/Cha</td>
+                <!-- Sneak Dex -->
+
+                <td><button type="roll" value="&{template:default} {{name=Sneak (Dex)}} {{attack=[[1d20cs>@{SneakThreatRange}cf<@{SneakErrorRange}+@{SneakDexBonus}]]}}" name="attr_SneakDexRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_SneakClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Sneak</td>
+                <td>Dex</td>
                 <td><input type="number" style="width:40px;" name="attr_SneakSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_SneakSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SneakDexBonus" value="(@{SneakRanks}+@{SneakDexMod}+@{SneakMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_SneakRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SneakAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SneakDexMod" value="(@{DexterityMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_SneakMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SneakErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SneakThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SneakErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SneakThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_IntimidateClassSkill" ></td>
-                <td>Intimidate</td>
-                <td>Str/Wis</td>
+                <!-- Impress Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Impress (Cha)}} {{attack=[[1d20cs>@{ImpressThreatRange}cf<@{ImpressErrorRange}+@{ImpressChaBonus}]]}}" name="attr_ImpressChaRoll"/></td>
+                <td rowspan='1' style="vertical-align:text-top;"><input type="checkbox" name="attr_ImpressClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='1'>Impress</td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_ImpressSkillCap" value="15"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ImpressChaBonus" value="(@{ImpressRanks}+@{ImpressChaMod}+@{ImpressMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;" name="attr_ImpressRanks" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ImpressChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_ImpressMiscMod" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ImpressErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ImpressThreatRange" value="20"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Sneak Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Sneak (Cha)}} {{attack=[[1d20cs>@{SneakThreatRange}cf<@{SneakErrorRange}+@{SneakChaBonus}]]}}" name="attr_SneakChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_SneakSkillCap2" value="(@{SneakSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SneakChaBonus" value="(@{SneakRanks}+@{SneakChaMod}+@{SneakMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_SneakRanks2" value="(@{SneakRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SneakChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_SneakMiscMod2" value="(@{SneakMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SneakErrorRange2" value="(@{SneakErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SneakThreatRange2" value="(@{SneakThreatRange})" disabled="true"></td>
+
+            </tr>
+            <tr>
+                <!-- Intimidate Str -->
+
+                <td><button type="roll" value="&{template:default} {{name=Intimidate (Str)}} {{attack=[[1d20cs>@{IntimidateThreatRange}cf<@{IntimidateErrorRange}+@{IntimidateStrBonus}]]}}" name="attr_IntimidateStrRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_IntimidateClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Intimidate</td>
+                <td>Str</td>
                 <td><input type="number" style="width:40px;" name="attr_IntimidateSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_IntimidateSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_IntimidateStrBonus" value="(@{IntimidateRanks}+@{IntimidateStrMod}+@{IntimidateMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_IntimidateRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_IntimidateAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_IntimidateStrMod" value="(@{StrengthMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_IntimidateMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_IntimidateErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_IntimidateThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_IntimidateErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_IntimidateThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_StreetwiseClassSkill" ></td>
-                <td>Streetwise</td>
-                <td>Wis/Cha</td>
+                <!-- Streetwise Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Streetwise (Wis)}} {{attack=[[1d20cs>@{StreetwiseThreatRange}cf<@{StreetwiseErrorRange}+@{StreetwiseWisBonus}]]}}" name="attr_StreetwiseWisRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_StreetwiseClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Streetwise</td>
+                <td>Wis</td>
                 <td><input type="number" style="width:40px;" name="attr_StreetwiseSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_StreetwiseSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_StreetwiseWisBonus" value="(@{StreetwiseRanks}+@{StreetwiseWisMod}+@{StreetwiseMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_StreetwiseRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_StreetwiseAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_StreetwiseWisMod" value="(@{WisdomMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_StreetwiseMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_StreetwiseErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_StreetwiseThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_StreetwiseErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_StreetwiseThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_InvestigationClassSkill" ></td>
-                <td>Investigation</td>
-                <td>Wis/Cha</td>
+                <!-- Intimidate Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Intimidate (Wis)}} {{attack=[[1d20cs>@{IntimidateThreatRange}cf<@{IntimidateErrorRange}+@{IntimidateWisBonus}]]}}" name="attr_IntimidateWisRoll"/></td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_IntimidateSkillCap2" value="(@{IntimidateSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_IntimidateWisBonus" value="(@{IntimidateRanks}+@{IntimidateWisMod}+@{IntimidateMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_IntimidateRanks2" value="(@{IntimidateRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_IntimidateWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_IntimidateMiscMod2" value="(@{IntimidateMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_IntimidateErrorRange2" value="(@{IntimidateErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_IntimidateThreatRange2" value="(@{IntimidateThreatRange})" disabled="true"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Streetwise Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Streetwise (Cha)}} {{attack=[[1d20cs>@{StreetwiseThreatRange}cf<@{StreetwiseErrorRange}+@{StreetwiseChaBonus}]]}}" name="attr_StreetwiseChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_StreetwiseSkillCap2" value="(@{StreetwiseSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_StreetwiseChaBonus" value="(@{StreetwiseRanks}+@{StreetwiseChaMod}+@{StreetwiseMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_StreetwiseRanks2" value="(@{StreetwiseRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_StreetwiseChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_StreetwiseMiscMod2" value="(@{StreetwiseMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_StreetwiseErrorRange2" value="(@{StreetwiseErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_StreetwiseThreatRange2" value="(@{StreetwiseThreatRange})" disabled="true"></td>
+
+            </tr>
+            <tr>
+                <!-- Investigation Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Investigation (Wis)}} {{attack=[[1d20cs>@{InvestigationThreatRange}cf<@{InvestigationErrorRange}+@{InvestigationWisBonus}]]}}" name="attr_InvestigationWisRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_InvestigationClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Investigation</td>
+                <td>Wis</td>
                 <td><input type="number" style="width:40px;" name="attr_InvestigationSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_InvestigationSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_InvestigationWisBonus" value="(@{InvestigationRanks}+@{InvestigationWisMod}+@{InvestigationMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_InvestigationRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_InvestigationAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_InvestigationWisMod" value="(@{WisdomMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_InvestigationMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_InvestigationErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_InvestigationThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_InvestigationErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_InvestigationThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_SurvivalClassSkill" ></td>
-                <td>Survival</td>
-                <td>Wis/Cha</td>
-                <td><input type="number" style="width:40px;" name="attr_SurvivalSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_SurvivalSkillBonus" value="0/0"/></td>
+                <!-- Surival Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Surival (Wis)}} {{attack=[[1d20cs>@{SurivalThreatRange}cf<@{SurivalErrorRange}+@{SurivalWisBonus}]]}}" name="attr_SurivalWisRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_SurivalClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Surival</td>
+                <td>Wis</td>
+                <td><input type="number" style="width:40px;" name="attr_SurivalSkillCap" value="15"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SurivalWisBonus" value="(@{SurivalRanks}+@{SurivalWisMod}+@{SurivalMiscMod})" disabled="true"/></td>
                 <td>=</td>
-                <td><input type="number" style="width:40px;" name="attr_SurvivalRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SurvivalAttributeMods" value="0/0"></td>
-                <td><input type="number" style="width:40px;" name="attr_SurvivalMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SurvivalErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_SurvivalThreatRange" value="20"></td>
+                <td><input type="number" style="width:40px;" name="attr_SurivalRanks" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SurivalWisMod" value="(@{WisdomMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_SurivalMiscMod" value="0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SurivalErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SurivalThreatRange" value="20"></td>
+
             </tr>
-
-
             <tr>
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_ManipulateClassSkill" ></td>
-                <td>Manipulate</td>
-                <td>Wis/Cha</td>
+                <!-- Investigation Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Investigation (Cha)}} {{attack=[[1d20cs>@{InvestigationThreatRange}cf<@{InvestigationErrorRange}+@{InvestigationChaBonus}]]}}" name="attr_InvestigationChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_InvestigationSkillCap2" value="(@{InvestigationSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_InvestigationChaBonus" value="(@{InvestigationRanks}+@{InvestigationChaMod}+@{InvestigationMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_InvestigationRanks2" value="(@{InvestigationRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_InvestigationChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_InvestigationMiscMod2" value="(@{InvestigationMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_InvestigationErrorRange2" value="(@{InvestigationErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_InvestigationThreatRange2" value="(@{InvestigationThreatRange})" disabled="true"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Surival Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Surival (Cha)}} {{attack=[[1d20cs>@{SurivalThreatRange}cf<@{SurivalErrorRange}+@{SurivalChaBonus}]]}}" name="attr_SurivalChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_SurivalSkillCap2" value="(@{SurivalSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_SurivalChaBonus" value="(@{SurivalRanks}+@{SurivalChaMod}+@{SurivalMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_SurivalRanks2" value="(@{SurivalRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SurivalChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_SurivalMiscMod2" value="(@{SurivalMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SurivalErrorRange2" value="(@{SurivalErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_SurivalThreatRange2" value="(@{SurivalThreatRange})" disabled="true"></td>
+
+            </tr>
+            <tr>
+                <!-- Manipulate Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Manipulate (Wis)}} {{attack=[[1d20cs>@{ManipulateThreatRange}cf<@{ManipulateErrorRange}+@{ManipulateWisBonus}]]}}" name="attr_ManipulateWisRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_ManipulateClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Manipulate</td>
+                <td>Wis</td>
                 <td><input type="number" style="width:40px;" name="attr_ManipulateSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_ManipulateSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ManipulateWisBonus" value="(@{ManipulateRanks}+@{ManipulateWisMod}+@{ManipulateMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_ManipulateRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ManipulateAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ManipulateWisMod" value="(@{WisdomMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_ManipulateMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ManipulateErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_ManipulateThreatRange" value="20"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ManipulateErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ManipulateThreatRange" value="20"></td>
+
                 <td class="sheet-emptyColumn"></td>
 
-        	<td class="sheet-emptyColumn"></td>
-                <td><input type="checkbox" name="attr_TacticsClassSkill" ></td>
-                <td>Tactics</td>
-                <td>Wis/Cha</td>
+                <!-- Tactics Wis -->
+
+                <td><button type="roll" value="&{template:default} {{name=Tactics (Wis)}} {{attack=[[1d20cs>@{TacticsThreatRange}cf<@{TacticsErrorRange}+@{TacticsWisBonus}]]}}" name="attr_TacticsWisRoll"/></td>
+                <td rowspan='2' style="vertical-align:text-top;"><input type="checkbox" name="attr_TacticsClassSkill" ></td>
+                <td style="vertical-align:text-top;" rowspan='2'>Tactics</td>
+                <td>Wis</td>
                 <td><input type="number" style="width:40px;" name="attr_TacticsSkillCap" value="15"/></td>
-                <td><input type="text" class="sheet-short" name="attr_TacticsSkillBonus" value="0/0"/></td>
+                <td><input type="number" class="sheet-short" name="attr_TacticsWisBonus" value="(@{TacticsRanks}+@{TacticsWisMod}+@{TacticsMiscMod})" disabled="true"/></td>
                 <td>=</td>
                 <td><input type="number" style="width:40px;" name="attr_TacticsRanks" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_TacticsAttributeMods" value="0/0"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_TacticsWisMod" value="(@{WisdomMod})" disabled="true"></td>
                 <td><input type="number" style="width:40px;" name="attr_TacticsMiscMod" value="0"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_TacticsErrorRange" value="1"></td>
-                <td><input type="text" class="sheet-input-small" name="attr_TacticsThreatRange" value="20"></td>
-            </tr>    
-    
+                <td><input type="number" class="sheet-input-small" name="attr_TacticsErrorRange" value="1"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_TacticsThreatRange" value="20"></td>
+
+            </tr>
+            <tr>
+                <!-- Manipulate Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Manipulate (Cha)}} {{attack=[[1d20cs>@{ManipulateThreatRange}cf<@{ManipulateErrorRange}+@{ManipulateChaBonus}]]}}" name="attr_ManipulateChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_ManipulateSkillCap2" value="(@{ManipulateSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_ManipulateChaBonus" value="(@{ManipulateRanks}+@{ManipulateChaMod}+@{ManipulateMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_ManipulateRanks2" value="(@{ManipulateRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ManipulateChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_ManipulateMiscMod2" value="(@{ManipulateMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ManipulateErrorRange2" value="(@{ManipulateErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_ManipulateThreatRange2" value="(@{ManipulateThreatRange})" disabled="true"></td>
+
+                <td class="sheet-emptyColumn"></td>
+
+                <!-- Tactics Cha -->
+
+                <td><button type="roll" value="&{template:default} {{name=Tactics (Cha)}} {{attack=[[1d20cs>@{TacticsThreatRange}cf<@{TacticsErrorRange}+@{TacticsChaBonus}]]}}" name="attr_TacticsChaRoll"/></td>
+                <td>Cha</td>
+                <td><input type="number" style="width:40px;" name="attr_TacticsSkillCap2" value="(@{TacticsSkillCap})" disabled="true"/></td>
+                <td><input type="number" class="sheet-short" name="attr_TacticsChaBonus" value="(@{TacticsRanks}+@{TacticsChaMod}+@{TacticsMiscMod})" disabled="true"/></td>
+                <td>=</td>
+                <td><input type="number" style="width:40px;"  name="attr_TacticsRanks2" value="(@{TacticsRanks})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_TacticsChaMod" value="(@{CharismaMod})" disabled="true"></td>
+                <td><input type="number" style="width:40px;" name="attr_TacticsMiscMod2" value="(@{TacticsMiscMod})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_TacticsErrorRange2" value="(@{TacticsErrorRange})" disabled="true"></td>
+                <td><input type="number" class="sheet-input-small" name="attr_TacticsThreatRange2" value="(@{TacticsThreatRange})" disabled="true"></td>
+
+            </tr>
+
 </table>
 
 <!-- end skills table -->