diff --git a/themes/golden-ledger.sass b/themes/golden-ledger.sass
index 724faad..c322572 100644
--- a/themes/golden-ledger.sass
+++ b/themes/golden-ledger.sass
@@ -16,15 +16,21 @@ $tertiary-color: #198754         // Professional green for tertiary elements
 $quaternary-color: #6c757d       // Muted gray for highlights
 $quinary-color: #d63384          // Refined pinkish-red for subtle accents
 
-$code-background-color: #2d2f33 // Softer dark gray-blue for code blocks
-$code-text-color: #e8e9eb       // Light gray for code text
-
-$note-background-color: #f4f4f6 // Light grayish-neutral for note background
-$note-border-color: $quinary-color // Matches the refined pinkish-red accent
-
 // Text
 $text-color: #2b2c2f            // Dark gray with a slight warmth for text
 $background-color: #f5f5f7      // Soft light gray for background, reducing eye strain
+$background-color: color.adjust($secondary-color, $lightness: 50%)
+
+$code-text-color: #e8e9eb       // Light gray for code text
+$code-background-color: #2d2f33 // Softer dark gray-blue for code blocks
+$code-border-color: $quaternary-color
+
+$note-color: $secondary-color
+$note-background-color: #f4f4f6 // Light grayish-neutral for note background
+$note-border-color: $quinary-color // Matches the refined pinkish-red accent
+
+$blockquote-color: $primary-color
+$blockquote-border-color: $secondary-color
 
 // Links, Anchors
 $anchor-color: color.adjust($primary-color, $lightness: 15%)
@@ -33,6 +39,8 @@ $toc-anchor-color: color.adjust($secondary-color, $lightness: -5%)
 $toc-anchor-hover-color: color.adjust($secondary-color, $lightness: -10%)
 
 // Tables
+$table-color: $text-color
+$table-header-color: $text-color
 $table-header-bg: #e0e0e5       // Light neutral gray for table headers
 $table-border-color: #b5b5b8    // Subtle gray for borders
 
@@ -49,6 +57,8 @@ $default-header-colors: map.set($default-header-colors, h1, $primary-color)
 $default-header-colors: map.set($default-header-colors, h2, $secondary-color)
 $default-header-colors: map.set($default-header-colors, h3, $tertiary-color)
 $default-header-colors: map.set($default-header-colors, h4, $quaternary-color)
+$default-header-colors: map.set($default-header-colors, h5, $tertiary-color)
+$default-header-colors: map.set($default-header-colors, h6, $quinary-color)
 
 // Initialize empty maps
 $default-header-margins-sides: ()
diff --git a/themes/sandy-peach.sass b/themes/sandy-peach.sass
index dfd173a..d8d5ecd 100644
--- a/themes/sandy-peach.sass
+++ b/themes/sandy-peach.sass
@@ -15,16 +15,21 @@ $tertiary-color: #734432        // Rich brown
 $quaternary-color: #BF8069      // Warm peach
 $quinary-color: #A62E2E         // Bold red
 
-$code-background-color: color.adjust($primary-color, $lightness: -10%) // Slightly darker for contrast
-$code-text-color: color.adjust($primary-color, $lightness: 70%)       // Brightened for readability
-
-$note-background-color: color.adjust($secondary-color, $lightness: 20%) // Subtle contrast for notes
-$note-border-color: $quinary-color // Matches the bold red accent
-
 // Text
 $text-color: color.adjust($primary-color, $lightness: 10%)
 $background-color: color.adjust($secondary-color, $lightness: 25%)    // Slightly darker neutral for overall background
 
+$code-text-color: color.adjust($primary-color, $lightness: 70%)       // Brightened for readability
+$code-background-color: color.adjust($primary-color, $lightness: -10%) // Slightly darker for contrast
+$code-border-color: $quaternary-color
+
+$note-color: $secondary-color
+$note-background-color: color.adjust($secondary-color, $lightness: 20%) // Subtle contrast for notes
+$note-border-color: $quinary-color // Matches the bold red accent
+
+$blockquote-color: $primary-color
+$blockquote-border-color: $secondary-color
+
 // Links, Anchors
 $anchor-color: color.adjust($tertiary-color, $lightness: 0%)        // Slightly brighter brown for links
 $anchor-hover-color: color.adjust($tertiary-color, $lightness: 20%) // Darkened for hover effect
@@ -32,6 +37,8 @@ $toc-anchor-color: color.adjust($quaternary-color, $lightness: 0%)  // Slightly
 $toc-anchor-hover-color: color.adjust($quaternary-color, $lightness: -20%) // Slightly darker peach for hover
 
 // Tables
+$table-color: $text-color
+$table-header-color: $text-color
 $table-header-bg: color.adjust($quaternary-color, $lightness: -20%)  // Darker peach for table headers
 $table-border-color: color.adjust($primary-color, $lightness: -20%)  // Darkened navy-gray for borders
 
@@ -48,6 +55,8 @@ $default-header-colors: map.set($default-header-colors, h1, color.adjust($primar
 $default-header-colors: map.set($default-header-colors, h2, $secondary-color)
 $default-header-colors: map.set($default-header-colors, h3, $tertiary-color)
 $default-header-colors: map.set($default-header-colors, h4, $quaternary-color)
+$default-header-colors: map.set($default-header-colors, h5, $tertiary-color)
+$default-header-colors: map.set($default-header-colors, h6, $quinary-color)
 
 // Initialize empty maps
 $default-header-margins-sides: ()