diff --git a/PokemonTabletopAdventures_v3/PTA3.css b/PokemonTabletopAdventures_v3/PTA3.css
index d3f1a9e519..ba829777a1 100644
--- a/PokemonTabletopAdventures_v3/PTA3.css
+++ b/PokemonTabletopAdventures_v3/PTA3.css
@@ -4,7 +4,8 @@
 .sheet-rolltemplate-ten-hit-move-roll,
 .sheet-rolltemplate-multi-hit-move-roll,
 .sheet-rolltemplate-triple-hit-move-roll,
-.sheet-rolltemplate-feature-output {
+.sheet-rolltemplate-feature-output,
+.sheet-rolltemplate-inline-skill-roll {
   --poke-bug: #c6d16e;
   --poke-bug-background: #ffffb280;
   --poke-bug-shaded: #828d2a;
@@ -98,6 +99,7 @@
   --stat-ro-spd: #ff99ff80;
 }
 
+.sheet-rolltemplate-inline-skill-roll,
 .sheet-rolltemplate-skill-roll {
   --atk-gradient: #bb5555;
   --atk-header: #ff9999;
@@ -1222,27 +1224,151 @@ button[type="roll"].sheet-stat-roller:hover {
 
 /* Roll Templates */
 
+/* Inline Skill Roll */
+
+.sheet-rolltemplate-inline-skill-roll {
+  --header-text: #000000;
+  --main-text: #000000;
+  --odd-row-bg: #d9d9d6;
+  --row-bg: #e9e9e9;
+}
+
+.sheet-rolltemplate-darkmode.sheet-rolltemplate-inline-skill-roll {
+  --header-text: #dddddd;
+  --main-text: #dddddd;
+  --odd-row-bg: #303030;
+  --row-bg: #404040;
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-labelled-table-wrapper {
+  display: grid;
+  grid-column-gap: 0px;
+  grid-template-columns: 5% 95%;
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-labelled-table-wrapper span.sheet-border-label {
+  background: var(--header-bg);
+  border: 1px solid var(--border-color);
+  border-left: none;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  border-collapse: separate;
+  color: var(--main-text);
+  font-size: 12px;
+  height: auto;
+  padding-right: 2px;
+  text-align: center;
+  text-transform: uppercase;
+  font-weight: bold;
+  transform: scale(-1, -1);
+  width: 100%;
+  writing-mode: vertical-lr;
+  -webkit-text-stroke: 0.5px var(--poke-all-dark-background);
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-container table.sheet-inline-skill-template {
+  background: var(--row-bg);
+  border: 1px solid var(--border-color);
+  border-left: none;
+  border-bottom-right-radius: 4px;
+  border-top-right-radius: 4px;
+  border-collapse: separate;
+  box-sizing: border-box;
+  color: var(--main-text);
+  font-size: 12px;
+  height: 100%;
+  line-height: 2em;
+  overflow: clip;
+  padding-left: 2px;
+  width: 100%;
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-container table.sheet-inline-skill-template td.sheet-label {
+  font-weight: bold;
+  padding-left: 4px;
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-container table.sheet-inline-skill-template td.sheet-subhead {
+  border-bottom: 1px solid var(--odd-row-bg);
+  font-size: 12px;
+  font-style: italic;
+  padding-left: 4px;
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-container table.sheet-inline-skill-template a {
+  color: var(--header-text);
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-container table.sheet-inline-skill-template .sheet-skill-roll .inlinerollresult {
+  background: inherit;
+  border: none;
+  font-size: inherit;
+  padding: 0px;
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-rolltemplate-color-setting-atk-skill {
+  --border-color: var(--poke-all-dark-background);
+  --header-bg: var(--atk-gradient);
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-rolltemplate-color-setting-def-skill {
+  --border-color: var(--poke-all-dark-background);
+  --header-bg: var(--def-gradient);
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-rolltemplate-color-setting-spatk-skill {
+  --border-color: var(--poke-all-dark-background);
+  --header-bg: var(--spatk-gradient);
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-rolltemplate-color-setting-spdef-skill {
+  --border-color: var(--poke-all-dark-background);
+  --header-bg: var(--spdef-gradient);
+}
+
+.sheet-rolltemplate-inline-skill-roll .sheet-rolltemplate-color-setting-spd-skill {
+  --border-color: var(--poke-all-dark-background);
+  --header-bg: var(--spd-gradient);
+}
+
+
+.sheet-rolltemplate-inline-skill-roll.sheet-rolltemplate-darkmode .sheet-rolltemplate-color-setting-atk-skill {
+  --border-color: var(--atk-gradient);
+  --header-bg: var(--atk-header-dark);
+}
+
+.sheet-rolltemplate-inline-skill-roll.sheet-rolltemplate-darkmode .sheet-rolltemplate-color-setting-def-skill {
+  --border-color: var(--def-gradient);
+  --header-bg: var(--def-header-dark);
+}
+
+.sheet-rolltemplate-inline-skill-roll.sheet-rolltemplate-darkmode .sheet-rolltemplate-color-setting-spatk-skill {
+  --border-color: var(--spatk-gradient);
+  --header-bg: var(--spatk-header-dark);
+}
+
+.sheet-rolltemplate-inline-skill-roll.sheet-rolltemplate-darkmode .sheet-rolltemplate-color-setting-spdef-skill {
+  --border-color: var(--spdef-gradient);
+  --header-bg: var(--spdef-header-dark);
+}
+
+.sheet-rolltemplate-inline-skill-roll.sheet-rolltemplate-darkmode .sheet-rolltemplate-color-setting-spd-skill {
+  --border-color: var(--spd-gradient);
+  --header-bg: var(--spd-header-dark);
+}
+
+
+/* Other Templates */
+
 .sheet-rolltemplate-move-roll,
 .sheet-rolltemplate-dual-hit-move-roll,
 .sheet-rolltemplate-ten-hit-move-roll,
 .sheet-rolltemplate-multi-hit-move-roll,
 .sheet-rolltemplate-triple-hit-move-roll,
-.sheet-rolltemplate-feature-output {
-  --header-text: black;
-}
-
+.sheet-rolltemplate-feature-output,
 .sheet-rolltemplate-skill-roll {
-  --header-text: black;
-}
-
-.sheet-rolltemplate-move-roll,
-.sheet-rolltemplate-dual-hit-move-roll,
-.sheet-rolltemplate-ten-hit-move-roll,
-.sheet-rolltemplate-multi-hit-move-roll,
-.sheet-rolltemplate-triple-hit-move-roll,
-.sheet-rolltemplate-skill-roll,
-.sheet-rolltemplate-feature-output {
-  --main-text: black;
+  --header-text: #000000;
+  --main-text: #000000;
   --odd-row-bg: #d9d9d6;
   --row-bg: #e9e9e9;
   text-transform: capitalize;
@@ -1259,6 +1385,7 @@ button[type="roll"].sheet-stat-roller:hover {
   --main-text: #dddddd;
   --odd-row-bg: #303030;
   --row-bg: #404040;
+  text-transform: capitalize;
 }
 
 .sheet-rolltemplate-color-setting-bug-move {
@@ -1521,8 +1648,12 @@ button[type="roll"].sheet-stat-roller:hover {
 .sheet-rolltemplate-triple-hit-move-roll .sheet-container table.sheet-move-template,
 .sheet-rolltemplate-skill-roll .sheet-container table.sheet-skill-template,
 .sheet-rolltemplate-feature-output .sheet-container table.sheet-feature-template {
-  border: 1px solid;
-  border-color: var(--border-color);
+  border: 1px solid var(--border-color);
+  border-radius: 4px;
+  border-collapse: separate;
+  border-spacing: 0px;
+  box-sizing: border-box;
+  overflow: clip;
   color: var(--main-text);
   font-size: 12px;
   line-height: 1em;
@@ -1738,8 +1869,8 @@ button[type="roll"].sheet-stat-roller:hover {
 .sheet-rolltemplate-ten-hit-move-roll .sheet-container table.sheet-move-template td.sheet-subhead,
 .sheet-rolltemplate-multi-hit-move-roll .sheet-container table.sheet-move-template td.sheet-subhead,
 .sheet-rolltemplate-triple-hit-move-roll .sheet-container table.sheet-move-template td.sheet-subhead,
-.sheet-rolltemplate-skill-roll .sheet-container table.sheet-skill-template td.sheet-subhead,
-.sheet-rolltemplate-feature-output .sheet-container table.sheet-feature-template td.sheet-subhead {
+.sheet-rolltemplate-feature-output .sheet-container table.sheet-feature-template td.sheet-subhead,
+.sheet-rolltemplate-skill-roll .sheet-container table.sheet-skill-template td.sheet-subhead {
   padding: 4px;
   background: var(--box-bg);
   font-size: 12px;
diff --git a/PokemonTabletopAdventures_v3/PTA3.html b/PokemonTabletopAdventures_v3/PTA3.html
index 8cc504f7d9..4089faf75a 100644
--- a/PokemonTabletopAdventures_v3/PTA3.html
+++ b/PokemonTabletopAdventures_v3/PTA3.html
@@ -8,6 +8,9 @@
     <input name="attr_publicity_label" type="hidden" value="Rolling Publicly" />
     <input name="attr_publicity_roll" type="hidden" value="" />
     <button class="sheet-page-selection-option" name="act_toggle-roll-publicity" type="action"><span name="attr_publicity_label"></span></button>
+    <input name="attr_skill_template_label" type="hidden" value="Original Style" />
+    <input name="attr_skill_template" type="hidden" value="skill-roll" />
+    <button class="sheet-page-selection-option" name="act_toggle-skill-template" type="action"><span name="attr_skill_template_label"></span></button>
   </div>
 
   <input class="sheet-selected-page" name="attr_selected-page" type="hidden" value="configuration-page" />
@@ -359,7 +362,7 @@
               <b>Attack</b><br />
               <input class="sheet-stat-ball-color" name="attr_ATK" title="Attribute: ATK" type="number" readonly /><br />
               <button class="sheet-stat-roller" name="roll_attack_check" type="roll"
-                value="@{publicity_roll} &{template:skill-roll} {{base-attribute=atk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Attack Check}} {{skill-roll=[[ 1d20 + [[ @{ATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=atk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Attack Check}} {{skill-roll=[[ 1d20 + [[ @{ATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
                 <span name="attr_ATKMOD" title="Attribute: ATKMOD"></span>
               </button>
               <br />
@@ -369,7 +372,7 @@
               <b>Defense</b><br />
               <input class="sheet-stat-ball-color" name="attr_DEF" title="Attribute: DEF" type="number" readonly /><br />
               <button class="sheet-stat-roller" name="roll_defense_check" type="roll"
-                value="@{publicity_roll} &{template:skill-roll} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Defense Check}} {{skill-roll=[[ 1d20 + [[ @{DEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Defense Check}} {{skill-roll=[[ 1d20 + [[ @{DEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
                 <span name="attr_DEFMOD" title="Attribute: DEFMOD"></span>
               </button>
               <br />
@@ -379,7 +382,7 @@
               <b>Special Attack</b><br />
               <input class="sheet-stat-ball-color" name="attr_SPATK" title="Attribute: SPATK" type="number" readonly /><br />
               <button class="sheet-stat-roller" name="roll_special_attack_check" type="roll"
-                value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Attack Check}} {{skill-roll=[[ 1d20 + [[ @{SPATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Attack Check}} {{skill-roll=[[ 1d20 + [[ @{SPATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
                 <span name="attr_SPATKMOD" title="Attribute: SPATKMOD"></span>
               </button>
               <br />
@@ -389,7 +392,7 @@
               <b>Special Defense</b><br />
               <input class="sheet-stat-ball-color" name="attr_SPDEF" title="Attribute: SPDEF" type="number" readonly /><br />
               <button class="sheet-stat-roller" name="roll_special_defense_check" type="roll"
-                value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Defense Check}} {{skill-roll=[[ 1d20 + [[ @{SPDEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Defense Check}} {{skill-roll=[[ 1d20 + [[ @{SPDEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
                 <span name="attr_SPDEFMOD" title="Attribute: SPDEFMOD"></span>
               </button>
               <br />
@@ -399,7 +402,7 @@
               <b>Speed</b><br />
               <input class="sheet-stat-ball-color" name="attr_SPD" title="Attribute: SPD" type="number" readonly /><br />
               <button class="sheet-stat-roller" name="roll_speed_check" type="roll"
-                value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Speed Check}} {{skill-roll=[[ 1d20 + [[ @{SPDMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Speed Check}} {{skill-roll=[[ 1d20 + [[ @{SPDMOD} + ?{Temp Modifier|0} ]] ]]}}">
                 <span name="attr_SPDMOD" title="Attribute: SPDMOD"></span>
               </button>
               <br />
@@ -423,7 +426,7 @@
                 <b>Attack</b><br />
                 <input class="sheet-stat-ball-color" name="attr_ATK" title="Attribute: ATK" type="number" readonly /><br />
                 <button class="sheet-stat-roller" name="roll_attack_check" type="roll"
-                  value="@{publicity_roll} &{template:skill-roll} {{base-attribute=atk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Attack Check}} {{skill-roll=[[ 1d20 + [[ @{ATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                  value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=atk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Attack Check}} {{skill-roll=[[ 1d20 + [[ @{ATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
                   <span name="attr_ATKMOD" title="Attribute: ATKMOD"></span>
                 </button>
                 <br />
@@ -433,7 +436,7 @@
                 <b>Defense</b><br />
                 <input class="sheet-stat-ball-color" name="attr_DEF" title="Attribute: DEF" type="number" readonly /><br />
                 <button class="sheet-stat-roller" name="roll_defense_check" type="roll"
-                  value="@{publicity_roll} &{template:skill-roll} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Defense Check}} {{skill-roll=[[ 1d20 + [[ @{DEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                  value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Defense Check}} {{skill-roll=[[ 1d20 + [[ @{DEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
                   <span name="attr_DEFMOD" title="Attribute: DEFMOD"></span>
                 </button>
                 <br />
@@ -443,7 +446,7 @@
                 <b>Special Attack</b><br />
                 <input class="sheet-stat-ball-color" name="attr_SPATK" title="Attribute: SPATK" type="number" readonly /><br />
                 <button class="sheet-stat-roller" name="roll_special_attack_check" type="roll"
-                  value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Attack Check}} {{skill-roll=[[ 1d20 + [[ @{SPATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                  value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Attack Check}} {{skill-roll=[[ 1d20 + [[ @{SPATKMOD} + ?{Temp Modifier|0} ]] ]]}}">
                   <span name="attr_SPATKMOD" title="Attribute: SPATKMOD"></span>
                 </button>
                 <br />
@@ -453,7 +456,7 @@
                 <b>Special Defense</b><br />
                 <input class="sheet-stat-ball-color" name="attr_SPDEF" title="Attribute: SPDEF" type="number" readonly /><br />
                 <button class="sheet-stat-roller" name="roll_special_defense_check" type="roll"
-                  value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Defense Check}} {{skill-roll=[[ 1d20 + [[ @{SPDEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                  value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Special Defense Check}} {{skill-roll=[[ 1d20 + [[ @{SPDEFMOD} + ?{Temp Modifier|0} ]] ]]}}">
                   <span name="attr_SPDEFMOD" title="Attribute: SPDEFMOD"></span>
                 </button>
                 <br />
@@ -463,7 +466,7 @@
                 <b>Speed</b><br />
                 <input class="sheet-stat-ball-color" name="attr_SPD" title="Attribute: SPD" type="number" readonly /><br />
                 <button class="sheet-stat-roller" name="roll_speed_check" type="roll"
-                  value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Speed Check}} {{skill-roll=[[ 1d20 + [[ @{SPDMOD} + ?{Temp Modifier|0} ]] ]]}}">
+                  value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Generic Speed Check}} {{skill-roll=[[ 1d20 + [[ @{SPDMOD} + ?{Temp Modifier|0} ]] ]]}}">
                   <span name="attr_SPDMOD" title="Attribute: SPDMOD"></span>
                 </button>
                 <br />
@@ -705,7 +708,7 @@
           <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-roll} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Acrobatics}} {{skill-roll=[[ 1d20!kh2 + [[ @{acrobatics_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Acrobatics}} {{skill-roll=[[ 1d20!kh2 + [[ @{acrobatics_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Acrobatics (<span name="attr_acrobatics_ability_mod"></span>)
           </button>
           <input name="attr_acrobaticstalent1" value="2" title="Attribute: acrobaticstalent1" type="checkbox" />
@@ -714,7 +717,7 @@
           <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-roll} {{base-attribute=atk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Athletics}} {{skill-roll=[[ 1d20!kh2 + [[ @{athletics_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=atk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Athletics}} {{skill-roll=[[ 1d20!kh2 + [[ @{athletics_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Athletics (<span name="attr_athletics_ability_mod"></span>)
           </button>
           <input name="attr_athleticstalent1" value="2" title="Attribute: athleticstalent1" type="checkbox" />
@@ -723,7 +726,7 @@
           <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-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Bluff/Deception}} {{skill-roll=[[ 1d20!kh2 + [[ @{bluff_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Bluff/Deception}} {{skill-roll=[[ 1d20!kh2 + [[ @{bluff_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Bluff/Deception (<span name="attr_bluff_ability_mod"></span>)
           </button>
           <input name="attr_blufftalent1" value="2" title="Attribute: blufftalent1" type="checkbox" />
@@ -732,7 +735,7 @@
           <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-roll} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Concentration}} {{skill-roll=[[ 1d20!kh2 + [[ @{concentration_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Concentration}} {{skill-roll=[[ 1d20!kh2 + [[ @{concentration_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Concentration (<span name="attr_concentration_ability_mod"></span>)
           </button>
           <input name="attr_concentrationtalent1" value="2" title="Attribute: concentrationtalent1" type="checkbox" />
@@ -741,7 +744,7 @@
           <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-roll} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Constitution}} {{skill-roll=[[ 1d20!kh2 + [[ @{constitution_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=def}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Constitution}} {{skill-roll=[[ 1d20!kh2 + [[ @{constitution_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Constitution (<span name="attr_constitution_ability_mod"></span>)
           </button>
           <input name="attr_constitutiontalent1" value="2" title="Attribute: constitutiontalent1" type="checkbox" />
@@ -750,7 +753,7 @@
           <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-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Diplomacy/Persuasion}} {{skill-roll=[[ 1d20!kh2 + [[ @{diplomacy_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Diplomacy/Persuasion}} {{skill-roll=[[ 1d20!kh2 + [[ @{diplomacy_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Diplomacy/Persuasion (<span name="attr_diplomacy_ability_mod"></span>)
           </button>
           <input name="attr_diplomacytalent1" value="2" title="Attribute: diplomacytalent1" type="checkbox" />
@@ -759,7 +762,7 @@
           <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-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Engineering/Operation}} {{skill-roll=[[ 1d20!kh2 + [[ @{engineering_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Engineering/Operation}} {{skill-roll=[[ 1d20!kh2 + [[ @{engineering_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Engineering/Operation (<span name="attr_engineering_ability_mod"></span>)
           </button>
           <input name="attr_engineeringtalent1" value="2" title="Attribute: engineeringtalent1" type="checkbox" />
@@ -768,7 +771,7 @@
           <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-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=History}} {{skill-roll=[[ 1d20!kh2 + [[ @{history_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=History}} {{skill-roll=[[ 1d20!kh2 + [[ @{history_total} + ?{Temporary Bonus|0} ]] ]]}}">
             History (<span name="attr_history_ability_mod"></span>)
           </button>
           <input name="attr_historytalent1" value="2" title="Attribute: historytalent1" type="checkbox" />
@@ -777,7 +780,7 @@
           <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-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Insight}} {{skill-roll=[[ 1d20!kh2 + [[ @{insight_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Insight}} {{skill-roll=[[ 1d20!kh2 + [[ @{insight_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Insight (<span name="attr_insight_ability_mod"></span>)
           </button>
           <input name="attr_insighttalent1" value="2" title="Attribute: insighttalent1" type="checkbox" />
@@ -788,7 +791,7 @@
           <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-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Investigate}} {{skill-roll=[[ 1d20!kh2 + [[ @{investigate_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Investigate}} {{skill-roll=[[ 1d20!kh2 + [[ @{investigate_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Investigate (<span name="attr_investigate_ability_mod"></span>)
           </button>
           <input name="attr_investigatetalent1" value="2" title="Attribute: investigatetalent1" type="checkbox" />
@@ -797,7 +800,7 @@
           <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-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Medicine}} {{skill-roll=[[ 1d20!kh2 + [[ @{medicine_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Medicine}} {{skill-roll=[[ 1d20!kh2 + [[ @{medicine_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Medicine (<span name="attr_medicine_ability_mod"></span>)
           </button>
           <input name="attr_medicinetalent1" value="2" title="Attribute: medicinetalent1" type="checkbox" />
@@ -806,7 +809,7 @@
           <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-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Nature}} {{skill-roll=[[ 1d20!kh2 + [[ @{nature_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Nature}} {{skill-roll=[[ 1d20!kh2 + [[ @{nature_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Nature (<span name="attr_nature_ability_mod"></span>)
           </button>
           <input name="attr_naturetalent1" value="2" title="Attribute: naturetalent1" type="checkbox" />
@@ -815,7 +818,7 @@
           <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-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perception}} {{skill-roll=[[ 1d20!kh2 + [[ @{perception_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perception}} {{skill-roll=[[ 1d20!kh2 + [[ @{perception_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Perception (<span name="attr_perception_ability_mod"></span>)
           </button>
           <input name="attr_perceptiontalent1" value="2" title="Attribute: perceptiontalent1" type="checkbox" />
@@ -824,7 +827,7 @@
           <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-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perform}} {{skill-roll=[[ 1d20!kh2 + [[ @{perform_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Perform}} {{skill-roll=[[ 1d20!kh2 + [[ @{perform_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Perform (<span name="attr_perform_ability_mod"></span>)
           </button>
           <input name="attr_performtalent1" value="2" title="Attribute: performtalent1" type="checkbox" />
@@ -833,7 +836,7 @@
           <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-roll} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Pokemon Handling}} {{skill-roll=[[ 1d20!kh2 + [[ @{handling_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spdef}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Pokemon Handling}} {{skill-roll=[[ 1d20!kh2 + [[ @{handling_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Pokémon Handling (<span name="attr_handling_ability_mod"></span>)
           </button>
           <input name="attr_handlingtalent1" value="2" title="Attribute: handlingtalent1" type="checkbox" />
@@ -841,7 +844,7 @@
           <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-roll} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Programming}} {{skill-roll=[[ 1d20!kh2 + [[ @{programming_total} + ?{Temporary Bonus|0} ]] ]]}}">
+          <button class="sheet-skill-roller" name="roll_programmingcheck" type="roll" value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spatk}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Programming}} {{skill-roll=[[ 1d20!kh2 + [[ @{programming_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Programming (<span name="attr_programming_ability_mod"></span>)
           </button>
           <input name="attr_programmingtalent1" value="2" title="Attribute: programmingtalent1" type="checkbox" />
@@ -850,7 +853,7 @@
           <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-roll} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Sleight of Hand}} {{skill-roll=[[ 1d20!kh2 + [[ @{sleightofhand_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Sleight of Hand}} {{skill-roll=[[ 1d20!kh2 + [[ @{sleightofhand_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Sleight of Hand (<span name="attr_sleight_ability_mod"></span>)
           </button>
           <input name="attr_sleightofhandtalent1" value="2" title="Attribute: sleightofhandtalent1" type="checkbox" />
@@ -859,7 +862,7 @@
           <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-roll} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Stealth}} {{skill-roll=[[ 1d20!kh2 + [[ @{stealth_total} + ?{Temporary Bonus|0} ]] ]]}}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Stealth}} {{skill-roll=[[ 1d20!kh2 + [[ @{stealth_total} + ?{Temporary Bonus|0} ]] ]]}}">
             Stealth (<span name="attr_stealth_ability_mod"></span>)
           </button>
           <input name="attr_stealthtalent1" value="2" title="Attribute: stealthtalent1" type="checkbox" />
@@ -878,7 +881,7 @@
           <input class="sheet-skill-total" name="attr_capture_total" readonly title="The value added to your skill check to hit a Pokémon with a Pokéball. Note - this can be ignored if the target Pokémon is at or below half of their max HP.
           Attribute: capture_total" type="number" />
           <button class="sheet-skill-roller" name="roll_capturecheck" type="roll"
-            value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Capture Pokémon}} {{skill-roll=[[ 1d20 + @{capture_total} ]] Capture Roll: [[ d100 @{ball_capture_modifier} + @{capture_roll_bonus} ]] }}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Capture Pokémon}} {{skill-roll=[[ 1d20 + @{capture_total} ]] Capture Roll: [[ d100 @{ball_capture_modifier} + @{capture_roll_bonus} ]] }}">
             Capture Pokémon (<span name="attr_capture_ability_mod"></span>)
           </button>
           <input name="attr_capture_default_custom_modifier" type="hidden" value="0" />
@@ -933,7 +936,7 @@
           <input class="sheet-skill-total" name="attr_capture_total" readonly title="The value added to your skill check to hit a Pokémon with a Pokéball. Note - this can be ignored if the target Pokémon is at or below half of their max HP.
           Attribute: capture_total" type="number" />
           <button class="sheet-skill-roller" name="roll_capturecheck" type="roll"
-            value="@{publicity_roll} &{template:skill-roll} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Capture Pokémon}} {{skill-roll=[[ 1d20 + @{capture_total} ]] Capture Roll: [[ d100 @{ball_capture_modifier} + @{capture_roll_bonus} ]] }}">
+            value="@{publicity_roll} &{template:@{skill_template}} {{base-attribute=spd}} {{character-id=@{character_id}}} {{character-name=@{character_name}}} {{skill-name=Capture Pokémon}} {{skill-roll=[[ 1d20 + @{capture_total} ]] Capture Roll: [[ d100 @{ball_capture_modifier} + @{capture_roll_bonus} ]] }}">
             Capture Pokémon (<span name="attr_capture_ability_mod"></span>)
           </button>
           <input name="attr_capture_roll_bonus" title="Use this field to assign a static modifier to your capture rolls - things like a Capture Specialist's Capture Point feature.
@@ -3336,6 +3339,26 @@
     </div>
   </rolltemplate>
 
+  <rolltemplate class="sheet-rolltemplate-inline-skill-roll">
+    <div class="sheet-container sheet-rolltemplate-color-setting-{{base-attribute}}-skill">
+      <div class="sheet-labelled-table-wrapper">
+        <span class="sheet-border-label">skill</span>
+        <table class="sheet-inline-skill-template">
+          <tbody>
+            <tr class="sheet-hide-on-mobile">
+              <td class="sheet-subhead">[performed by {{character-name}}](https://journal.roll20.net/character/{{character-id}}" name="name-link")</td>
+            </tr>
+            <tr>
+              <td class="sheet-label sheet-skill-roll">
+                <span>{{skill-name}}: {{skill-roll}}</span>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </rolltemplate>
+
   <rolltemplate class="sheet-rolltemplate-feature-output">
     <div class="sheet-container sheet-rolltemplate-color-setting-{{type-color}}-move">
       <table class="sheet-feature-template">
@@ -3379,6 +3402,24 @@
     });
   });
 
+  on(`clicked:toggle-skill-template`, function () {
+    getAttrs(["skill_template_label"], function (values) {
+      const template = values["skill_template_label"];
+      var templateLabel = "Original Style";
+      var skillTemplate = "skill-roll";
+
+      if (template == templateLabel) {
+        templateLabel = "Redesigned Style";
+        skillTemplate = "inline-skill-roll";
+      }
+
+      setAttrs({
+        skill_template_label: templateLabel,
+        skill_template: skillTemplate,
+      });
+    });
+  });
+
   on(`clicked:activate-tera`, function () {
     performFormChange("tera", "Terastallize", "End Terastallization", true);
   });