diff --git a/lua/solarized-osaka/extra/aerc.lua b/lua/solarized-osaka/extra/aerc.lua
index 34361d8..f0fff3c 100644
--- a/lua/solarized-osaka/extra/aerc.lua
+++ b/lua/solarized-osaka/extra/aerc.lua
@@ -101,7 +101,7 @@ quote_3.fg=${cyan}
 quote_3.dim=true
 quote_4.fg=${blue}
 quote_4.dim=true
-quote_x.fg=${comment}
+quote_x.fg=${base01}
 quote_x.dim=true
 
 ]],
diff --git a/lua/solarized-osaka/extra/alacritty.lua b/lua/solarized-osaka/extra/alacritty.lua
index 57ab32e..4652cc8 100644
--- a/lua/solarized-osaka/extra/alacritty.lua
+++ b/lua/solarized-osaka/extra/alacritty.lua
@@ -33,7 +33,7 @@ colors:
 
   # Bright colors
   bright:
-    black:   '${terminal_black}'
+    black:   '${bg}'
     red:     '${red}'
     green:   '${green}'
     yellow:  '${yellow}'
@@ -44,7 +44,7 @@ colors:
 
   indexed_colors:
     - { index: 16, color: '${orange}' }
-    - { index: 17, color: '${red1}' }
+    - { index: 17, color: '${red300}' }
     
   ]],
     alacrittyColors
diff --git a/lua/solarized-osaka/extra/discord.lua b/lua/solarized-osaka/extra/discord.lua
index 65fb23a..ae9462f 100644
--- a/lua/solarized-osaka/extra/discord.lua
+++ b/lua/solarized-osaka/extra/discord.lua
@@ -158,7 +158,7 @@ function M.generate(colors)
   --control-brand-foreground: ${blue};
   --control-brand-foreground-new: ${blue};
   --mention-foreground: ${blue};
-  --mention-background: ${terminal_black};
+  --mention-background: ${bg};
   --background-mentioned: ${yellow}19;
   --background-mentioned-hover: ${yellow}14;
   --background-message-hover: ${base03}3F;
@@ -173,11 +173,11 @@ function M.generate(colors)
   --activity-card-background: ${bg_highlight};
   --textbox-markdown-syntax: ${fg};
   --spoiler-revealed-background: ${bg_highlight};
-  --spoiler-hidden-background: ${comment};
+  --spoiler-hidden-background: ${base01};
   --android-navigation-bar-background: ${bg_highlight};
   --android-ripple: ${black}4C;
   --bg-mod-faint: ${base03};
-  --bg-mod-subtle: ${terminal_black};
+  --bg-mod-subtle: ${bg};
   --focus-primary: ${blue};
   --interactive-normal: ${fg};
   --interactive-muted: ${base02}4C;
@@ -206,7 +206,7 @@ rect[mask="url(#svg-mask-status-idle)"] {
 }
 
 rect[mask="url(#svg-mask-status-dnd)"] {
-    fill: ${red1};
+    fill: ${red300};
 }
 
 rect[mask="url(#svg-mask-status-offline)"] {
@@ -266,8 +266,8 @@ rect[mask="url(#svg-mask-status-offline)"] {
   --hljs-params: var(--text-default);
   --hljs-params-attr: var(--hljs-params);
   /* --> Comment */
-  --hljs-comment: ${comment};
-  --hljs-comment-doctag: var(--hljs-comment);
+  --hljs-base01: ${base01};
+  --hljs-base01-doctag: var(--hljs-base01);
   /* --> String */
   --hljs-string: var(--color-4);
   --hljs-string-subst: var(--color-5);
@@ -302,8 +302,8 @@ rect[mask="url(#svg-mask-status-offline)"] {
   color: var(--text-default);
 }
 
-#app-mount .hljs-comment {
-  color: var(--hljs-comment);
+#app-mount .hljs-base01 {
+  color: var(--hljs-base01);
 }
 
 #app-mount .hljs-attribute {
@@ -443,8 +443,8 @@ rect[mask="url(#svg-mask-status-offline)"] {
   color: var(--hljs-template-variable);
 }
 
-#app-mount .hljs-comment .hljs-doctag {
-  color: var(--hljs-comment-doctag);
+#app-mount .hljs-base01 .hljs-doctag {
+  color: var(--hljs-base01-doctag);
 }
 
 #app-mount .hljs-params .hljs-attr {
