diff --git a/Haunted-West-Character-Sheet/haunted_west.html b/Haunted-West-Character-Sheet/haunted_west.html
index c0b324f516..5371db6e67 100644
--- a/Haunted-West-Character-Sheet/haunted_west.html
+++ b/Haunted-West-Character-Sheet/haunted_west.html
@@ -153,7 +153,7 @@
                     <div class="att1">
                         <div class="atttable">
                             <div class="attrow">
-                                 <div class="attlabel"><button type="roll" class="txtbutton" value="&{template:traitroll} [[ floor([[ [[@{awareness}]] - [[1d20+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{name=Awareness}}" name="Awareness"><span class="icond20">0</span> Awareness</button></div>
+                                 <div class="attlabel"><button type="roll" class="txtbutton" value="&{template:traitroll} [[ floor([[ [[@{awareness}]] - [[1d20]] ]] / 10) ]] {{target=$[[0@{modifier}]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{name=Awareness}}" name="Awareness"><span class="icond20">0</span> Awareness</button></div>
                                  <div class="attvalue"> <input type="number" name="attr_awareness"></div>
                               </div>
                             <div class="attrow">
@@ -184,13 +184,16 @@
                                  <div class="attlabel">Move (MPH)</div>
                                  <div class="attvalue"><input type="number" name="attr_movemph"></div>
                            </div>
+                           <div class="attrow">
+                                 <div class="attlabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[50]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Terror}}" name="Terror"><span class="icond10">00</span> Terror Tests</button></div>
+                            </div>
                         </div>
                     </div>
                     <div class="att2">
                         <div class="atttable">
                                 <div class="attrow">
                                      <div class="attlabel attlabel2">Gumption</div>
-                                     <div class="attvalue attvalue2"><input type="number" name="attr_gumption"></div>
+                                     <div class="attvalue attvalue2"><input type="number" name="attr_gumption" value="floor((@{physique}+@{awareness}+@{resolve})/10)" disabled="true" class="attr_skillattvalue"></div>
                                 </div>
                                 <div class="attrow">
                                      <div class="attlabel attlabel2">Grit</div>
@@ -202,11 +205,11 @@
                                 </div>
                                 <div class="attrow">
                                      <div class="attlabel attlabel2">Initiative</div>
-                                     <div class="attvalue attvalue2"><input type="number" name="attr_initiative"></div>
+                                     <div class="attvalue attvalue2"><input type="number" name="attr_initiative" value="floor((@{reflexes}+@{knowledge}+@{awareness})/10)" disabled="true" class="attr_skillattvalue"></div>
                                 </div>
                                 <div class="attrow">
                                      <div class="attlabel attlabel2">Stamina</div>
-                                     <div class="attvalue attvalue2"><input type="number" name="attr_stamina"></div>
+                                     <div class="attvalue attvalue2"><input type="number" name="attr_stamina" value="floor((@{physique}+@{reflexes}+@{knowledge}+@{resolve})/10)" disabled="true" class="attr_skillattvalue"></div>
                                 </div>
                                 <div class="attrow">
                                      <div class="attlabel attlabel2">XP</div>
@@ -220,12 +223,13 @@
                                     <div class="attlabel attlabel2">Move (ft)</div>
                                      <div class="attvalue attvalue2"><input type="number" name="attr_moveft"></div>
                                 </div>
+                                
                             </div>
                     </div>
                 </div> <!-- end flex section -->
                 <div class="modifier inlineblock">
                     <div class="modtext"><span class="label attrlabel inlineblock hwfont">ROLL MODIFIER</span><br/>
-                    <span>Add any roll modifiers to this box to apply them to rolls</span>
+                    <span>Add any roll modifiers to this box to apply them to the target. Use - for negative, but do not include + for positive.</span>
                     </div>
                     <div class="modinput">
                     <span class="attrvalue"><input type="number" name="attr_modifier"></span> 
@@ -236,55 +240,67 @@
         <div class="sec2 skillsection">
             <div class="atttable">
                 <div class="titleskillrow textcenter">
