diff --git a/5eShaped/precompiled/components/core/core.html b/5eShaped/precompiled/components/core/core.html
index d33d8789fc..3ffde58ec0 100644
--- a/5eShaped/precompiled/components/core/core.html
+++ b/5eShaped/precompiled/components/core/core.html
@@ -1,5 +1,5 @@
 <div class="section-core pc">
-  <input type="hidden" name="attr_spells_on_core" class="toggle-spells-on-core hidden" value="1">
+  <input type="hidden" name="attr_show_spells_on_core" class="toggle-spells-on-core hidden" value="1">
   <div class="shaped-row">
     <div class="15-rem pad-r-sm pad-b-md">
       <div class="shaped-row mar-b-smd">
diff --git a/5eShaped/precompiled/components/core/skills.html b/5eShaped/precompiled/components/core/skills.html
index 39c7159e03..3def1f965b 100644
--- a/5eShaped/precompiled/components/core/skills.html
+++ b/5eShaped/precompiled/components/core/skills.html
@@ -1,8 +1,7 @@
 <div class="skills wrap-box mar-b-smd">
-  <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="1-rem no-shrink edit pad-r-sm">
+      <div class="2-rem no-shrink edit pad-r-sm">
         <select name="attr_skill_d20">
           <option value="@{shaped_d20}" data-i18n="NORMAL"></option>
           <option value="2d20@{d20_mod}kh1" data-i18n="ADVANTAGE"></option>
@@ -46,11 +45,11 @@
           <span>)</span>
         </div>
       </div>
-      <div class="1-rem edit no-shrink">
+      <div class="1-rem edit no-shrink passive-skill">
         <input type="number" name="attr_passive_bonus" class="no-spin small-label" value="0" step="1">
       </div>
       <input type="hidden" name="attr_passive">
-      <button type="roll" name="roll_passive" class="item-to-show" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=^{PASSIVE} @{name} (<span data-i18n=@{ability_key}>@{ability_key}<span>)}} @{roll_info} {{roll1=[[@{passive}]]}} @{hide_gm_info} @{attacher_skill}" tabindex="-1">
+      <button type="roll" name="roll_passive" class="passive-skill" value="@{output_option} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=^{PASSIVE} @{name} (<span data-i18n=@{ability_key}>@{ability_key}<span>)}} @{roll_info} {{roll1=[[@{passive}]]}} @{hide_gm_info} @{attacher_skill}" tabindex="-1">
         <div class="shaped-row no-wrap flex-end">
           <span name="attr_passive" class="1-rem input-like small-label center border-bottom"></span>
         </div>
@@ -59,9 +58,6 @@
   </fieldset>
   <div class="mar-t-sm"></div>
   <input type="checkbox" name="attr_generate_skills" class="toggle-pseudo-button edit"><span class="toggle-pseudo-button button edit" data-i18n="GENERATE_SKILLS"></span>
-  <div class="mar-t-sm">
-    <input type="checkbox" name="attr_show_passive_skills" class="edit item-shown"><span class="edit" data-i18n="SHOW_PASSIVE"></span>
-  </div>
   <button type="roll" name="roll_shaped_ability_checks" class="wrapper-button" value="/w @{character_name} &{template:5e-shaped} {{ability=1}} {{character_name=@{character_name}}} @{show_character_name} {{title=^{ABILITY_CHECKS}}} {{@{ability_checks_text_size}=@{ability_checks_macro_var}}}">
     <div class="wrap-box-title center" data-i18n="SKILLS"></div>
   </button>
diff --git a/5eShaped/precompiled/components/header/variables.html b/5eShaped/precompiled/components/header/variables.html
index b8cfc9b607..b0288605ae 100644
--- a/5eShaped/precompiled/components/header/variables.html
+++ b/5eShaped/precompiled/components/header/variables.html
@@ -1,8 +1,9 @@
 <input type="hidden" name="attr_has_sorcerer_levels" class="has-sorcerer-levels hidden">
 <input type="hidden" name="attr_has_warlock_slots" class="has-warlock-slots hidden">
-<input type="hidden" name="attr_spells" class="toggle-spells hidden" value="1">
+<input type="hidden" name="attr_show_spells" class="toggle-spells hidden" value="1">
 <input type="hidden" name="attr_psionics" class="toggle-psionics hidden">
 <input type="hidden" name="attr_custom_classes" class="toggle-custom-classes hidden">
