diff --git a/obsidian.css b/obsidian.css
index cc00746..76713a2 100644
--- a/obsidian.css
+++ b/obsidian.css
@@ -125,7 +125,7 @@ settings:
         title: H1 top margin
         description: Accepts decimal values representing the number of lines to add before the heading
         type: variable-number
-        default: 4
+        default: 3
     - 
         id: h1-margin-bottom
         title: H1 bottom margin
@@ -167,7 +167,7 @@ settings:
         title: H2 top margin
         description: Accepts decimal values representing the number of lines to add before the heading
         type: variable-number
-        default: 2.5
+        default: 2.25
     - 
         id: h2-margin-bottom
         title: H2 bottom margin
@@ -209,13 +209,13 @@ settings:
         title: H3 top margin
         description: Accepts decimal values representing the number of lines to add before the heading
         type: variable-number
-        default: 2
+        default: 1.75
     - 
         id: h3-margin-bottom
         title: H3 bottom margin
         description: Accepts decimal values representing the number of lines to add below the heading
         type: variable-number
-        default: 0.4
+        default: 0.5
     - 
         id: h3-weight
         title: H3 font weight
@@ -410,6 +410,10 @@ settings:
   --radius-xl: 20px;
 
   --cursor: pointer;
+
+  --strong-weight: var(--bold-weight);
+  --strong-color: inherit;
+  --em-color: inherit;
 }
 
 .theme-light {
@@ -942,7 +946,7 @@ button,
   background: var(--background-primary);
   border-radius: 10px;
   overflow: hidden;
-  max-width: 90vw;
+  max-width: 1000px;
   max-height: 90vh;
 }
 .modal.mod-settings .vertical-tab-content-container {
@@ -951,6 +955,7 @@ button,
   padding-right: 0;
 }
 .modal.mod-settings {
+  max-width: 1000px;
   width: 90vw;
   height: 90vh;
 }
@@ -2862,21 +2867,32 @@ input[type="range"]::-webkit-slider-thumb:active {
   padding-top: 5px;
 }
 .vertical-tab-header-group-title {
-  color: var(--text-normal);
+  color: var(--shade-40);
   font-size: 12px;
-  font-weight: 500;
+  font-weight: 700;
+  text-transform: none;
+  letter-spacing: 0;
+  padding: 6px 18px;
+}
+.vertical-tab-header-group-items {
+  padding: 0 10px;
 }
 .vertical-tab-nav-item {
-  font-size: var(--font-small);
-  padding: 5px 10px 5px 17px;
-  color: var(--text-muted);
+  font-size: 13px;
+  padding: 4px 8px;
+  color: var(--text-normal);
   border: none;
   background: transparent;
   cursor: var(--cursor);
+  font-weight: 500;
+  border-radius: var(--radius-s);
+}
+.vertical-tab-nav-item:hover {
+  background: transparent;
 }