-                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{awareness}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Awareness Skills}}" name="Awareness Skills">Awareness Skills </button></div>
+                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{awareness}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Awareness Skills}}" name="Awareness Skills">Awareness Skills </button></div>
                     <div class="titleskillrawattvalue"><input type="number" name="attr_awarenessvalue" value="@{awareness}" disabled="true" /></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{animalhandling_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Animal Handling}}" name="Animal Handling"><span class="icond10">00</span> Animal Handling</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{animalhandling_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Animal Handling}}" name="Animal Handling"><span class="icond10">00</span> Animal Handling</button></div>
                     <div class="skillvalue"><input type="number" name="attr_animalhandling_val"> </div>
                     <div class="skillattvalue"><input type="number" name="attr_animalhandling" value="@{awareness}+@{animalhandling_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                   <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{deduction_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Deduction}}" name="Deduction"><span class="icond10">00</span> Deduction</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{deduction_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Deduction}}" name="Deduction"><span class="icond10">00</span> Deduction</button></div>
                     <div class="skillvalue"><input type="number" name="attr_deduction_val"> </div>
                     <div class="skillattvalue"><input type="number" name="attr_deduction" value="@{awareness}+@{deduction_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{longarms_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Long Arms}}" name="Long Arms (Type)"><span class="icond10">00</span> Long Arms (Type)</button></div>
+                    <div class="skilllabel withtype"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{longarms_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Long Arms}}" name="Long Arms"><span class="icond10">00</span> Long Arms</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_longarms_type"> </div>
                     <div class="skillvalue"><input type="number" name="attr_longarms_val"> </div>
                     <div class="skillattvalue"><input type="number" name="attr_longarms" value="@{awareness}+@{longarms_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div><input type="text" spellcheck="false" name="attr_longarms_type"></div>
+                <div class="skillrow">
+                    <div class="skilllabel withtype"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{longarms2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Long Arms}}" name="Long Arms2"><span class="icond10">00</span> Long Arms</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_longarms2_type"> </div>
+                    <div class="skillvalue"><input type="number" name="attr_longarms2_val"> </div>
+                    <div class="skillattvalue"><input type="number" name="attr_longarms2" value="@{awareness}+@{longarms2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{navigation_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Navigation}}" name="Navigation"><span class="icond10">00</span> Navigation (Type)</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{navigation_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Navigation}}" name="Navigation"><span class="icond10">00</span> Navigation</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_navigation_type"></div>
                     <div class="skillvalue"><input type="number" name="attr_navigation_val"> </div>
                     <div class="skillattvalue"><input type="number" name="attr_navigation" value="@{awareness}+@{navigation_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div><input type="text" spellcheck="false" name="attr_navigation_type"> </div>
+                <div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{navigation2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Navigation}}" name="Navigation2"><span class="icond10">00</span> Navigation</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_navigation2_type"></div>
+                    <div class="skillvalue"><input type="number" name="attr_navigation2_val"> </div>
+                    <div class="skillattvalue"><input type="number" name="attr_navigation2" value="@{awareness}+@{navigation2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{observation_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Observation}}" name="Observation"><span class="icond10">00</span> Observation</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{observation_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Observation}}" name="Observation"><span class="icond10">00</span> Observation</button></div>
                     <div class="skillvalue"><input type="number" name="attr_observation_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_observation" value="@{awareness}+@{observation_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{psychology_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Psychology}}" name="Psychology"><span class="icond10">00</span> Psychology</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{psychology_val}]] - [[1d100+(@{modifier}*-1)]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Psychology}}" name="Psychology"><span class="icond10">00</span> Psychology</button></div>
                     <div class="skillvalue"><input type="number" name="attr_psychology_val"> </div>
                     <div class="skillattvalue"><input type="number" name="attr_psychology" value="@{awareness}+@{psychology_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{tactics_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Tactics}}" name="Tactics (Type)*"><span class="icond10">00</span> Tactics (Type)</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{tactics_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Tactics}}" name="Tactics"><span class="icond10">00</span> Tactics</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_tactics_type"></div>
                     <div class="skillvalue"><input type="number" name="attr_tactics_val"> </div>
                     <div class="skillattvalue"><input type="number" name="attr_tactics" value="@{awareness}+@{tactics_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div><input type="text" spellcheck="false" name="attr_tactics_type"> </div>