+<input type="hidden" name="attr_show_passive_skills" class="toggle-passive-skills hidden">
 
 <input type="checkbox" name="attr_spell_slots_l0_toggle" class="toggle-level-0 hidden">
 <input type="checkbox" name="attr_spell_slots_l1_toggle" class="toggle-level-1 hidden">
diff --git a/5eShaped/precompiled/components/settings/display.html b/5eShaped/precompiled/components/settings/display.html
index ca0de3149b..777904d744 100644
--- a/5eShaped/precompiled/components/settings/display.html
+++ b/5eShaped/precompiled/components/settings/display.html
@@ -13,11 +13,15 @@
   </div>
   <div class="shaped-row space-between vert-center no-wrap mar-b-sm">
     <span class="small-label" data-i18n="SPELLS"></span>
-    <input type="checkbox" name="attr_spells" class="mar-l-md" value="1" checked>
+    <input type="checkbox" name="attr_show_spells" class="mar-l-md" value="1" checked>
   </div>
   <div class="spells shaped-row space-between vert-center no-wrap mar-b-sm">
     <span class="small-label" data-i18n="SPELLS_ON_CORE"></span>
-    <input type="checkbox" name="attr_spells_on_core" class="mar-l-md" value="1" checked>
+    <input type="checkbox" name="attr_show_spells_on_core" class="mar-l-md" value="1" checked>
+  </div>
+  <div class="shaped-row space-between vert-center no-wrap mar-b-sm">
+    <span class="small-label" data-i18n="PASSIVE_SKILLS"></span>
+    <input type="checkbox" name="attr_show_passive_skills" class="mar-l-md" value="1">
   </div>
   <div class="wrap-box-title center" data-i18n="DISPLAY"></div>
 </div>
\ No newline at end of file
diff --git a/5eShaped/precompiled/styles/_core.scss b/5eShaped/precompiled/styles/_core.scss
index fe7feaff5f..bc7397aef4 100644
--- a/5eShaped/precompiled/styles/_core.scss
+++ b/5eShaped/precompiled/styles/_core.scss
@@ -117,6 +117,11 @@
   }
 }
 
+
+input.sheet-toggle-passive-skills:not([value='1']) ~ div .sheet-passive-skill {
+  display: none;
+}
+
 .sheet-skill-ability {
   color: $light-gray;
   font-size: 10px;
diff --git a/5eShaped/translation.json b/5eShaped/translation.json
index 68a35932ca..8066efb747 100644
--- a/5eShaped/translation.json
+++ b/5eShaped/translation.json
@@ -557,6 +557,7 @@
   "PALADIN":"Paladin",
   "PASSIVE":"Passive",
   "PASSIVE_ABILITY_CHECK":"Passive ability check",
+  "PASSIVE_SKILLS":"Passive skills",
   "PC":"PC",
   "PERCEPTION":"Perception",
   "PERFORMANCE":"Performance",
@@ -627,7 +628,6 @@
   "SHIELD":"Shield",
   "SHORT_REST":"Short Rest",
   "SHOW_ALL":"Show all",
-  "SHOW_PASSIVE":"Show passive",
   "SHOW_RESTS":"Show Rests",
   "SHOW_SPELL_LEVEL_IF_ALL_SLOTS_ARE_USED":"Show levels if all slots are used",
   "SHOW_TARGET_AC_ON_ATTACKS":"Target's AC on Attacks",
diff --git a/5eShaped/translations/en.json b/5eShaped/translations/en.json
index 68a35932ca..8066efb747 100644
--- a/5eShaped/translations/en.json
+++ b/5eShaped/translations/en.json
@@ -557,6 +557,7 @@
   "PALADIN":"Paladin",
   "PASSIVE":"Passive",
   "PASSIVE_ABILITY_CHECK":"Passive ability check",
+  "PASSIVE_SKILLS":"Passive skills",
   "PC":"PC",
   "PERCEPTION":"Perception",
   "PERFORMANCE":"Performance",
@@ -627,7 +628,6 @@
   "SHIELD":"Shield",
   "SHORT_REST":"Short Rest",
   "SHOW_ALL":"Show all",
-  "SHOW_PASSIVE":"Show passive",
   "SHOW_RESTS":"Show Rests",
   "SHOW_SPELL_LEVEL_IF_ALL_SLOTS_ARE_USED":"Show levels if all slots are used",
   "SHOW_TARGET_AC_ON_ATTACKS":"Target's AC on Attacks",