diff --git a/lua/solarized-osaka/extra/fish.lua b/lua/solarized-osaka/extra/fish.lua
index b2d4f07..50fea33 100644
--- a/lua/solarized-osaka/extra/fish.lua
+++ b/lua/solarized-osaka/extra/fish.lua
@@ -16,7 +16,7 @@ function M.generate(colors)
     # solarized-osaka Color Palette
     set -l foreground ${fg}
     set -l selection ${blue700}
-    set -l comment ${comment}
+    set -l base01 ${base01}
     set -l red ${red}
     set -l orange ${orange}
     set -l yellow ${yellow}
@@ -34,18 +34,18 @@ function M.generate(colors)
     set -g fish_color_end $orange
     set -g fish_color_error $red
     set -g fish_color_param $purple
-    set -g fish_color_comment $comment
+    set -g fish_color_comment $base01
     set -g fish_color_selection --background=$selection
     set -g fish_color_search_match --background=$selection
     set -g fish_color_operator $green
     set -g fish_color_escape $pink
-    set -g fish_color_autosuggestion $comment
+    set -g fish_color_autosuggestion $base01
 
     # Completion Pager Colors
-    set -g fish_pager_color_progress $comment
+    set -g fish_pager_color_progress $base01
     set -g fish_pager_color_prefix $cyan
     set -g fish_pager_color_completion $foreground
-    set -g fish_pager_color_description $comment
+    set -g fish_pager_color_description $base01
     set -g fish_pager_color_selected_background --background=$selection
 
   ]],
diff --git a/lua/solarized-osaka/extra/fish_themes.lua b/lua/solarized-osaka/extra/fish_themes.lua
index cfba9f0..4f9726f 100644
--- a/lua/solarized-osaka/extra/fish_themes.lua
+++ b/lua/solarized-osaka/extra/fish_themes.lua
@@ -24,18 +24,18 @@ function M.generate(colors)
     fish_color_end ${orange}
     fish_color_error ${red}
     fish_color_param ${purple}
-    fish_color_comment ${comment}
+    fish_color_comment ${base01}
     fish_color_selection --background=${blue700}
     fish_color_search_match --background=${blue700}
     fish_color_operator ${green}
     fish_color_escape ${magenta}
-    fish_color_autosuggestion ${comment}
+    fish_color_autosuggestion ${base01}
 
     # Completion Pager Colors
-    fish_pager_color_progress ${comment}
+    fish_pager_color_progress ${base01}
     fish_pager_color_prefix ${cyan}
     fish_pager_color_completion ${fg}
-    fish_pager_color_description ${comment}
+    fish_pager_color_description ${base01}
     fish_pager_color_selected_background --background=${blue700}
   ]],
     fishColors
diff --git a/lua/solarized-osaka/extra/foot.lua b/lua/solarized-osaka/extra/foot.lua
index 24ea6e3..d397c6f 100644
--- a/lua/solarized-osaka/extra/foot.lua
+++ b/lua/solarized-osaka/extra/foot.lua
@@ -32,7 +32,7 @@ regular5=${magenta}
 regular6=${cyan}
 regular7=${base0}
 
-bright0=${terminal_black}
+bright0=${bg}
 bright1=${red}
 bright2=${green}
 bright3=${yellow}
@@ -42,7 +42,7 @@ bright6=${cyan}
 bright7=${fg}
 
 16=${orange}
-17=${red1}]],
+17=${red300}]],
     footColors
   )
 