+                <div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{tactics2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Tactics}}" name="tactics2"><span class="icond10">00</span> Tactics</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_tactics2_type"></div>
+                    <div class="skillvalue"><input type="number" name="attr_tactics2_val"> </div>
+                    <div class="skillattvalue"><input type="number" name="attr_tactics2" value="@{awareness}+@{tactics2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{tracking_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Tracking}}" name="Tracking"><span class="icond10">00</span> Tracking</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{awareness}+@{tracking_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Tracking}}" name="Tracking"><span class="icond10">00</span> Tracking</button></div>
                     <div class="skillvalue"><input type="number" name="attr_tracking_val"> </div>
                     <div class="skillattvalue"><input type="number" name="attr_tracking" value="@{awareness}+@{tracking_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
@@ -295,49 +311,53 @@
         <div class="sec1 skillsection">
             <div class="atttable">
                 <div class="titleskillrow textcenter">
-                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{physique}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Physique Skills}}" name="Physique Skills">Physique Skills</button></div>
+                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{physique}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Physique Skills}}" name="Physique Skills">Physique Skills</button></div>
                     <div class="titleskillrawattvalue"><input type="number" name="attr_physiquevalue" value="@{physique}" disabled="true" /> </div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{archery_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Archery}}" name="Archery"><span class="icond10">00</span> Archery</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{archery_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Archery}}" name="Archery"><span class="icond10">00</span> Archery</button></div>
                     <div class="skillvalue"><input type="number" name="attr_archery_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_archery11" value="@{physique}+@{archery_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{athletics_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Athletics}}" name="Athletics"><span class="icond10">00</span> Athletics</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{athletics_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Athletics}}" name="Athletics"><span class="icond10">00</span> Athletics</button></div>
                     <div class="skillvalue"><input type="number" name="attr_athletics_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_athletics" value="@{physique}+@{athletics_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{fisticuffs_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Fisticuffs}}" name="Fisticuffs"><span class="icond10">00</span> Fisticuffs</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{fisticuffs_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Fisticuffs}}" name="Fisticuffs"><span class="icond10">00</span> Fisticuffs</button></div>
                     <div class="skillvalue"><input type="number" name="attr_fisticuffs_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_fisticuffs" value="@{physique}+@{fisticuffs_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{fortitude_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Fortitude}}" name="Fortitude"><span class="icond10">00</span> Fortitude</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{fortitude_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Fortitude}}" name="Fortitude"><span class="icond10">00</span> Fortitude+</button></div>
                     <div class="skillvalue"><input type="number" name="attr_fortitude_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_fortitude" value="@{physique}+@{fortitude_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{intimidation_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Intimidation}}" name="Intimidation"><span class="icond10">00</span> Intimidation</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{intimidation_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Intimidation}}" name="Intimidation"><span class="icond10">00</span> Intimidation+</button></div>
                     <div class="skillvalue"><input type="number" name="attr_intimidation_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_intimidation" value="@{physique}+@{intimidation_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{lowprofile_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Low Profile}}" name="Low Profile"><span class="icond10">00</span> Low Profile</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{lowprofile_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Low Profile}}" name="Low Profile"><span class="icond10">00</span> Low Profile</button></div>
                     <div class="skillvalue"><input type="number" name="attr_lowprofile_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_lowprofile" value="@{physique}+@{lowprofile_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{melee_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Melee (Type)}}" name="Melee (Type)"><span class="icond10">00</span> Melee (Type)</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{melee_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Melee}}" name="Melee"><span class="icond10">00</span> Melee</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_melee_type"> </div>
                     <div class="skillvalue"><input type="number" name="attr_melee_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_melee" value="@{physique}+@{melee_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div><input type="text" spellcheck="false" name="attr_melee_type"></div>
+                <div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{melee_val2}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Melee}}" name="Melee2"><span class="icond10">00</span> Melee</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_melee_type2"> </div>
+                    <div class="skillvalue"><input type="number" name="attr_melee_val2"></div>
+                    <div class="skillattvalue"><input type="number" name="attr_melee2" value="@{physique}+@{melee_val2}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{throw_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Throw}}" name="Throw"><span class="icond10">00</span> Throw</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{physique}+@{throw_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Throw}}" name="Throw"><span class="icond10">00</span> Throw</button></div>
                     <div class="skillvalue"><input type="number" name="attr_throw_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_throw" value="@{physique}+@{throw_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
@@ -346,60 +366,75 @@
         <div class="sec2 skillsection">
             <div class="atttable">
                 <div class="titleskillrow textcenter">
