diff --git a/PokemonTabletopAdventures_v3/PTA3.css b/PokemonTabletopAdventures_v3/PTA3.css
index ab0f4e448c..590c5131f4 100644
--- a/PokemonTabletopAdventures_v3/PTA3.css
+++ b/PokemonTabletopAdventures_v3/PTA3.css
@@ -97,6 +97,11 @@
   --stat-ro-spatk: #99ffff80;
   --stat-ro-spdef: #99ff9980;
   --stat-ro-spd: #ff99ff80;
+  --stat-atk-highlight: #ff9999cc;
+  --stat-def-highlight: #ffff99cc;
+  --stat-spatk-highlight: #99ffffcc;
+  --stat-spdef-highlight: #99ff99cc;
+  --stat-spd-highlight: #ff99ffcc;
 }
 
 .sheet-rolltemplate-inline-skill-roll,
@@ -593,6 +598,15 @@ div.sheet-collapsible-skill {
   position: relative;
 }
 
+div.sheet-collapsible-skill.sheet-capture {
+  grid-template-columns: 8fr 4fr 3fr 1fr;
+}
+
+div.sheet-collapsible-skill.sheet-capture > input.sheet-options-flag,
+div.sheet-collapsible-skill.sheet-capture > input.sheet-options-flag + span {
+  grid-column: 4;
+}
+
 div.sheet-collapsible-skill > input.sheet-options-flag,
 div.sheet-collapsible-skill > input.sheet-options-flag + span {
   display: block;
@@ -614,7 +628,7 @@ div.sheet-3col-centered {
 .sheet-collapsible-skill.sheet-capture > div.sheet-options {
   background: #0001;
   border: 1px solid var(--foreground-color);
-  grid-area: 2 / 1 / 2 / 4;
+  grid-area: 2 / 1 / 2 / 5;
   padding: 0 8px;
   padding-bottom: 4px;
   display: grid;
@@ -668,6 +682,25 @@ div.sheet-class-feature {
   background-size: 150px;
 }
 
+div.sheet-control-header {
+  display: grid;
+  grid-template-columns: 4fr 1fr;
+}
+
+p.sheet-pictos-font {
+  font-family: pictos;
+}
+
+div.sheet-control-header div.sheet-header-controls > p {
+  display: inline-block;
+}
+
+div.sheet-control-header div.sheet-header-controls > button[type="action"] {
+  border: none;
+  background: none;
+  box-shadow: none;
+}
+
 /* Sheet background and styling for Form Changes */
 
 input.sheet-form-setting[value="mega"] ~ div.sheet-wrapper {
@@ -1164,84 +1197,133 @@ input.sheet-character-type[value="hybrid"] ~ div.sheet-tab-hybrid {
   background-color: var(--stat-spd);
 }
 
-input.sheet-skill-color-setting[value="ATK"] + input[type="number"].sheet-skill-total,
-input.sheet-skill-color-setting[value="ATK"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller:hover,
-input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   background-color: var(--stat-ro-atk);
   border-color: #555555;
 }
 
-input.sheet-skill-color-setting[value="DEF"] + input[type="number"].sheet-skill-total,
-input.sheet-skill-color-setting[value="DEF"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller:hover,
-input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   background-color: var(--stat-ro-def);
   border-color: #555555;
 }
 
-input.sheet-skill-color-setting[value="SPATK"] + input[type="number"].sheet-skill-total,
-input.sheet-skill-color-setting[value="SPATK"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller:hover,
-input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   background-color: var(--stat-ro-spatk);
   border-color: #555555;
 }
 
-input.sheet-skill-color-setting[value="SPDEF"] + input[type="number"].sheet-skill-total,
-input.sheet-skill-color-setting[value="SPDEF"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller:hover,
-input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   background-color: var(--stat-ro-spdef);
   border-color: #555555;
 }
 
-input.sheet-skill-color-setting[value="SPD"] + input[type="number"].sheet-skill-total,
-input.sheet-skill-color-setting[value="SPD"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller:hover,
-input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   background-color: var(--stat-ro-spd);
   border-color: #555555;
 }
 
-.sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + input[type="number"].sheet-skill-total,
-.sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
+.sheet-darkmode input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller:hover,
+.sheet-darkmode input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+.sheet-darkmode input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
+  color: #dddddd;
+}
+
 .sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller:hover,
-.sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+.sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+.sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   border-color: var(--stat-atk);
-  color: var(--stat-atk);
 }
 
-.sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + input[type="number"].sheet-skill-total,
-.sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 .sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller:hover,
-.sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+.sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+.sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   border-color: var(--stat-def);
-  color: var(--stat-def);
 }
 
-.sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + input[type="number"].sheet-skill-total,
-.sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 .sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller:hover,
-.sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+.sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+.sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   border-color: var(--stat-spatk);
-  color: var(--stat-spatk);
 }
 
-.sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + input[type="number"].sheet-skill-total,
-.sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 .sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller:hover,
-.sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+.sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+.sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   border-color: var(--stat-spdef);
-  color: var(--stat-spdef);
 }
 
-.sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + input[type="number"].sheet-skill-total,
-.sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + .sheet-skill-total + button[type="roll"].sheet-skill-roller:hover,
 .sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller:hover,