diff --git a/lua/solarized-osaka/extra/gitui.lua b/lua/solarized-osaka/extra/gitui.lua
index 467382b..031587c 100644
--- a/lua/solarized-osaka/extra/gitui.lua
+++ b/lua/solarized-osaka/extra/gitui.lua
@@ -25,16 +25,16 @@ function M.generate(colors)
     [[
 (
   selected_tab: ${magenta}
-  command_fg: ${comment}
+  command_fg: ${base01}
   selection_bg: ${bg_highlight}
   selection_fg: ${cyan}
   cmdbar_bg: ${bg}
   cmdbar_extra_lines_bg: ${bg}
-  disabled_fg: ${comment}
+  disabled_fg: ${base01}
   diff_line_add: ${green}
   diff_line_delete: ${red}
   diff_file_added: ${green500}
-  diff_file_removed: ${red1}
+  diff_file_removed: ${red300}
   diff_file_moved: ${magenta2}
   diff_file_modified: ${yellow}
   commit_hash: ${magenta}
diff --git a/lua/solarized-osaka/extra/gnome_terminal.lua b/lua/solarized-osaka/extra/gnome_terminal.lua
index c4c811f..832cb80 100644
--- a/lua/solarized-osaka/extra/gnome_terminal.lua
+++ b/lua/solarized-osaka/extra/gnome_terminal.lua
@@ -34,7 +34,7 @@ foreground-color='${fg}'
 highlight-background-color='${fg}'
 highlight-colors-set=true
 highlight-foreground-color='${bg}'
-palette=['${terminal_black}', '${red}', '${green}', '${yellow}', '${blue}', '${magenta}', '${cyan}', '${fg}', '${terminal_black}', '${red}', '${green}', '${yellow}', '${blue}', '${magenta}', '${cyan}', '${fg}']
+palette=['${bg}', '${red}', '${green}', '${yellow}', '${blue}', '${magenta}', '${cyan}', '${fg}', '${bg}', '${red}', '${green}', '${yellow}', '${blue}', '${magenta}', '${cyan}', '${fg}']
 use-theme-colors=false
 visible-name='${_style_name}'
 ]],
diff --git a/lua/solarized-osaka/extra/iterm.lua b/lua/solarized-osaka/extra/iterm.lua
index 3b36fda..fddb7c9 100644
--- a/lua/solarized-osaka/extra/iterm.lua
+++ b/lua/solarized-osaka/extra/iterm.lua
@@ -213,13 +213,13 @@ function M.generate(colors)
 		<key>Alpha Component</key>
 		<real>1</real>
 		<key>Blue Component</key>
-		<real>${terminal_black.b}</real>
+		<real>${bg.b}</real>
 		<key>Color Space</key>
 		<string>sRGB</string>
 		<key>Green Component</key>
-		<real>${terminal_black.g}</real>
+		<real>${bg.g}</real>
 		<key>Red Component</key>
-		<real>${terminal_black.r}</real>
+		<real>${bg.r}</real>
 	</dict>
 	<key>Ansi 9 Color</key>
 	<dict>
diff --git a/lua/solarized-osaka/extra/lazygit.lua b/lua/solarized-osaka/extra/lazygit.lua
index ee26cb8..4f136ba 100644
--- a/lua/solarized-osaka/extra/lazygit.lua
+++ b/lua/solarized-osaka/extra/lazygit.lua
@@ -30,7 +30,7 @@ gui:
     markedBaseCommitBgColor:
       - "${yellow}"
     unstagedChangesColor:
-      - "${red1}"
+      - "${red300}"
     defaultFgColor:
       - "${fg}"
 ]],
diff --git a/lua/solarized-osaka/extra/prism.lua b/lua/solarized-osaka/extra/prism.lua
index 148c2d2..8ba1323 100644
--- a/lua/solarized-osaka/extra/prism.lua
+++ b/lua/solarized-osaka/extra/prism.lua
@@ -69,9 +69,8 @@ module.exports =  {
       },
     },
     {
-      types: ["comment"],
       style: {
-        color: "${comment}",
+        color: "${base01}",
         fontStyle: "italic",
       },
     },
diff --git a/lua/solarized-osaka/extra/process_compose.lua b/lua/solarized-osaka/extra/process_compose.lua
index a69a7ec..cb24550 100644
--- a/lua/solarized-osaka/extra/process_compose.lua
+++ b/lua/solarized-osaka/extra/process_compose.lua
@@ -22,7 +22,7 @@ style:
     fgWarning: '${yellow}'
     fgPending: '${base02}'
     fgCompleted: '${green}'
-    fgError: '${red1}'
+    fgError: '${red300}'
     headerFgColor: '${fg}'
   help:
     fgColor: '${blue300}'
@@ -33,7 +33,7 @@ style:
     fgColor: '${blue300}'
     bgColor: '${black}'
     contrastBgColor: '${bg}'
-    attentionBgColor: '${red1}'
+    attentionBgColor: '${red300}'
     buttonFgColor: '${black}'
     buttonBgColor: '${bg_highlight}'
     buttonFocusFgColor: '${black}'
diff --git a/lua/solarized-osaka/extra/spotify_player.lua b/lua/solarized-osaka/extra/spotify_player.lua
index 48d06a1..8ee5e2f 100644
--- a/lua/solarized-osaka/extra/spotify_player.lua
+++ b/lua/solarized-osaka/extra/spotify_player.lua
@@ -12,7 +12,7 @@ name = "${_style_name}"
 [themes.palette]
 background = "${base03}"
 foreground = "${base0}"
-black = "${terminal_black}"
+black = "${bg}"
 red = "${red}"
 green = "${green}"
 yellow = "${yellow}"
@@ -21,7 +21,7 @@ magenta = "${magenta}"
 cyan = "${cyan}"
 white = "${base04}"
 bright_black = "${bg}"