-                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{reflexes}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Reflexes Skills}}" name="Reflexes Skills">Reflexes Skills </button></div>
+                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{reflexes}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Reflexes Skills}}" name="Reflexes Skills">Reflexes Skills </button></div>
                     <div class="titleskillrawattvalue"><input type="number" name="attr_reflexesvalue" value="@{reflexes}" disabled="true" /></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{acrobatics_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Acrobatics}}" name="Acrobatics*"><span class="icond10">00</span> Acrobatics*</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{acrobatics_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Acrobatics}}" name="Acrobatics*"><span class="icond10">00</span> Acrobatics*</button></div>
                     <div class="skillvalue"><input type="number" name="attr_acrobatics_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_acrobatics" value="@{reflexes}+@{acrobatics_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{dodge_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Dodge}}" name="Dodge"><span class="icond10">00</span> Dodge</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{dodge_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Dodge}}" name="Dodge"><span class="icond10">00</span> Dodge</button></div>
                     <div class="skillvalue"><input type="number" name="attr_dodge_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_dodge" value="@{reflexes}+@{dodge_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{drive_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Drive (Type)}}" name="Drive (Type)"><span class="icond10">00</span> Drive (Type)</button></div>
+                    <div class="skilllabel withtype"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{drive_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Drive}}" name="Drive"><span class="icond10">00</span> Drive</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_drive_type"> </div>
                     <div class="skillvalue"><input type="number" name="attr_drive_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_drive" value="@{reflexes}+@{drive_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div><input type="text" spellcheck="false" name="attr_drive_type">
-                    </div>
-                </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{ledgerdemain_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Legerdemain}}" name="Legerdemain"><span class="icond10">00</span> Legerdemain</button></div>
+                    <div class="skilllabel withtype"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{drive_val2}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Drive}}" name="Drive 2"><span class="icond10">00</span> Drive</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_drive_type2"> </div>
+                    <div class="skillvalue"><input type="number" name="attr_drive_val2"></div>
+                    <div class="skillattvalue"><input type="number" name="attr_drive2" value="@{reflexes}+@{drive_val2}" disabled="true" class="attr_skillattvalue"></div>
+                </div>
+
+                <div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{ledgerdemain_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Legerdemain}}" name="Legerdemain"><span class="icond10">00</span> Legerdemain</button></div>
                     <div class="skillvalue"><input type="number" name="attr_ledgerdemain_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_ledgerdemain" value="@{reflexes}+@{ledgerdemain_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{ride_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Ride (Type)}}" name="Ride (Type)"><span class="icond10">00</span> Ride (Type)</button></div>
+                    <div class="skilllabel withtype"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{ride_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Ride}}" name="Ride"><span class="icond10">00</span> Ride</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_ride_type"> </div>
                     <div class="skillvalue"><input type="number" name="attr_ride_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_ride" value="@{reflexes}+@{ride_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
+                <div class="skillrow">
+                    <div class="skilllabel withtype"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{ride_val2}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Ride}}" name="Ride 2"><span class="icond10">00</span> Ride</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_ride_type2"> </div>
+                    <div class="skillvalue"><input type="number" name="attr_ride_val2"></div>
+                    <div class="skillattvalue"><input type="number" name="attr_ride" value="@{reflexes}+@{ride_val2}" disabled="true" class="attr_skillattvalue"></div>
+                </div>
+                <!--
                 <div class="skillrow extra">
                     <div>
                         <input type="text" spellcheck="false" name="attr_ride_type">
                     </div>
                 </div>
+                -->
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{shortarms_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Short Arms (Type)}}" name="Short Arms (Type)"><span class="icond10">00</span> Short Arms (Type)</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{shortarms_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Short Arms}}" name="Short Arms"><span class="icond10">00</span> Short Arms</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_shortarms_type"> </div>
                     <div class="skillvalue"><input type="number" name="attr_shortarms_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_shortarms" value="@{reflexes}+@{shortarms_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div>
