diff --git a/5eShaped/precompiled/components/core/skills.html b/5eShaped/precompiled/components/core/skills.html
index 0126f870d0..6bafb704dd 100644
--- a/5eShaped/precompiled/components/core/skills.html
+++ b/5eShaped/precompiled/components/core/skills.html
@@ -2,6 +2,13 @@
   <input type="checkbox" name="attr_show_passive_skills" class="item-shown hidden">
   <fieldset class="repeating_skill">
     <div class="shaped-row no-wrap flex-end">
+      <div class="col-10 no-shrink edit">
+        <select name="attr_skill_d20">
+          <option value="@{shaped_d20}" data-i18n="NORMAL">Normal</option>
+          <option value="2d20@{d20_mod}kh1" data-i18n="ADVANTAGE">Advantage</option>
+          <option value="2d20@{d20_mod}kl1" data-i18n="DISADVANTAGE">Disadvantage</option>
+        </select>
+      </div>
       <div class="col-10 skill-select-wrapper no-shrink">
         <select name="attr_proficiency" class="no-border">
           <option value="unproficient">&#8212; &#160;&#160;<span data-i18n="UNPROFICIENT">Unproficient</span></option>
@@ -12,7 +19,7 @@
       <div class="col-09 edit no-shrink">
         <input type="number" name="attr_bonus" class="no-spin small-label" value="0" step="1">
       </div>
-      <button type="roll" name="roll_skill" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name} (<span data-i18n=@{ability_key}>@{ability_key}<span>)}} @{roll_info} {{roll1=[[@{shaped_d20} + @{formula}]]}} @{roll_setting}@{d20_mod} + @{formula}]]}} @{attacher_skill}" tabindex="-1">
+      <button type="roll" name="roll_skill" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name} (<span data-i18n=@{ability_key}>@{ability_key}<span>)}} @{roll_info} @{skill_info} {{roll1=[[@{skill_d20} + @{formula}]]}} @{roll_setting} + @{formula}]]}} @{attacher_skill}" tabindex="-1">
         <div class="shaped-row no-wrap flex-end">
           <span name="attr_total_with_sign" class="col-2-em input-like center bold border-bottom"></span>
           <span name="attr_name" class="skill-name presentation pad-l-sm"></span>
@@ -22,6 +29,7 @@
         <input type="text" name="attr_name" class="skill-name">
       </div>
       <input type="hidden" name="attr_formula">
+      <input type="hidden" name="attr_skill_info">
       <input type="hidden" name="attr_ability_key">
       <div class="skills-ability-selector-wrapper no-shrink pad-l-sm">
         <div class="shaped-row no-wrap vert-center">
diff --git a/5eShaped/precompiled/components/npc/skills.html b/5eShaped/precompiled/components/npc/skills.html
index 0675023f1a..c6a0f0fa3e 100644
--- a/5eShaped/precompiled/components/npc/skills.html
+++ b/5eShaped/precompiled/components/npc/skills.html
@@ -4,6 +4,13 @@
   <span class="col-90 pad-l-sm">
     <fieldset class="repeating_skill">
       <div class="shaped-row no-wrap vert-center">
+        <div class="col-1-3-em no-shrink edit">
+          <select name="attr_skill_d20">
+            <option value="@{shaped_d20}" data-i18n="NORMAL">Normal</option>
+            <option value="2d20@{d20_mod}kh1" data-i18n="ADVANTAGE">Advantage</option>
+            <option value="2d20@{d20_mod}kl1" data-i18n="DISADVANTAGE">Disadvantage</option>
+          </select>
+        </div>
         <div class="col-1-3-em skill-select-wrapper edit">
           <select name="attr_proficiency" class="no-border">
             <option value="unproficient">&#8212; &#160;&#160;<span data-i18n="UNPROFICIENT">Unproficient</span></option>
@@ -17,15 +24,15 @@
         <div class="col-6-em edit">
           <input type="text" name="attr_name">
         </div>
-        <button type="roll" name="roll_skill" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name} (<span data-i18n=@{ability_key}>@{ability_key}<span>)}} @{roll_info} {{roll1=[[@{shaped_d20} + @{formula}]]}} @{roll_setting}@{d20_mod} + @{formula}]]}} @{attacher_skill}" tabindex="-1">
+        <button type="roll" name="roll_skill" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=@{name} (<span data-i18n=@{ability_key}>@{ability_key}<span>)}} @{roll_info} @{skill_info} {{roll1=[[@{skill_d20} + @{formula}]]}} @{roll_setting} + @{formula}]]}} @{attacher_skill}" tabindex="-1">
           <div class="shaped-row no-wrap flex-end">
             <span name="attr_name" class="presentation skill-name white-space-no-wrap pad-r-sm"></span>
             <span name="attr_total_with_sign" class="inline-block center"></span>
           </div>
         </button>
         <input type="hidden" name="attr_formula">
+        <input type="hidden" name="attr_skill_info">
         <input type="hidden" name="attr_ability_key">
-        <input type="hidden" name="attr_name">
         <div class="skills-ability-selector-wrapper edit pad-l-sm">
           <div class="shaped-row no-wrap vert-center">
             <span>(</span>