-.sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller + .sheet-skill-total {
+.sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller + input.sheet-skill-total,
+.sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller + select + input.sheet-skill-total {
   border-color: var(--stat-spd);
-  color: var(--stat-spd);
+}
+
+input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="on"] + span,
+input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="2"] + span {
+  background-color: var(--foreground-color);
+}
+
+.sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="on"] + span,
+.sheet-darkmode input.sheet-skill-color-setting[value="ATK"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="2"] + span {
+  background-color: var(--stat-atk-highlight);
+}
+
+.sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="on"] + span,
+.sheet-darkmode input.sheet-skill-color-setting[value="DEF"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="2"] + span {
+  background-color: var(--stat-def-highlight);
+}
+
+.sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="on"] + span,
+.sheet-darkmode input.sheet-skill-color-setting[value="SPATK"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="2"] + span {
+  background-color: var(--stat-spatk-highlight);
+}
+
+.sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="on"] + span,
+.sheet-darkmode input.sheet-skill-color-setting[value="SPDEF"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="2"] + span {
+  background-color: var(--stat-spdef-highlight);
+}
+
+.sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="on"] + span,
+.sheet-darkmode input.sheet-skill-color-setting[value="SPD"] + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting[value="2"] + span {
+  background-color: var(--stat-spd-highlight);
+}
+
+input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller {
+  position: relative;
+}
+
+input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting + span {
+  border-radius: 50%;
+  height: 8px;
+  width: 8px;
+  position: absolute;
+  bottom: 6px;
+}
+
+input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting + span.sheet-talent1-pip {
+  right: 20px;
+}
+
+input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting + span.sheet-talent2-pip {
+  right: 8px;
+}
+
+input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting + span {
+  background-color: #00000020;
+}
+
+.sheet-darkmode input.sheet-skill-color-setting + button[type="roll"].sheet-skill-roller input.sheet-talent-pip-setting + span {
+  background-color: #ffffff20;
 }
 
 input.sheet-skill-total {
diff --git a/PokemonTabletopAdventures_v3/PTA3.html b/PokemonTabletopAdventures_v3/PTA3.html
index 3f515e1854..08a0c7320e 100644
--- a/PokemonTabletopAdventures_v3/PTA3.html
+++ b/PokemonTabletopAdventures_v3/PTA3.html
@@ -1,36 +1,34 @@
 <!-- Table of Contents: -->
 <!--
 - Character Sheet
-  - Character Page........L#58
-    - Form Buttons........L#65
+  - Character Page........L#56
+    - Form Buttons........L#63
     - Info Sections
-      - Trainer...........L#99
-      - Pokemon...........L#148
-      - Hybrid............L#294
-    - Avatar..............L#435
-    - Trainer Stats.......L#569
-    - Pokemon Stats.......L#660
-    - Skills
-      - Trainer...........L#795
-      - Pokemon/Hybrid....L#1398
-    - Capture Pokemon.....L#1599
+      - Trainer...........L#97
+      - Pokemon...........L#146
+      - Hybrid............L#295
+    - Avatar..............L#445
+    - Trainer Stats.......L#579
+    - Pokemon Stats.......L#670
+    - Skills..............L#795
+    - Capture Pokemon.....L#1457 
     - Features
-      - Origin Feature....L#1688
-      - Class Features....L#1771
-    - Passives............L#1857
-    - Moves...............L#1879
-    - Notes...............L#2139
-  - Configuration Page....L#2205
+      - Origin Feature....L#1545
+      - Class Features....L#1628
+    - Passives............L#1714
+    - Moves...............L#1736
+    - Notes...............L#1997
+  - Configuration Page....L#2063
 - Roll Templates
-  - Move-Roll.............L#2725
-  - Dual-Hit-Move-Roll....L#2858
-  - Ten-Hit-Move-Roll.....L#3023
-  - Multi-Hit-Move-Roll...L#3612
-  - Triple-Hit-Move-Roll..L#3936
-  - Skill-Roll............L#4174
-  - Inline-Skill-Roll.....L#4173
-  - Feature-Output........L#4193
-- Sheet Scripts...........L#4209
+  - Move-Roll.............L#2544
+  - Dual-Hit-Move-Roll....L#2678
+  - Ten-Hit-Move-Roll.....L#2843 
+  - Multi-Hit-Move-Roll...L#3432
+  - Triple-Hit-Move-Roll..L#3756
+  - Skill-Roll............L#3974
+  - Inline-Skill-Roll.....L#3993
+  - Feature-Output........L#4013
+- Sheet Scripts...........L#4029
 -->
 
 <!-- Background coloring strategy inspired by the GURPS sheet -->
@@ -253,11 +251,6 @@
                 <option value="quirky">Quirky</option>
                 <option value="other">Other</option>
               </select>
-              <!-- Moved to other column on Mobile -->
-              <b class="sheet-hide-on-mobile">Held Item</b>
-              <input class="sheet-top-information sheet-hide-on-mobile" name="attr_item" spellcheck="false" title="Attribute: item" type="text" />
-              <!-- Add extra space here on mobile -->
-              <p class="sheet-show-on-mobile"></br></p>
             </div>
 
             <div class="sheet-character-name-grid">
@@ -280,13 +273,21 @@
               <input class="sheet-top-information" name="attr_pokemon_sex" spellcheck="false" title="Attribute: pokemon_sex" type="text" />
               <b>Diet</b>
               <input class="sheet-top-information" name="attr_diet" spellcheck="false" title="Attribute: diet" type="text" />
-              <!-- Moved here for Mobile, intentionally arranged with Egg Group for two-word sizes -->
-              <b class="sheet-show-on-mobile">Held Item</b>
-              <input class="sheet-top-information sheet-show-on-mobile" name="attr_item" spellcheck="false" title="Attribute: item" type="text" />
               <b>Egg Group</b>
               <input class="sheet-top-information" name="attr_egg_group" spellcheck="false" title="Attribute: egg_group" type="text" />
             </div>
           </div>
+          <div class="sheet-feature-container sheet-no-background">
+            <input checked class="sheet-options-flag" name="attr_held_item_options_flag" type="checkbox" />
+            <span name="attr_held_item_flag">.</span>
+            <div class="sheet-display">
+              <b class="sheet-subsection-header">Held Item</b>
+            </div>
+            <div class="sheet-options">
+              <b class="sheet-subsection-header">Held Item</b>
+              <textarea class="sheet-2row-textarea-wide" name="attr_item" spellcheck="false" title="Attribute: item">Add details for your held item here</textarea>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -353,8 +354,6 @@
               <span class="sheet-show-on-mobile">
                 <input class="sheet-top-information" name="attr_pokemon_advanced_class" spellcheck="false" title="Attribute: pokemon_advanced_class" type="text" value=" "/>
               </span>
-              <b>Credits</b>
-              <input class="sheet-top-information sheet-long-number" name="attr_credits" title="Attribute: credits" type="number" />
               <span class="sheet-show-on-mobile">
                 <b>Level</b>
               </span>
@@ -421,8 +420,19 @@
               <input class="sheet-top-information" name="attr_egg_group" spellcheck="false" title="Attribute: egg_group" type="text" />
               <b>Diet</b>
               <input class="sheet-top-information" name="attr_diet" spellcheck="false" title="Attribute: diet" type="text" />
-              <b>Held Item</b>
-              <input class="sheet-top-information" name="attr_item" spellcheck="false" title="Attribute: item" type="text" />
+              <b>Credits</b>
+              <input class="sheet-top-information sheet-long-number" name="attr_credits" title="Attribute: credits" type="number" />
+            </div>
+          </div>
+          <div class="sheet-feature-container sheet-no-background">
+            <input checked class="sheet-options-flag" name="attr_held_item_options_flag" type="checkbox" />
+            <span name="attr_held_item_flag">.</span>
+            <div class="sheet-display">
+              <b class="sheet-subsection-header">Held Item</b>
+            </div>
+            <div class="sheet-options">
+              <b class="sheet-subsection-header">Held Item</b>
+              <textarea class="sheet-2row-textarea-wide" name="attr_item" spellcheck="false" title="Attribute: item">Add details for your held item here</textarea>
             </div>
           </div>
         </div>
@@ -782,7 +792,7 @@
 
     <!-- SKILLS -->
 
-    <div class="sheet-feature-container">
+    <div class="sheet-feature-container sheet-no-background">
       <input checked class="sheet-options-flag" name="attr_skills_options_flag" type="checkbox" />
       <span name="attr_skills_flag">-</span>
       <div class="sheet-display">
@@ -790,9 +800,20 @@
       </div>
       <div class="sheet-options">
         <input class="sheet-character-type" name="attr_character-type" type="hidden" value="pokemon" />
-        <h3 class="sheet-section-header">Skills</h3>
+        <div class="sheet-control-header">
+          <h3 class="sheet-section-header">Skills</h3>
+          <div class="sheet-header-controls">
+            <p>All Skills: </p>
+            <button name="act_collapse-all-skills" type="action">
+              <p class="sheet-pictos-font">-</p>
+            </button>
+            <button name="act_expand-all-skills" type="action">
+              <p class="sheet-pictos-font">+</p>
+            </button>
+          </div>
+        </div>
 
-        <div class="sheet-tab-trainer">
+        <div class="sheet-tab-trainer sheet-tab-pokemon sheet-tab-hybrid">
           <div class="sheet-two-columns">
             <div class="sheet-skills-column">
               <div class="sheet-collapsible-skill sheet-acrobatics">
@@ -800,6 +821,8 @@
                 <button class="sheet-skill-roller" name="roll_acrobaticscheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{acrobatics_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Acrobatics}} {{skill-roll=[[ 1d20!kh2 + @{acrobatics_total} ]]}}">
                   Acrobatics (<span name="attr_acrobatics_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_acrobaticstalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_acrobaticstalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_acrobatics_total" readonly title="Attribute: acrobatics_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_acrobatics_options_flag" type="checkbox" />
@@ -807,8 +830,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_acrobaticstalent1" value="2" title="Attribute: acrobaticstalent1" type="checkbox" />
-                    <input name="attr_acrobaticstalent2" value="2" title="Attribute: acrobaticstalent2" type="checkbox" />
+                    <input name="attr_acrobaticstalent1" title="Attribute: acrobaticstalent1" type="checkbox" value="2" />
+                    <input name="attr_acrobaticstalent2" title="Attribute: acrobaticstalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -833,6 +856,8 @@
                 <button class="sheet-skill-roller" name="roll_athleticscheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{athletics_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Athletics}} {{skill-roll=[[ 1d20!kh2 + @{athletics_total} ]]}}">
                   Athletics (<span name="attr_athletics_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_athleticstalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_athleticstalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_athletics_total" readonly title="Attribute: athletics_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_athletics_options_flag" type="checkbox" />
@@ -840,8 +865,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_athleticstalent1" value="2" title="Attribute: athleticstalent1" type="checkbox" />
-                    <input name="attr_athleticstalent2" value="2" title="Attribute: athleticstalent2" type="checkbox" />
+                    <input name="attr_athleticstalent1" title="Attribute: athleticstalent1" type="checkbox" value="2" />
+                    <input name="attr_athleticstalent2" title="Attribute: athleticstalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -866,6 +891,8 @@
                 <button class="sheet-skill-roller" name="roll_bluffcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{bluff_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Bluff/Deception}} {{skill-roll=[[ 1d20!kh2 + @{bluff_total} ]]}}">
                   Bluff/Deception (<span name="attr_bluff_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_blufftalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_blufftalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_bluff_total" readonly title="Attribute: bluff_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_bluff_options_flag" type="checkbox" />
@@ -873,8 +900,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_blufftalent1" value="2" title="Attribute: blufftalent1" type="checkbox" />
-                    <input name="attr_blufftalent2" value="2" title="Attribute: blufftalent2" type="checkbox" />
+                    <input name="attr_blufftalent1" title="Attribute: blufftalent1" type="checkbox" value="2" />
+                    <input name="attr_blufftalent2" title="Attribute: blufftalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -899,6 +926,8 @@
                 <button class="sheet-skill-roller" name="roll_concentrationcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{concentration_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Concentration}} {{skill-roll=[[ 1d20!kh2 + @{concentration_total} ]]}}">
                   Concentration (<span name="attr_concentration_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_concentrationtalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_concentrationtalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_concentration_total" readonly title="Attribute: concentration_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_concentration_options_flag" type="checkbox" />
@@ -906,8 +935,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_concentrationtalent1" value="2" title="Attribute: concentrationtalent1" type="checkbox" />
-                    <input name="attr_concentrationtalent2" value="2" title="Attribute: concentrationtalent2" type="checkbox" />
+                    <input name="attr_concentrationtalent1" title="Attribute: concentrationtalent1" type="checkbox" value="2" />
+                    <input name="attr_concentrationtalent2" title="Attribute: concentrationtalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -932,6 +961,8 @@
                 <button class="sheet-skill-roller" name="roll_constitutioncheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{constitution_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Constitution}} {{skill-roll=[[ 1d20!kh2 + @{constitution_total} ]]}}">
                   Constitution (<span name="attr_constitution_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_constitutiontalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_constitutiontalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_constitution_total" readonly title="Attribute: constitution_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_constitution_options_flag" type="checkbox" />
@@ -939,8 +970,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_constitutiontalent1" value="2" title="Attribute: constitutiontalent1" type="checkbox" />
-                    <input name="attr_constitutiontalent2" value="2" title="Attribute: constitutiontalent2" type="checkbox" />
+                    <input name="attr_constitutiontalent1" title="Attribute: constitutiontalent1" type="checkbox" value="2" />
+                    <input name="attr_constitutiontalent2" title="Attribute: constitutiontalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -961,10 +992,12 @@
               </div>
 
               <div class="sheet-collapsible-skill sheet-diplomacy">
-                <input class="sheet-skill-color-setting" name="attr_diplomacy_ability_mod" type="hidden" value="DEF" />
+                <input class="sheet-skill-color-setting" name="attr_diplomacy_ability_mod" type="hidden" value="SPDEF" />
                 <button class="sheet-skill-roller" name="roll_diplomacycheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{diplomacy_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Diplomacy/Persuasion}} {{skill-roll=[[ 1d20!kh2 + @{diplomacy_total} ]]}}">
                   Diplomacy/Persuasion (<span name="attr_diplomacy_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_diplomacytalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_diplomacytalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_diplomacy_total" readonly title="Attribute: diplomacy_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_diplomacy_options_flag" type="checkbox" />
@@ -972,8 +1005,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_diplomacytalent1" value="2" title="Attribute: diplomacytalent1" type="checkbox" />
-                    <input name="attr_diplomacytalent2" value="2" title="Attribute: diplomacytalent2" type="checkbox" />
+                    <input name="attr_diplomacytalent1" title="Attribute: diplomacytalent1" type="checkbox" value="2" />
+                    <input name="attr_diplomacytalent2" title="Attribute: diplomacytalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -994,10 +1027,12 @@
               </div>
                 
               <div class="sheet-collapsible-skill sheet-engineering">
-                <input class="sheet-skill-color-setting" name="attr_engineering_ability_mod" type="hidden" value="SPD" />
+                <input class="sheet-skill-color-setting" name="attr_engineering_ability_mod" type="hidden" value="SPATK" />
                 <button class="sheet-skill-roller" name="roll_engineeringcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{engineering_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Engineering/Operation}} {{skill-roll=[[ 1d20!kh2 + @{engineering_total} ]]}}">
                   Engineering/Operation (<span name="attr_engineering_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_engineeringtalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_engineeringtalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_engineering_total" readonly title="Attribute: engineering_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_engineering_options_flag" type="checkbox" />
@@ -1005,8 +1040,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_engineeringtalent1" value="2" title="Attribute: engineeringtalent1" type="checkbox" />
-                    <input name="attr_engineeringtalent2" value="2" title="Attribute: engineeringtalent2" type="checkbox" />
+                    <input name="attr_engineeringtalent1" title="Attribute: engineeringtalent1" type="checkbox" value="2" />
+                    <input name="attr_engineeringtalent2" title="Attribute: engineeringtalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1031,6 +1066,8 @@
                 <button class="sheet-skill-roller" name="roll_historycheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{history_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=History}} {{skill-roll=[[ 1d20!kh2 + @{history_total} ]]}}">
                   History (<span name="attr_history_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_historytalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_historytalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_history_total" readonly title="Attribute: history_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_history_options_flag" type="checkbox" />
@@ -1038,8 +1075,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_historytalent1" value="2" title="Attribute: historytalent1" type="checkbox" />
-                    <input name="attr_historytalent2" value="2" title="Attribute: historytalent2" type="checkbox" />
+                    <input name="attr_historytalent1" title="Attribute: historytalent1" type="checkbox" value="2" />
+                    <input name="attr_historytalent2" title="Attribute: historytalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1064,6 +1101,8 @@
                 <button class="sheet-skill-roller" name="roll_insightcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{insight_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Insight}} {{skill-roll=[[ 1d20!kh2 + @{insight_total} ]]}}">
                   Insight (<span name="attr_insight_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_insighttalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_insighttalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_insight_total" readonly title="Attribute: insight_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_insight_options_flag" type="checkbox" />
@@ -1071,8 +1110,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_insighttalent1" value="2" title="Attribute: insighttalent1" type="checkbox" />
-                    <input name="attr_insighttalent2" value="2" title="Attribute: insighttalent2" type="checkbox" />
+                    <input name="attr_insighttalent1" title="Attribute: insighttalent1" type="checkbox" value="2" />
+                    <input name="attr_insighttalent2" title="Attribute: insighttalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1099,6 +1138,8 @@
                 <button class="sheet-skill-roller" name="roll_investigatecheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{investigate_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Investigate}} {{skill-roll=[[ 1d20!kh2 + @{investigate_total} ]]}}">
                   Investigate (<span name="attr_investigate_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_investigatetalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_investigatetalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_investigate_total" readonly title="Attribute: investigate_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_investigate_options_flag" type="checkbox" />
@@ -1106,8 +1147,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_investigatetalent1" value="2" title="Attribute: investigatetalent1" type="checkbox" />
-                    <input name="attr_investigatetalent2" value="2" title="Attribute: investigatetalent2" type="checkbox" />
+                    <input name="attr_investigatetalent1" title="Attribute: investigatetalent1" type="checkbox" value="2" />
+                    <input name="attr_investigatetalent2" title="Attribute: investigatetalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1132,6 +1173,8 @@
                 <button class="sheet-skill-roller" name="roll_medicinecheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{medicine_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Medicine}} {{skill-roll=[[ 1d20!kh2 + @{medicine_total} ]]}}">
                   Medicine (<span name="attr_medicine_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_medicinetalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_medicinetalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_medicine_total" readonly title="Attribute: medicine_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_medicine_options_flag" type="checkbox" />
@@ -1139,8 +1182,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_medicinetalent1" value="2" title="Attribute: medicinetalent1" type="checkbox" />
-                    <input name="attr_medicinetalent2" value="2" title="Attribute: medicinetalent2" type="checkbox" />
+                    <input name="attr_medicinetalent1" title="Attribute: medicinetalent1" type="checkbox" value="2" />
+                    <input name="attr_medicinetalent2" title="Attribute: medicinetalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1165,6 +1208,8 @@
                 <button class="sheet-skill-roller" name="roll_naturecheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{nature_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Nature}} {{skill-roll=[[ 1d20!kh2 + @{nature_total} ]]}}">
                   Nature (<span name="attr_nature_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_naturetalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_naturetalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_nature_total" readonly title="Attribute: nature_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_nature_options_flag" type="checkbox" />
@@ -1172,8 +1217,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_naturetalent1" value="2" title="Attribute: naturetalent1" type="checkbox" />
-                    <input name="attr_naturetalent2" value="2" title="Attribute: naturetalent2" type="checkbox" />
+                    <input name="attr_naturetalent1" title="Attribute: naturetalent1" type="checkbox" value="2" />
+                    <input name="attr_naturetalent2" title="Attribute: naturetalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1198,6 +1243,8 @@
                 <button class="sheet-skill-roller" name="roll_perceptioncheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{perception_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perception}} {{skill-roll=[[ 1d20!kh2 + @{perception_total} ]]}}">
                   Perception (<span name="attr_perception_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_perceptiontalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_perceptiontalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_perception_total" readonly title="Attribute: perception_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_perception_options_flag" type="checkbox" />
@@ -1205,8 +1252,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_perceptiontalent1" value="2" title="Attribute: perceptiontalent1" type="checkbox" />
-                    <input name="attr_perceptiontalent2" value="2" title="Attribute: perceptiontalent2" type="checkbox" />
+                    <input name="attr_perceptiontalent1" title="Attribute: perceptiontalent1" type="checkbox" value="2" />
+                    <input name="attr_perceptiontalent2" title="Attribute: perceptiontalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1231,6 +1278,8 @@
                 <button class="sheet-skill-roller" name="roll_performcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{perform_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perform}} {{skill-roll=[[ 1d20!kh2 + @{perform_total} ]]}}">
                   Perform (<span name="attr_perform_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_performtalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_performtalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_perform_total" readonly title="Attribute: perform_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_perform_options_flag" type="checkbox" />
@@ -1238,8 +1287,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_performtalent1" value="2" title="Attribute: performtalent1" type="checkbox" />
-                    <input name="attr_performtalent2" value="2" title="Attribute: performtalent2" type="checkbox" />
+                    <input name="attr_performtalent1" title="Attribute: performtalent1" type="checkbox" value="2" />
+                    <input name="attr_performtalent2" title="Attribute: performtalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1264,6 +1313,8 @@
                 <button class="sheet-skill-roller" name="roll_handlingcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{handling_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Pokémon Handling}} {{skill-roll=[[ 1d20!kh2 + @{handling_total} ]]}}">
                   Pokémon Handling (<span name="attr_handling_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_handlingtalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_handlingtalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_handling_total" readonly title="Attribute: handling_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_handling_options_flag" type="checkbox" />
@@ -1271,8 +1322,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_handlingtalent1" value="2" title="Attribute: handlingtalent1" type="checkbox" />
-                    <input name="attr_handlingtalent2" value="2" title="Attribute: handlingtalent2" type="checkbox" />
+                    <input name="attr_handlingtalent1" title="Attribute: handlingtalent1" type="checkbox" value="2" />
+                    <input name="attr_handlingtalent2" title="Attribute: handlingtalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1297,6 +1348,8 @@
                 <button class="sheet-skill-roller" name="roll_programmingcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{programming_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Programming}} {{skill-roll=[[ 1d20!kh2 + @{programming_total} ]]}}">
                   Programming (<span name="attr_programming_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_programmingtalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_programmingtalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_programming_total" readonly title="Attribute: programming_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_programming_options_flag" type="checkbox" />
@@ -1304,8 +1357,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_programmingtalent1" value="2" title="Attribute: programmingtalent1" type="checkbox" />
-                    <input name="attr_programmingtalent2" value="2" title="Attribute: programmingtalent2" type="checkbox" />
+                    <input name="attr_programmingtalent1" title="Attribute: programmingtalent1" type="checkbox" value="2" />
+                    <input name="attr_programmingtalent2" title="Attribute: programmingtalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1330,6 +1383,8 @@
                 <button class="sheet-skill-roller" name="roll_sleightofhandcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{sleightofhand_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Sleight of Hand}} {{skill-roll=[[ 1d20!kh2 + @{sleightofhand_total} ]]}}">
                   Sleight of Hand (<span name="attr_sleightofhand_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_sleightofhandtalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_sleightofhandtalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_sleightofhand_total" readonly title="Attribute: sleightofhand_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_sleightofhand_options_flag" type="checkbox" />
@@ -1337,8 +1392,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_sleightofhandtalent1" value="2" title="Attribute: sleightofhandtalent1" type="checkbox" />
-                    <input name="attr_sleightofhandtalent2" value="2" title="Attribute: sleightofhandtalent2" type="checkbox" />
+                    <input name="attr_sleightofhandtalent1" title="Attribute: sleightofhandtalent1" type="checkbox" value="2" />
+                    <input name="attr_sleightofhandtalent2" title="Attribute: sleightofhandtalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1363,6 +1418,8 @@
                 <button class="sheet-skill-roller" name="roll_stealthcheck" type="roll"
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{stealth_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Stealth}} {{skill-roll=[[ 1d20!kh2 + @{stealth_total} ]]}}">
                   Stealth (<span name="attr_stealth_ability_mod"></span>)
+                  <input class="sheet-talent-pip-setting" name="attr_stealthtalent1" type="hidden" value="off" /><span class="sheet-talent1-pip"></span>
+                  <input class="sheet-talent-pip-setting" name="attr_stealthtalent2" type="hidden" value="off" /><span class="sheet-talent2-pip"></span>
                 </button>
                 <input class="sheet-skill-total" name="attr_stealth_total" readonly title="Attribute: stealth_total" type="number" />
                 <input checked class="sheet-options-flag" name="attr_stealth_options_flag" type="checkbox" />
@@ -1370,8 +1427,8 @@
                 <div class="sheet-options">
                   <span>
                     <b>Talents</b>
-                    <input name="attr_stealthtalent1" value="2" title="Attribute: stealthtalent1" type="checkbox" />
-                    <input name="attr_stealthtalent2" value="2" title="Attribute: stealthtalent2" type="checkbox" />
+                    <input name="attr_stealthtalent1" title="Attribute: stealthtalent1" type="checkbox" value="2" />
+                    <input name="attr_stealthtalent2" title="Attribute: stealthtalent2" type="checkbox" value="2" />
                   </span>
                   <span>
                     <b>Base Attribute</b>
@@ -1394,206 +1451,7 @@
             </div>
           </div>
         </div>
-        
-        <div class="sheet-tab-pokemon sheet-tab-hybrid">
-          <div class="sheet-character-skill-labels">
-            <b>Total</b>
-            <b>Skill Name</b>
-            <b>Talent</b>
-            <b>Bonus</b>
-            <b class="sheet-hide-on-mobile">Total</b>
-            <b class="sheet-hide-on-mobile">Skill Name</b>
-            <b class="sheet-hide-on-mobile">Talent</b>
-            <b class="sheet-hide-on-mobile">Bonus</b>
-          </div>
-    
-          <div class="sheet-two-columns">
-            <div class="sheet-character-skills">
-              <input class="sheet-skill-color-setting" name="attr_acrobatics_ability_mod" type="hidden" value="SPD" />
-              <input class="sheet-skill-total" name="attr_acrobatics_total" readonly title="Attribute: acrobatics_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_acrobaticscheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{acrobatics_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Acrobatics}} {{skill-roll=[[ 1d20!kh2 + [[ @{acrobatics_total} ]] ]]}}">
-                Acrobatics (<span name="attr_acrobatics_ability_mod"></span>)
-              </button>
-              <input name="attr_acrobaticstalent1" value="2" title="Attribute: acrobaticstalent1" type="checkbox" />
-              <input name="attr_acrobaticstalent2" value="2" title="Attribute: acrobaticstalent2" type="checkbox" />
-              <input name="attr_acrobatics" value="0" title="Attribute: acrobatics" type="number" />
 
-              <input class="sheet-skill-color-setting" name="attr_athletics_ability_mod" type="hidden" value="ATK" />
-              <input class="sheet-skill-total" name="attr_athletics_total" readonly title="Attribute: athletics_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_athleticscheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{athletics_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Athletics}} {{skill-roll=[[ 1d20!kh2 + [[ @{athletics_total} ]] ]]}}">
-                Athletics (<span name="attr_athletics_ability_mod"></span>)
-              </button>
-              <input name="attr_athleticstalent1" value="2" title="Attribute: athleticstalent1" type="checkbox" />
-              <input name="attr_athleticstalent2" value="2" title="Attribute: athleticstalent2" type="checkbox" />
-              <input name="attr_athletics" value="0" title="Attribute: athletics" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_bluff_ability_mod" type="hidden" value="SPDEF" />
-              <input class="sheet-skill-total" name="attr_bluff_total" readonly title="Attribute: bluff_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_bluffcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{bluff_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Bluff/Deception}} {{skill-roll=[[ 1d20!kh2 + [[ @{bluff_total} ]] ]]}}">
-                Bluff/Deception (<span name="attr_bluff_ability_mod"></span>)
-              </button>
-              <input name="attr_blufftalent1" value="2" title="Attribute: blufftalent1" type="checkbox" />
-              <input name="attr_blufftalent2" value="2" title="Attribute: blufftalent2" type="checkbox" />
-              <input name="attr_bluff" value="0" title="Attribute: bluff" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_concentration_ability_mod" type="hidden" value="DEF" />
-              <input class="sheet-skill-total" name="attr_concentration_total" readonly title="Attribute: concentration_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_concentrationcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{concentration_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Concentration}} {{skill-roll=[[ 1d20!kh2 + [[ @{concentration_total} ]] ]]}}">
-                Concentration (<span name="attr_concentration_ability_mod"></span>)
-              </button>
-              <input name="attr_concentrationtalent1" value="2" title="Attribute: concentrationtalent1" type="checkbox" />
-              <input name="attr_concentrationtalent2" value="2" title="Attribute: concentrationtalent2" type="checkbox" />
-              <input name="attr_concentration" value="0" title="Attribute: concentration" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_constitution_ability_mod" type="hidden" value="DEF" />
-              <input class="sheet-skill-total" name="attr_constitution_total" readonly title="Attribute: constitution_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_constitutioncheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{constitution_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Constitution}} {{skill-roll=[[ 1d20!kh2 + [[ @{constitution_total} ]] ]]}}">
-                Constitution (<span name="attr_constitution_ability_mod"></span>)
-              </button>
-              <input name="attr_constitutiontalent1" value="2" title="Attribute: constitutiontalent1" type="checkbox" />
-              <input name="attr_constitutiontalent2" value="2" title="Attribute: constitutiontalent2" type="checkbox" />
-              <input name="attr_constitution" value="0" title="Attribute: constitution" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_diplomacy_ability_mod" type="hidden" value="SPDEF" />
-              <input class="sheet-skill-total" name="attr_diplomacy_total" readonly title="Attribute: diplomacy_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_diplomacycheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{diplomacy_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Diplomacy/Persuasion}} {{skill-roll=[[ 1d20!kh2 + [[ @{diplomacy_total} ]] ]]}}">
-                Diplomacy/Persuasion (<span name="attr_diplomacy_ability_mod"></span>)
-              </button>
-              <input name="attr_diplomacytalent1" value="2" title="Attribute: diplomacytalent1" type="checkbox" />
-              <input name="attr_diplomacytalent2" value="2" title="Attribute: diplomacytalent2" type="checkbox" />
-              <input name="attr_diplomacy" value="0" title="Attribute: diplomacy" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_engineering_ability_mod" type="hidden" value="SPATK" />
-              <input class="sheet-skill-total" name="attr_engineering_total" readonly title="Attribute: engineering_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_engineeringcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{engineering_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Engineering/Operation}} {{skill-roll=[[ 1d20!kh2 + [[ @{engineering_total} ]] ]]}}">
-                Engineering/Operation (<span name="attr_engineering_ability_mod"></span>)
-              </button>
-              <input name="attr_engineeringtalent1" value="2" title="Attribute: engineeringtalent1" type="checkbox" />
-              <input name="attr_engineeringtalent2" value="2" title="Attribute: engineeringtalent2" type="checkbox" />
-              <input name="attr_engineering" value="0" title="Attribute: engineering" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_history_ability_mod" type="hidden" value="SPATK" />
-              <input class="sheet-skill-total" name="attr_history_total" readonly title="Attribute: history_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_historycheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{history_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=History}} {{skill-roll=[[ 1d20!kh2 + [[ @{history_total} ]] ]]}}">
-                History (<span name="attr_history_ability_mod"></span>)
-              </button>
-              <input name="attr_historytalent1" value="2" title="Attribute: historytalent1" type="checkbox" />
-              <input name="attr_historytalent2" value="2" title="Attribute: historytalent2" type="checkbox" />
-              <input name="attr_history" value="0" title="Attribute: history" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_insight_ability_mod" type="hidden" value="SPDEF" />
-              <input class="sheet-skill-total" name="attr_insight_total" readonly title="Attribute: insight_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_insightcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{insight_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Insight}} {{skill-roll=[[ 1d20!kh2 + [[ @{insight_total} ]] ]]}}">
-                Insight (<span name="attr_insight_ability_mod"></span>)
-              </button>
-              <input name="attr_insighttalent1" value="2" title="Attribute: insighttalent1" type="checkbox" />
-              <input name="attr_insighttalent2" value="2" title="Attribute: insighttalent2" type="checkbox" />
-              <input name="attr_insight" value="0" title="Attribute: insight" type="number" />
-            </div>
-
-            <div class="sheet-character-skills">
-              <input class="sheet-skill-color-setting" name="attr_investigate_ability_mod" type="hidden" value="SPATK" />
-              <input class="sheet-skill-total" name="attr_investigate_total" readonly title="Attribute: investigate_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_investigatecheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{investigate_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Investigate}} {{skill-roll=[[ 1d20!kh2 + [[ @{investigate_total} ]] ]]}}">
-                Investigate (<span name="attr_investigate_ability_mod"></span>)
-              </button>
-              <input name="attr_investigatetalent1" value="2" title="Attribute: investigatetalent1" type="checkbox" />
-              <input name="attr_investigatetalent2" value="2" title="Attribute: investigatetalent2" type="checkbox" />
-              <input name="attr_investigate" value="0" title="Attribute: investigate" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_medicine_ability_mod" type="hidden" value="SPATK" />
-              <input class="sheet-skill-total" name="attr_medicine_total" readonly title="Attribute: medicine_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_medicinecheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{medicine_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Medicine}} {{skill-roll=[[ 1d20!kh2 + [[ @{medicine_total} ]] ]]}}">
-                Medicine (<span name="attr_medicine_ability_mod"></span>)
-              </button>
-              <input name="attr_medicinetalent1" value="2" title="Attribute: medicinetalent1" type="checkbox" />
-              <input name="attr_medicinetalent2" value="2" title="Attribute: medicinetalent2" type="checkbox" />
-              <input name="attr_medicine" value="0" title="Attribute: medicine" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_nature_ability_mod" type="hidden" value="SPATK" />
-              <input class="sheet-skill-total" name="attr_nature_total" readonly title="Attribute: nature_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_naturecheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{nature_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Nature}} {{skill-roll=[[ 1d20!kh2 + [[ @{nature_total} ]] ]]}}">
-                Nature (<span name="attr_nature_ability_mod"></span>)
-              </button>
-              <input name="attr_naturetalent1" value="2" title="Attribute: naturetalent1" type="checkbox" />
-              <input name="attr_naturetalent2" value="2" title="Attribute: naturetalent2" type="checkbox" />
-              <input name="attr_nature" value="0" title="Attribute: nature" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_perception_ability_mod" type="hidden" value="SPDEF" />
-              <input class="sheet-skill-total" name="attr_perception_total" readonly title="Attribute: perception_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_perceptioncheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{perception_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perception}} {{skill-roll=[[ 1d20!kh2 + [[ @{perception_total} ]] ]]}}">
-                Perception (<span name="attr_perception_ability_mod"></span>)
-              </button>
-              <input name="attr_perceptiontalent1" value="2" title="Attribute: perceptiontalent1" type="checkbox" />
-              <input name="attr_perceptiontalent2" value="2" title="Attribute: perceptiontalent2" type="checkbox" />
-              <input name="attr_perception" value="0" title="Attribute: perception" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_perform_ability_mod" type="hidden" value="SPDEF" />
-              <input class="sheet-skill-total" name="attr_perform_total" readonly title="Attribute: perform_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_performcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{perform_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perform}} {{skill-roll=[[ 1d20!kh2 + [[ @{perform_total} ]] ]]}}">
-                Perform (<span name="attr_perform_ability_mod"></span>)
-              </button>
-              <input name="attr_performtalent1" value="2" title="Attribute: performtalent1" type="checkbox" />
-              <input name="attr_performtalent2" value="2" title="Attribute: performtalent2" type="checkbox" />
-              <input name="attr_perform" value="0" title="Attribute: perform" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_handling_ability_mod" type="hidden" value="SPDEF" />
-              <input class="sheet-skill-total" name="attr_handling_total" readonly title="Attribute: handling_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_handlingcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{handling_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Pokemon Handling}} {{skill-roll=[[ 1d20!kh2 + [[ @{handling_total} ]] ]]}}">
-                Pokémon Handling (<span name="attr_handling_ability_mod"></span>)
-              </button>
-              <input name="attr_handlingtalent1" value="2" title="Attribute: handlingtalent1" type="checkbox" />
-              <input name="attr_handlingtalent2" value="2" title="Attribute: handlingtalent2" type="checkbox" />
-              <input name="attr_handling" value="0" title="Attribute: handling" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_programming_ability_mod" type="hidden" value="SPATK" />
-              <input class="sheet-skill-total" name="attr_programming_total" readonly title="Attribute: programming_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_programmingcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{programming_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Programming}} {{skill-roll=[[ 1d20!kh2 + [[ @{programming_total} ]] ]]}}">
-                Programming (<span name="attr_programming_ability_mod"></span>)
-              </button>
-              <input name="attr_programmingtalent1" value="2" title="Attribute: programmingtalent1" type="checkbox" />
-              <input name="attr_programmingtalent2" value="2" title="Attribute: programmingtalent2" type="checkbox" />
-              <input name="attr_programming" value="0" title="Attribute: programming" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_sleight_ability_mod" type="hidden" value="SPD" />
-              <input class="sheet-skill-total" name="attr_sleightofhand_total" readonly title="Attribute: sleightofhand_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_sleightofhandcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{sleight_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Sleight of Hand}} {{skill-roll=[[ 1d20!kh2 + [[ @{sleightofhand_total} ]] ]]}}">
-                Sleight of Hand (<span name="attr_sleight_ability_mod"></span>)
-              </button>
-              <input name="attr_sleightofhandtalent1" value="2" title="Attribute: sleightofhandtalent1" type="checkbox" />
-              <input name="attr_sleightofhandtalent2" value="2" title="Attribute: sleightofhandtalent2" type="checkbox" />
-              <input name="attr_sleightofhand" value="0" title="Attribute: sleightofhand" type="number" />
-
-              <input class="sheet-skill-color-setting" name="attr_stealth_ability_mod" type="hidden" value="SPD" />
-              <input class="sheet-skill-total" name="attr_stealth_total" readonly title="Attribute: stealth_total" type="number" />
-              <button class="sheet-skill-roller" name="roll_stealthcheck" type="roll"
-                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{stealth_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Stealth}} {{skill-roll=[[ 1d20!kh2 + [[ @{stealth_total} ]] ]]}}">
-                Stealth (<span name="attr_stealth_ability_mod"></span>)
-              </button>
-              <input name="attr_stealthtalent1" value="2" title="Attribute: stealthtalent1" type="checkbox" />
-              <input name="attr_stealthtalent2" value="2" title="Attribute: stealthtalent2" type="checkbox" />
-              <input name="attr_stealth" value="0" title="Attribute: stealth" type="number" />
-            </div>
-          </div>
-        </div>
-        
         <!-- CAPTURE POKEMON -->
     
         <div class="sheet-tab-trainer">
@@ -1606,48 +1464,47 @@
                   value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=@{capture_ability_mod}}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Capture Pokémon}} {{skill-roll=@{capture_skill_roll}}}">
                   Capture Pokémon (<span name="attr_selected_ball"></span>)
                 </button>
+                <select class="sheet-ball-picker sheet-no-dropdown" name="attr_selected_ball" title="Select which Pokéball you want to use - this presumes the benefit is applied for conditional balls such as Quick Ball.
+                Attribute: selected_ball">
+                  <option>Basic Ball</option>
+                  <option>Great Ball</option>
+                  <option>Ultra Ball</option>
+                  <option>Park Ball</option>
+                  <option>Safari Ball</option>
+                  <option>Sport Ball</option>
+                  <option>Cherish Ball</option>
+                  <option>Luxury Ball</option>
+                  <option>Premier Ball</option>
+                  <option>Dive Ball</option>
+                  <option>Dusk Ball</option>
+                  <option>Fast Ball</option>
+                  <option>Lure Ball</option>
+                  <option>Quick Ball</option>
+                  <option>Repeat Ball</option>
+                  <option>1min Timer Ball</option>
+                  <option>2min Timer Ball</option>
+                  <option>Friend Ball</option>
+                  <option>Heal Ball</option>
+                  <option>Dream Ball</option>
+                  <option>Heavy Ball</option>
+                  <option>Level Ball</option>
+                  <option>Love Ball</option>
+                  <option>Moon Ball</option>
+                  <option>Nest Ball</option>
+                  <option>Type Ball</option>
+                  <option>Terrain Ball</option>
+                  <option>Save Ball</option>
+                  <option>Master Ball</option>
+                  <option>Custom Ball</option>
+                </select>
                 <input class="sheet-skill-total" name="attr_capture_roll_total" readonly title="Attribute: capture_roll_total" type="number" />
                 <input class="sheet-options-flag" name="attr_capture_options_flag" type="checkbox" />
                 <span name="attr_capture_flag">y</span>
                 <div class="sheet-options">
                   <span>
-                    <b>Selected Ball:</b>
-                    <select class="sheet-ball-picker" name="attr_selected_ball" title="Select which Pokéball you want to use - this presumes the benefit is applied for conditional balls such as Quick Ball.
-                    Attribute: selected_ball">
-                      <option>Basic Ball</option>
-                      <option>Great Ball</option>
-                      <option>Ultra Ball</option>
-                      <option>Park Ball</option>
-                      <option>Safari Ball</option>
-                      <option>Sport Ball</option>
-                      <option>Cherish Ball</option>
-                      <option>Luxury Ball</option>
-                      <option>Premier Ball</option>
-                      <option>Dive Ball</option>
-                      <option>Dusk Ball</option>
-                      <option>Fast Ball</option>
-                      <option>Lure Ball</option>
-                      <option>Quick Ball</option>
-                      <option>Repeat Ball</option>
-                      <option>1min Timer Ball</option>
-                      <option>2min Timer Ball</option>
-                      <option>Friend Ball</option>
-                      <option>Heal Ball</option>
-                      <option>Dream Ball</option>
-                      <option>Heavy Ball</option>
-                      <option>Level Ball</option>
-                      <option>Love Ball</option>
-                      <option>Moon Ball</option>
-                      <option>Nest Ball</option>
-                      <option>Type Ball</option>
-                      <option>Terrain Ball</option>
-                      <option>Save Ball</option>
-                      <option>Master Ball</option>
-                      <option>Custom Ball</option>
-                    </select>
                     <span title="The modifier applied to your capture rolls because of your selected Pokéball. This value can be configured for custom balls in the Configuration page.
                     Attribute: capture_display">
-                      <b>Modifier:</b>
+                      <b>Selected Ball Capture Modifier:</b>
                       <input class="sheet-total-display" name="attr_capture_display" readonly type="text" />
                     </span>
                   </span>
@@ -1659,7 +1516,7 @@
                   </span>
                   <span title="Select the attribute you want to use for Capture Pokémon.">
                     <b>Accuracy Attribute</b>
-                    <select name="attr_capture_ability_mod">
+                    <select class="sheet-no-dropdown" name="attr_capture_ability_mod">
                       <option value="ATK">Attack</option>
                       <option value="DEF">Defense</option>
                       <option value="SPATK">Special Attack</option>
@@ -4214,6 +4071,42 @@
     });
   });
 
+const skillOptionsFlags = [
+    "acrobatics_options_flag",
+    "athletics_options_flag",
+    "bluff_options_flag",
+    "concentration_options_flag",
+    "constitution_options_flag",
+    "diplomacy_options_flag",
+    "engineering_options_flag",
+    "history_options_flag",
+    "insight_options_flag",
+    "investigate_options_flag",
+    "medicine_options_flag",
+    "nature_options_flag",
+    "perception_options_flag",
+    "perform_options_flag",
+    "handling_options_flag",
+    "programming_options_flag",
+    "sleightofhand_options_flag",
+    "stealth_options_flag",
+    "capture_options_flag"
+  ];
+  
+  on(`clicked:collapse-all-skills`, function() {
+    setAllSkillFlags("off");
+  });
+
+  on(`clicked:expand-all-skills`, function() {
+    setAllSkillFlags("on");
+  });
+
+  function setAllSkillFlags(visibility) {
+    let newAttrs = {};
+    skillOptionsFlags.forEach((skill) => newAttrs[skill] = visibility );
+    setAttrs(newAttrs);
+  }
+  
   on(`clicked:activate-tera`, function () {
     performFormChange("tera", "Terastallize", "End Terastallization", true);
   });
@@ -5203,11 +5096,13 @@
   // Skill Functions
   function getSkillAttributes(statLabel, talent1Label, talent2Label, userBonusLabel, totalLabel) {
     getAttrs([statLabel, talent1Label, talent2Label, totalLabel, userBonusLabel], function (attributes) {
-      const stat = parseInt(attributes[statLabel]) || 0;
-      const talent1 = parseInt(attributes[talent1Label]) || 0;
-      const talent2 = parseInt(attributes[talent2Label]) || 0;
-      const total = parseInt(attributes[totalLabel]) || -1;
-      const userBonus = parseInt(attributes[userBonusLabel]) || 0;
+      let stat = parseInt(attributes[statLabel]) || 0;
+      let talent1 = attributes[talent1Label];
+      let talent2 = attributes[talent2Label];
+      talent1 = isNaN(talent1) ? talent1 == "on" ? 2 : 0 : parseInt(talent1);
+      talent2 = isNaN(talent2) ? talent2 == "on" ? 2 : 0 : parseInt(talent2);
+      let total = parseInt(attributes[totalLabel]) || -1;
+      let userBonus = parseInt(attributes[userBonusLabel]) || 0;
 
       assignSkillTotal(totalLabel, stat, talent1, talent2, total, userBonus);
     });
diff --git a/PokemonTabletopAdventures_v3/README.md b/PokemonTabletopAdventures_v3/README.md
index 51b246473e..bb2ecd7301 100644
--- a/PokemonTabletopAdventures_v3/README.md
+++ b/PokemonTabletopAdventures_v3/README.md
@@ -23,6 +23,13 @@ Things we want to add to the character sheet, presented in no particular order o
 
 ## Changelog
 
+### Jul 20, 2025
+- Added Collapse/Expand button for all skills, so a single click closes/opens them all
+- Added collapsing section for giving held items a description to prevent continuous cross-referencing
+- Added skill talent pips to the skill roll button
+- Moved ball selection back out of the capture configuration section
+- Updated the colour used for the highlighted skill and all skill totals in dark mode to have a better contrast
+
 ### Jul 14, 2025
 - Added a collapsing section for skills
 - Fixed an issue where pokémon nature would affect trainer stats