-                        <input type="text" spellcheck="false" name="attr_shortarms_type">
-                    </div>
+				<div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{shortarms2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Short Arms}}" name="Short Arms 2"><span class="icond10">00</span> Short Arms</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_shortarms2_type"> </div>
+                    <div class="skillvalue"><input type="number" name="attr_shortarms2_val"></div>
+                    <div class="skillattvalue"><input type="number" name="attr_shortarms2" value="@{reflexes}+@{shortarms2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{stealth_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Stealth}}" name="Stealth"><span class="icond10">00</span> Stealth</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{stealth_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Stealth}}" name="Stealth"><span class="icond10">00</span> Stealth</button></div>
                     <div class="skillvalue"><input type="number" name="attr_stealth_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_stealth" value="@{reflexes}+@{stealth_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{wily_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Wily}}" name="Wily"><span class="icond10">00</span> Wily</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{reflexes}+@{wily_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Wily}}" name="Wily"><span class="icond10">00</span> Wily+</button></div>
                     <div class="skillvalue"><input type="number" name="attr_wily_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_wily" value="@{reflexes}+@{wily_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
@@ -408,58 +443,62 @@
         <div class="sec3 skillsection">
             <div class="atttable">
                 <div class="titleskillrow textcenter">
-                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{personality}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Personality Skills}}" name="Personality Skills">Personality Skills </button></div>
+                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{personality}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Personality Skills}}" name="Personality Skills">Personality Skills </button></div>
                     <div class="titleskillrawattvalue"><input type="number" name="attr_personalityvalue" value="@{personality}" disabled="true" /></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{thearts_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Arts (Type)*}}" name="The Arts (Type)*"><span class="icond10">00</span> Arts (Type)*</button></div>
-                    <div class="skillvalue"><input type="number" name="attr_thearts_val"></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{thearts_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Arts*}}" name="The Arts"><span class="icond10">00</span> Arts*</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_thearts_type"></div>
+					<div class="skillvalue"><input type="number" name="attr_thearts_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_thearts" value="@{personality}+@{thearts_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div>
-                        <input type="text" spellcheck="false" name="attr_style_type">
-                    </div>
+                <div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{thearts2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Arts*}}" name="The Arts2"><span class="icond10">00</span> Arts*</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_thearts2_type"></div>
+					<div class="skillvalue"><input type="number" name="attr_thearts2_val"></div>
+                    <div class="skillattvalue"><input type="number" name="attr_thearts2" value="@{personality}+@{thearts2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{bluff_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Bluff}}" name="Bluff"><span class="icond10">00</span> Bluff</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{bluff_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Bluff}}" name="Bluff"><span class="icond10">00</span> Bluff+</button></div>
                     <div class="skillvalue"><input type="number" name="attr_bluff_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_bluff" value="@{personality}+@{bluff_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{convince_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Convince}}" name="Convince"><span class="icond10">00</span> Convince</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{convince_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Convince}}" name="Convince"><span class="icond10">00</span> Convince+</button></div>
                     <div class="skillvalue"><input type="number" name="attr_convince_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_convince" value="@{personality}+@{convince_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{deception_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Deception}}" name="Deception"><span class="icond10">00</span> Deception</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{deception_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Deception}}" name="Deception"><span class="icond10">00</span> Deception+</button></div>
                     <div class="skillvalue"><input type="number" name="attr_deception_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_deception" value="@{personality}+@{deception_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{expression_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Expression}}" name="Expression"><span class="icond10">00</span> Expression</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{expression_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Expression}}" name="Expression"><span class="icond10">00</span> Expression</button></div>
                     <div class="skillvalue"><input type="number" name="attr_expression_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_expression" value="@{personality}+@{expression_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{gambling_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Gambling}}" name="Gambling"><span class="icond10">00</span> Gambling</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{gambling_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Gambling}}" name="Gambling"><span class="icond10">00</span> Gambling</button></div>
                     <div class="skillvalue"><input type="number" name="attr_gambling_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_gambling" value="@{personality}+@{gambling_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{ingratiate_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Ingratiate}}" name="Ingratiate"><span class="icond10">00</span> Ingratiate</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{ingratiate_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Ingratiate}}" name="Ingratiate"><span class="icond10">00</span> Ingratiate</button></div>
                     <div class="skillvalue"><input type="number" name="attr_ingratiate_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_ingratiate" value="@{personality}+@{ingratiate_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{style_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Style (Type)}}" name="Style (Type)"><span class="icond10">00</span> Style (Type)</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{style_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Style}}" name="Style"><span class="icond10">00</span> Style</button></div>
+					<input class="withtype" type="text" spellcheck="false" name="attr_style_type">
                     <div class="skillvalue"><input type="number" name="attr_style_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_style" value="@{personality}+@{style_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div>