-.vertical-tab-nav-item:hover,
 .vertical-tab-nav-item.is-active {
   color: var(--text-normal);
+  background: var(--shade-plus-darker);
 }
 .setting-hotkey {
   background-color: var(--background-modifier-border);
@@ -3309,11 +3325,21 @@ html .plugin-sliding-panes-rotate-header.embedded-note-title .CodeMirror-lines {
   line-height: var(--line-height);
   font-family: var(--text-editor) !important;
 }
-.cm-s-obsidian .cm-header,
-.cm-s-obsidian .cm-strong {
+.cm-s-obsidian .cm-header {
   font-weight: var(--bold-weight);
 }
 
+.markdown-preview-section strong,
+.cm-s-obsidian .cm-strong {
+  font-weight: var(--strong-weight);
+  color: var(--strong-color);
+}
+
+.markdown-preview-section em,
+.cm-s-obsidian .cm-em {
+  color: var(--em-color);
+}
+
 
 /* --------------- */
 /* Editor mode */
@@ -4011,6 +4037,10 @@ ol > li::before {
   cursor: var(--cursor);
 }
 
+.nav-action-button.is-active {
+  background: var(--shade-plus-darker);
+}
+
 .nav-action-button.is-active:hover {
   color: var(--text-muted);
 }
diff --git a/src/000-css-settings.css b/src/000-css-settings.css
index 27ff5e1..849df66 100644
--- a/src/000-css-settings.css
+++ b/src/000-css-settings.css
@@ -125,7 +125,7 @@ settings:
         title: H1 top margin
         description: Accepts decimal values representing the number of lines to add before the heading
         type: variable-number
-        default: 4
+        default: 3
     - 
         id: h1-margin-bottom
         title: H1 bottom margin
@@ -167,7 +167,7 @@ settings:
         title: H2 top margin
         description: Accepts decimal values representing the number of lines to add before the heading
         type: variable-number
-        default: 2.5
+        default: 2.25
     - 
         id: h2-margin-bottom
         title: H2 bottom margin
@@ -209,13 +209,13 @@ settings:
         title: H3 top margin
         description: Accepts decimal values representing the number of lines to add before the heading
         type: variable-number
-        default: 2
+        default: 1.75
     - 
         id: h3-margin-bottom
         title: H3 bottom margin
         description: Accepts decimal values representing the number of lines to add below the heading
         type: variable-number
-        default: 0.4
+        default: 0.5
     - 
         id: h3-weight
         title: H3 font weight
diff --git a/src/010-main.css b/src/010-main.css
index 4cd3ca3..72d4161 100644
--- a/src/010-main.css
+++ b/src/010-main.css
@@ -46,6 +46,10 @@
   --radius-xl: 20px;
 
   --cursor: pointer;
+
+  --strong-weight: var(--bold-weight);
+  --strong-color: inherit;
+  --em-color: inherit;
 }
 
 .theme-light {
@@ -578,7 +582,7 @@ button,
   background: var(--background-primary);
   border-radius: 10px;
   overflow: hidden;
-  max-width: 90vw;
+  max-width: 1000px;
   max-height: 90vh;
 }
 .modal.mod-settings .vertical-tab-content-container {
@@ -587,6 +591,7 @@ button,
   padding-right: 0;
 }
 .modal.mod-settings {
+  max-width: 1000px;
   width: 90vw;
   height: 90vh;
 }
@@ -2498,21 +2503,32 @@ input[type="range"]::-webkit-slider-thumb:active {
   padding-top: 5px;
 }
 .vertical-tab-header-group-title {
-  color: var(--text-normal);
+  color: var(--shade-40);
   font-size: 12px;
-  font-weight: 500;
+  font-weight: 700;
+  text-transform: none;
+  letter-spacing: 0;
+  padding: 6px 18px;
+}
+.vertical-tab-header-group-items {
+  padding: 0 10px;
 }
 .vertical-tab-nav-item {
-  font-size: var(--font-small);
-  padding: 5px 10px 5px 17px;
-  color: var(--text-muted);
+  font-size: 13px;
+  padding: 4px 8px;
+  color: var(--text-normal);
   border: none;
   background: transparent;
   cursor: var(--cursor);
+  font-weight: 500;
+  border-radius: var(--radius-s);
+}
+.vertical-tab-nav-item:hover {
+  background: transparent;
 }
-.vertical-tab-nav-item:hover,
 .vertical-tab-nav-item.is-active {
   color: var(--text-normal);
+  background: var(--shade-plus-darker);
 }
 .setting-hotkey {
   background-color: var(--background-modifier-border);
diff --git a/src/020-document.css b/src/020-document.css
index b9e5405..2f7546e 100644
--- a/src/020-document.css
+++ b/src/020-document.css
@@ -5,11 +5,21 @@
   line-height: var(--line-height);
   font-family: var(--text-editor) !important;
 }
-.cm-s-obsidian .cm-header,
-.cm-s-obsidian .cm-strong {
+.cm-s-obsidian .cm-header {
   font-weight: var(--bold-weight);
 }
 
+.markdown-preview-section strong,
+.cm-s-obsidian .cm-strong {
+  font-weight: var(--strong-weight);
+  color: var(--strong-color);
+}
+
+.markdown-preview-section em,
+.cm-s-obsidian .cm-em {
+  color: var(--em-color);
+}
+
 
 /* --------------- */
 /* Editor mode */
diff --git a/src/030-icons.css b/src/030-icons.css
index a45393e..f2be3fd 100644
--- a/src/030-icons.css
+++ b/src/030-icons.css
@@ -70,6 +70,10 @@
   cursor: var(--cursor);
 }
 
+.nav-action-button.is-active {
+  background: var(--shade-plus-darker);
+}
+
 .nav-action-button.is-active:hover {
   color: var(--text-muted);
 }