diff --git a/src/themes/oled/theme.scss b/src/themes/oled/theme.scss
index 04a5aaf..23d3735 100644
--- a/src/themes/oled/theme.scss
+++ b/src/themes/oled/theme.scss
@@ -39,8 +39,8 @@ $text-color-code: #d7ba7d;
 $text-color-link: #3794ff;
 
 $primary-border-color: #2a2a2a;
-$secondary-border-color: #1a1a1a;
-$tertiary-border-color: #222;
+$secondary-border-color: scale-color($primary-border-color, $lightness: -14%);
+$tertiary-border-color: scale-color($primary-border-color, $lightness: -7%);
 
 $border-color-error: #df2935;
 $border-color-warning: #ffcf70;
diff --git a/src/themes/solarized-light/theme.scss b/src/themes/solarized-light/theme.scss
index 801f4a3..0125cea 100644
--- a/src/themes/solarized-light/theme.scss
+++ b/src/themes/solarized-light/theme.scss
@@ -39,8 +39,8 @@ $text-color-code: #dc322f;
 $text-color-link: #268bd2;
 
 $primary-border-color: #ddd6c1;
-$secondary-border-color: scale-color($primary-border-color, $lightness: -6%);
-$tertiary-border-color: scale-color($primary-border-color, $lightness: -3%);
+$secondary-border-color: scale-color($primary-border-color, $lightness: 14%);
+$tertiary-border-color: scale-color($primary-border-color, $lightness: 7%);
 
 $border-color-error: #df2935;
 $border-color-warning: #ffcf70;
diff --git a/src/themes/tokyo-night-light/theme.scss b/src/themes/tokyo-night-light/theme.scss
index c9a42df..5a7d99e 100644
--- a/src/themes/tokyo-night-light/theme.scss
+++ b/src/themes/tokyo-night-light/theme.scss
@@ -39,8 +39,8 @@ $text-color-code: #33635c;
 $text-color-link: #2959aa;
 
 $primary-border-color: #c1c2c7;
-$secondary-border-color: scale-color($primary-border-color, $lightness: 5%);
-$tertiary-border-color: scale-color($primary-border-color, $lightness: 2.5%);
+$secondary-border-color: scale-color($primary-border-color, $lightness: 14%);
+$tertiary-border-color: scale-color($primary-border-color, $lightness: 7%);
 
 $border-color-error: #df2935;
 $border-color-warning: #ffcf70;
diff --git a/src/themes/tokyo-night-storm/theme.scss b/src/themes/tokyo-night-storm/theme.scss
index 13731c0..7cddb4a 100644
--- a/src/themes/tokyo-night-storm/theme.scss
+++ b/src/themes/tokyo-night-storm/theme.scss
@@ -38,9 +38,9 @@ $text-color-success: #73daca;
 $text-color-code: #73daca;
 $text-color-link: #668ac4;
 
-$primary-border-color: #1b1e2e;
-$secondary-border-color: scale-color($primary-border-color, $lightness: -5%);
-$tertiary-border-color: scale-color($primary-border-color, $lightness: -2.5%);
+$primary-border-color: #2d324a;
+$secondary-border-color: scale-color($primary-border-color, $lightness: -14%);
+$tertiary-border-color: scale-color($primary-border-color, $lightness: -7%);
 
 $border-color-error: #df2935;
 $border-color-warning: #ffcf70;
diff --git a/src/themes/tokyo-night/theme.scss b/src/themes/tokyo-night/theme.scss
index e6bd2e4..9925cb3 100644
--- a/src/themes/tokyo-night/theme.scss
+++ b/src/themes/tokyo-night/theme.scss
@@ -38,9 +38,9 @@ $text-color-success: #73daca;
 $text-color-code: #9699a8;
 $text-color-link: #6183bb;
 
-$primary-border-color: #101014;
-$secondary-border-color: scale-color($primary-border-color, $lightness: -5%);
-$tertiary-border-color: scale-color($primary-border-color, $lightness: -2.5%);
+$primary-border-color: #232433;
+$secondary-border-color: scale-color($primary-border-color, $lightness: -14%);
+$tertiary-border-color: scale-color($primary-border-color, $lightness: -7%);
 
 $border-color-error: #df2935;
 $border-color-warning: #ffcf70;