-                        <input type="text" spellcheck="false" name="attr_style_type">
-                    </div>
+                <div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{personality}+@{style2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Style}}" name="Style2"><span class="icond10">00</span> Style</button></div>
+					<input class="withtype" type="text" spellcheck="false" name="attr_style2_type">
+                    <div class="skillvalue"><input type="number" name="attr_style2_val"></div>
+                    <div class="skillattvalue"><input type="number" name="attr_style2" value="@{personality}+@{style2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
             </div>
         </div> <!-- end sec3-->
@@ -468,56 +507,60 @@
         <div class="sec1 skillsection">
             <div class="atttable">
                 <div class="titleskillrow textcenter">
-                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{technology}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Technology Skills}}" name="Technology Skills">Technology Skills </button></div>
+                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{technology}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Technology Skills}}" name="Technology Skills">Technology Skills </button></div>
                     <div class="titleskillrawattvalue"><input type="number" name="attr_technologyvalue" value="@{technology}" disabled="true" /></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{craft_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Craft (Type)}}" name="Craft (Type)"><span class="icond10">00</span> Craft (Type)</button></div>
-                    <div class="skillvalue"><input type="number" name="attr_craft_val"></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{craft_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Craft}}" name="Craft"><span class="icond10">00</span> Craft</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_craft_type"></div>
+					<div class="skillvalue"><input type="number" name="attr_craft_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_craft" value="@{technology}+@{craft_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div>
-                        <input type="text" spellcheck="false" name="attr_craft_type">
-                    </div>
+                <div class="skillrow">
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{craft2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Craft}}" name="craft2"><span class="icond10">00</span> Craft</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_craft2_type"></div>
+					<div class="skillvalue"><input type="number" name="attr_craft2_val"></div>
+                    <div class="skillattvalue"><input type="number" name="attr_craft2" value="@{technology}+@{craft2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{electronics_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Electrics*}}" name="Electronics*"><span class="icond10">00</span> Electrics*</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{electronics_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Electrics}}" name="Electrics*"><span class="icond10">00</span> Electrics*</button></div>
                     <div class="skillvalue"><input type="number" name="attr_electronics_val"></div>
                     <div class="skillattvalue"><input type="number" name="attr_electronics" value="@{technology}+@{electronics_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{lockpicking_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Lockpicking}}" name="Lockpicking"><span class="icond10">00</span> Lockpicking</button></div>
+                    <div class="skilllabel"><button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{lockpicking_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Lockpicking}}" name="Lockpicking"><span class="icond10">00</span> Lockpicking</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_lockpicking_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_lockpicking" value="@{technology}+@{lockpicking_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{mechanics_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Mechanics*}}" name="Mechanics*"><span class="icond10">00</span> Mechanics*</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{mechanics_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Mechanics*}}" name="Mechanics*"><span class="icond10">00</span> Mechanics*</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_mechanics_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_mechanics" value="@{technology}+@{mechanics_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{pilot_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Pilot (Type)}}" name="Pilot (Type)"><span class="icond10">00</span> Pilot (Type)</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{pilot_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Pilot (Type)}}" name="Pilot"><span class="icond10">00</span> Pilot</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_pilot_type"></div>
                     <div class="skillvalue"> <input type="number" name="attr_pilot_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_pilot" value="@{technology}+@{pilot_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div>
-                        <input type="text" spellcheck="false" name="attr_pilot_type">
-                    </div>
+                <div class="skillrow">
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{pilot2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Pilot)}}" name="Pilot 2"><span class="icond10">00</span> Pilot</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_pilot2_type"></div>
+                    <div class="skillvalue"> <input type="number" name="attr_pilot2_val"></div>
+                    <div class="skillattvalue"> <input type="number" name="attr_pilot2" value="@{technology}+@{pilot2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{repair_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Repair*}}" name="Repair*"><span class="icond10">00</span> Repair*</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{repair_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Repair}}" name="Repair*"><span class="icond10">00</span> Repair*</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_repair_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_repair" value="@{technology}+@{repair_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{tinker_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Tinker}}" name="Tinker"><span class="icond10">00</span> Tinker</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{tinker_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Tinker}}" name="Tinker"><span class="icond10">00</span> Tinker</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_tinker_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_tinker" value="@{technology}+@{tinker_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{weaponmaintenance_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Weapon Maintenance}}" name="Weapon Maintenance"><span class="icond10">00</span> Weapon Maintenance</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{technology}+@{weaponmaintenance_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Weapon Maintenance}}" name="Weapon Maintenance"><span class="icond10">00</span> Weapon Maint.</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_weaponmaintenance_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_weaponmaintenance" value="@{technology}+@{weaponmaintenance_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
@@ -526,111 +569,124 @@
         <div class="sec2 skillsection">
             <div class="atttable">
                 <div class="titleskillrow textcenter">