-bright_red = "${red1}"
+bright_red = "${red300}"
 bright_green = "${green500}"
 bright_yellow = "${orange}"
 bright_blue = "${blue2}"
diff --git a/lua/solarized-osaka/extra/sublime.lua b/lua/solarized-osaka/extra/sublime.lua
index fbe8788..e1b9b5d 100644
--- a/lua/solarized-osaka/extra/sublime.lua
+++ b/lua/solarized-osaka/extra/sublime.lua
@@ -105,7 +105,7 @@ M.template = [[
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>${comment}</string>
+				<string>${base01}</string>
 			</dict>
 		</dict>
 		<dict>
@@ -116,7 +116,7 @@ M.template = [[
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>${comment}</string>
+				<string>${base01}</string>
 			</dict>
 		</dict>
 		<dict>
@@ -1308,7 +1308,7 @@ M.template = [[
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>${red1}</string>
+				<string>${red300}</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/lua/solarized-osaka/extra/terminator.lua b/lua/solarized-osaka/extra/terminator.lua
index 525958b..3846b21 100644
--- a/lua/solarized-osaka/extra/terminator.lua
+++ b/lua/solarized-osaka/extra/terminator.lua
@@ -7,7 +7,7 @@ function M.generate(colors)
   local terminator = util.template(
     [=[
 [[${_style_name}]]
-  palette = "${black}:${red}:${green}:${yellow}:${blue}:${magenta}:${cyan}:${base0}:${terminal_black}:${red}:${green}:${yellow}:${blue}:${magenta}:${cyan}:${purple}"
+  palette = "${black}:${red}:${green}:${yellow}:${blue}:${magenta}:${cyan}:${base0}:${bg}:${red}:${green}:${yellow}:${blue}:${magenta}:${cyan}:${purple}"
   background_color = "${bg}"
   foreground_color = "${fg}"
   ]=],
diff --git a/lua/solarized-osaka/extra/termux.lua b/lua/solarized-osaka/extra/termux.lua
index d53b716..45216d4 100644
--- a/lua/solarized-osaka/extra/termux.lua
+++ b/lua/solarized-osaka/extra/termux.lua
@@ -36,7 +36,7 @@ color15: ${terminal.white_bright}
 
 # Extended colors
 color16: ${orange}
-color17: ${red1}
+color17: ${red300}
 ]],
     colors
   )
diff --git a/lua/solarized-osaka/extra/tilix.lua b/lua/solarized-osaka/extra/tilix.lua
index a5621ee..2ddb904 100644
--- a/lua/solarized-osaka/extra/tilix.lua
+++ b/lua/solarized-osaka/extra/tilix.lua
@@ -21,7 +21,7 @@ function M.generate(colors)
         "${magenta}",
         "${cyan}",
         "${base0}",
-        "${terminal_black}",
+        "${bg}",
         "${red}",
         "${green}",
         "${yellow}",
diff --git a/lua/solarized-osaka/extra/wezterm.lua b/lua/solarized-osaka/extra/wezterm.lua
index e7c47eb..f6b9278 100644
--- a/lua/solarized-osaka/extra/wezterm.lua
+++ b/lua/solarized-osaka/extra/wezterm.lua
@@ -16,7 +16,7 @@ selection_bg = "${blue700}"
 selection_fg = "${fg}"
 
 ansi = ["${black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${base0}"]
-brights = ["${terminal_black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg}"]
+brights = ["${bg}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg}"]
 
 [colors.tab_bar]
 inactive_tab_edge = "${base03}"
diff --git a/lua/solarized-osaka/extra/windows_terminal.lua b/lua/solarized-osaka/extra/windows_terminal.lua
index 1bc8c05..fed3891 100644
--- a/lua/solarized-osaka/extra/windows_terminal.lua
+++ b/lua/solarized-osaka/extra/windows_terminal.lua
@@ -12,7 +12,7 @@ function M.generate(colors)
     "background": "${bg}",
     "black": "${black}",
     "blue": "${blue}",
-    "brightBlack": "${terminal_black}",
+    "brightBlack": "${bg}",
     "brightBlue": "${blue}",
     "brightCyan": "${cyan}",
     "brightGreen": "${green}",
diff --git a/lua/solarized-osaka/extra/xfceterm.lua b/lua/solarized-osaka/extra/xfceterm.lua
index cde314c..ae18178 100644
--- a/lua/solarized-osaka/extra/xfceterm.lua
+++ b/lua/solarized-osaka/extra/xfceterm.lua
@@ -14,7 +14,7 @@ ColorForeground=${fg}
 ColorSelectionBackground=${blue700}
 ColorSelection=${fg}
 
-ColorPalette=${black};${red};${green};${yellow};${blue};${magenta};${cyan};${base0};${terminal_black};${red};${green};${yellow};${blue};${magenta};${cyan};${fg}
+ColorPalette=${black};${red};${green};${yellow};${blue};${magenta};${cyan};${base0};${bg};${red};${green};${yellow};${blue};${magenta};${cyan};${fg}
 ]],
     colors
   )
diff --git a/lua/solarized-osaka/extra/xresources.lua b/lua/solarized-osaka/extra/xresources.lua
index c9a0eff..c16fafe 100644
--- a/lua/solarized-osaka/extra/xresources.lua
+++ b/lua/solarized-osaka/extra/xresources.lua
@@ -20,7 +20,7 @@ function M.generate(colors)
 *color6: ${cyan}
 *color7: ${base0}
 
-*color8: ${terminal_black}
+*color8: ${bg}
 *color9: ${red}
 *color10: ${green}
 *color11: ${yellow}
diff --git a/lua/solarized-osaka/extra/yazi.lua b/lua/solarized-osaka/extra/yazi.lua
index 37e9015..191ad58 100644
--- a/lua/solarized-osaka/extra/yazi.lua
+++ b/lua/solarized-osaka/extra/yazi.lua
@@ -35,7 +35,7 @@ tab_width    = 1
 
 # Count
 count_copied   = { fg = "${fg}", bg = "${green2}" }
-count_cut      = { fg = "${fg}", bg = "${red1}" }
+count_cut      = { fg = "${fg}", bg = "${red300}" }
 count_selected = { fg = "${fg}", bg = "${blue700}" }
 
 # Border
@@ -67,7 +67,7 @@ perm_type  = { fg = "${blue}" }
 perm_read  = { fg = "${yellow}" }
 perm_write = { fg = "${red}" }
 perm_exec  = { fg = "${green}" }
-perm_sep   = { fg = "${terminal_black}" }
+perm_sep   = { fg = "${bg}" }
 
 [pick]
 border   = { fg = "${border_highlight}" }
@@ -105,7 +105,7 @@ cand            = { fg = "${cyan}" }
 rest            = { fg = "${blue}" }
 desc            = { fg = "${magenta}" }
 separator       = " ➜ "
-separator_style = { fg = "${comment}" }
+separator_style = { fg = "${base01}" }
 
 # Confirm
 [confirm]
diff --git a/lua/solarized-osaka/extra/zathura.lua b/lua/solarized-osaka/extra/zathura.lua
index 5c0bdbc..425e17e 100644
--- a/lua/solarized-osaka/extra/zathura.lua
+++ b/lua/solarized-osaka/extra/zathura.lua
@@ -14,18 +14,18 @@ function M.generate(colors)
 set notification-error-bg "${red}"
 set notification-error-fg "${fg}"
 set notification-warning-bg "${yellow}"
-set notification-warning-fg "${terminal_black}"
+set notification-warning-fg "${bg}"
 set notification-bg "${bg}"
 set notification-fg "${fg}"
 set completion-bg "${bg}"
 set completion-fg "${base0}"
 set completion-group-bg "${bg}"
 set completion-group-fg "${base0}"
-set completion-highlight-bg "${terminal_black}"
+set completion-highlight-bg "${bg}"
 set completion-highlight-fg "${fg}"
 set index-bg "${bg}"
 set index-fg "${fg}"
-set index-active-bg "${terminal_black}"
+set index-active-bg "${bg}"
 set index-active-fg "${fg}"
 set inputbar-bg "${bg}"
 set inputbar-fg "${fg}"
diff --git a/lua/solarized-osaka/reassign.lua b/lua/solarized-osaka/reassign.lua
index 30fdc56..27b1656 100644
--- a/lua/solarized-osaka/reassign.lua
+++ b/lua/solarized-osaka/reassign.lua
@@ -8,10 +8,10 @@ function M.setup(colors)
   -- colors.green1 = colors.green500
   -- colors.dark3 = colors.base02
   -- colors.fg_dark = colors.base0
-  colors.bg_dark = colors.base03
-  colors.terminal_black = colors.bg
-  colors.red1 = colors.red300
-  colors.comment = colors.base01
+  -- colors.bg_dark = colors.base03
+  -- colors.terminal_black = colors.bg
+  -- colors.red1 = colors.red300
+  -- colors.comment = colors.base01
   colors.purple = colors.violet500
 
   -- Blue variants (using different intensities for visual hierarchy)