-                    <div colspan="2" class="skilltitle"> <button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{knowledge}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Knowledge Skills}}" name="Knowledge Skills">Knowledge Skills </button></div>
+                    <div colspan="2" class="skilltitle"> <button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{knowledge}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Knowledge Skills}}" name="Knowledge Skills">Knowledge Skills </button></div>
                     <div class="titleskillrawattvalue"> <input type="number" name="attr_knowledgevalue" value="@{knowledge}" disabled="true" /></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{counterfeiting_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Counterfeiting*}}" name="Counterfeiting*"><span class="icond10">00</span> Counterfeiting*</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{counterfeiting_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Counterfeiting}}" name="Counterfeiting*"><span class="icond10">00</span> Counterfeiting*</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_counterfeiting_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_counterfeiting" value="@{knowledge}+@{counterfeiting_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{firstiaid_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=First Aid}}" name="First Aid"><span class="icond10">00</span> First Aid</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{firstiaid_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=First Aid}}" name="First Aid"><span class="icond10">00</span> First Aid</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_firstaid_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_firstiaid" value="@{knowledge}+@{firstaid_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{medicine_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Medicine*}}" name="Medicine*"><span class="icond10">00</span> Medicine*</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{medicine_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Medicine}}" name="Medicine*"><span class="icond10">00</span> Medicine*</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_medicine_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_medicine" value="@{knowledge}+@{medicine_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{language_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Language (Type)*}}" name="Language (Type)*"><span class="icond10">00</span> Language (Type)*</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{language_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Language}}" name="Language"><span class="icond10">00</span> Language*</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_language_type"></div>
                     <div class="skillvalue"> <input type="number" name="attr_language_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_language" value="@{knowledge}+@{language_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div>
-                        <input type="text" spellcheck="false" name="attr_language_type">
-                    </div>
+				<div class="skillrow">
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{language2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Language}}" name="language2*"><span class="icond10">00</span> Language*</button></div>
+                    <div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_language2_type"></div>
+                    <div class="skillvalue"> <input type="number" name="attr_language2_val"></div>
+                    <div class="skillattvalue"> <input type="number" name="attr_language2" value="@{knowledge}+@{language2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{logic_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Logic}}" name="Logic"><span class="icond10">00</span> Logic</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{logic_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Logic}}" name="Logic"><span class="icond10">00</span> Logic</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_logic_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_logic" value="@{knowledge}+@{logic_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{scholar_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Scholar (Type)}}" name="Scholar (Type)"><span class="icond10">00</span> Scholar (Type)</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{scholar_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Scholar}}" name="Scholar"><span class="icond10">00</span> Scholar</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_scholar_type"></div>
                     <div class="skillvalue"> <input type="number" name="attr_scholar_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_scholar" value="@{knowledge}+@{scholar_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div><input type="text" spellcheck="false" name="attr_scholar_type"></div>
+				<div class="skillrow">
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{scholar2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Scholar}}" name="Scholar2"><span class="icond10">00</span> Scholar</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_scholar2_type"></div>
+                    <div class="skillvalue"> <input type="number" name="attr_scholar2_val"></div>
+                    <div class="skillattvalue"> <input type="number" name="attr_scholar2" value="@{knowledge}+@{scholar2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
+
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{science_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Science (Type)*}}" name="Science (Type)*"><span class="icond10">00</span> Science (Type)*</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{science_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Science}}" name="Science"><span class="icond10">00</span> Science*</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_science_type"></div>
                     <div class="skillvalue"> <input type="number" name="attr_science_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_science" value="@{knowledge}+@{science_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div>
-                        <input type="text" spellcheck="false" name="attr_science_type">
-                    </div>
+                <div class="skillrow">
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{science2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Science}}" name="Science2"><span class="icond10">00</span> Science*</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_science2_type"></div>
+                    <div class="skillvalue"> <input type="number" name="attr_science2_val"></div>
+                    <div class="skillattvalue"> <input type="number" name="attr_science2" value="@{knowledge}+@{science2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{trade_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Trade (Type)}}" name="Trade (Type)"><span class="icond10">00</span> Trade (Type)</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{trade_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Trade}}" name="Trade"><span class="icond10">00</span> Trade</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_trade_type"></div>
                     <div class="skillvalue"> <input type="number" name="attr_trade_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_trade" value="@{knowledge}+@{trade_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
-                <div class="skillrow extra">
-                    <div> <input type="text" spellcheck="false" name="attr_trade_type"></div>
+                <div class="skillrow">
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{knowledge}+@{trade2_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Trade}}" name="Trade2"><span class="icond10">00</span> Trade</button></div>
+					<div class="skilltypebox"><input class="withtype" type="text" spellcheck="false" name="attr_trade2_type"></div>
+                    <div class="skillvalue"> <input type="number" name="attr_trade2_val"></div>
+                    <div class="skillattvalue"> <input type="number" name="attr_trade2" value="@{knowledge}+@{trade2_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
             </div>
         </div> <!-- end sec2-->
         <div class="sec3 skillsection">
             <div class="atttable">
                 <div class="titleskillrow textcenter">
-                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{resolve}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Resolve Skills}}" name="Resolve">Resolve Skills</button></div>
+                    <div colspan="2" class="skilltitle"><button type="roll" class="txtbutton hwfont" value="&{template:custom} [[ floor([[ [[@{resolve}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Resolve Skills}}" name="Resolve">Resolve Skills</button></div>
                     <div class="titleskillrawattvalue"> <input type="number" name="attr_resolvevalue" value="@{resolve}" disabled="true" /></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{business_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Business}}" name="Business"><span class="icond10">00</span> Business</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{business_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Business}}" name="Business"><span class="icond10">00</span> Business</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_business_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_business" value="@{resolve}+@{business_val}" disabled="true" class="attr_skillattvalue">
                     </div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{commands_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Command}}" name="Command"><span class="icond10">00</span> Command</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{commands_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Command}}" name="Command"><span class="icond10">00</span> Command</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_commands_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_commands" value="@{resolve}+@{commands_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{explosive_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Explosive*}}" name="Explosive*"><span class="icond10">00</span> Explosive*</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{explosive_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Explosive}}" name="Explosive*"><span class="icond10">00</span> Explosive*</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_explosive_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_explosive" value="@{resolve}+@{explosive_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{negotiations_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Negotiations}}" name="Negotiations"><span class="icond10">00</span> Negotiations</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{negotiations_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Negotiations}}" name="Negotiations"><span class="icond10">00</span> Negotiations</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_negotiations_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_negotiations" value="@{resolve}+@{negotiations_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{research_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Research}}" name="Research"><span class="icond10">00</span> Research</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{research_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Research}}" name="Research"><span class="icond10">00</span> Research</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_research_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_research" value="@{resolve}+@{research_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{resilience_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Resilience}}" name="Resilience"><span class="icond10">00</span> Resilience</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{resilience_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Resilience}}" name="Resilience"><span class="icond10">00</span> Resilience</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_resilience_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_resilience" value="@{resolve}+@{resilience_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{survival_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Survival}}" name="Survival"><span class="icond10">00</span> Survival</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{survival_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Survival}}" name="Survival"><span class="icond10">00</span> Survival</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_survival_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_survival" value="@{resolve}+@{survival_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
                 <div class="skillrow">
-                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{theology_val}]] - [[1d100+@{modifier}]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Theology}}" name="Theology"><span class="icond10">00</span> Theology</button></div>
+                    <div class="skilllabel"> <button type="roll" class="txtbutton" value="&{template:custom} [[ floor([[ [[@{resolve}+@{theology_val}]] - [[1d100+@{modifier}*-1]] ]] / 10) ]] {{target=$[[0]]}} {{rawroll=$[[1]]}} {{difference=$[[2]]}} {{jacks=$[[3]]}} {{name=Theology}}" name="Theology"><span class="icond10">00</span> Theology</button></div>
                     <div class="skillvalue"> <input type="number" name="attr_theology_val"></div>
                     <div class="skillattvalue"> <input type="number" name="attr_theology" value="@{resolve}+@{theology_val}" disabled="true" class="attr_skillattvalue"></div>
                 </div>
@@ -960,4 +1016,4 @@
             });
         });
     });
-</script>
\ No newline at end of file
+</script>