diff --git a/dotfiles/ps1/ps1.sh b/dotfiles/ps1/ps1.sh
index 55b03a1..7e72f52 100644
--- a/dotfiles/ps1/ps1.sh
+++ b/dotfiles/ps1/ps1.sh
@@ -528,29 +528,57 @@ _ps1_set_prompt() {
 
   case "$style" in
     neon)
-      local N1_BG="\[\e[48;5;201m\]"
+      local N1_BG_CODE=201
+      local N2_BG_CODE=45
+      local N1_BG="\[\e[48;5;${N1_BG_CODE}m\]"
       local N1_FG="\[\e[38;5;255m\]"
-      local N2_BG="\[\e[48;5;45m\]"
+      local N2_BG="\[\e[48;5;${N2_BG_CODE}m\]"
       local N2_FG="\[\e[38;5;16m\]"
       local N_PATH_FG="\[\e[38;5;16m\]"
       local N_FRAME="\[\e[38;5;199m\]"
+      local N_LEFT="${left}"
+      local N_RIGHT="${right}"
+      local N_SEP="${sep}"
+      local N_LEFT_FG=""
+      local N_RIGHT_FG=""
+      if [[ "$__PS1_USE_NF" -eq 1 ]]; then
+        N_LEFT=""
+        N_RIGHT=""
+        N_SEP=""
+        N_LEFT_FG="\[\e[38;5;${N1_BG_CODE}m\]"
+        N_RIGHT_FG="\[\e[38;5;${N2_BG_CODE}m\]"
+      fi
       PS1="\
 ${PREFIX}${N_FRAME}╭─${RST}\
-${N1_BG}${N1_FG}${left} ${BOLD}\\u${NOBOLD} \\d \\A ${RST}${N1_BG}${N2_BG}${N2_FG}${sep}${RST}\
-${N2_BG}${N2_FG} ${HOST_PART}${PATH_SEP}${N_PATH_FG}${PATH_PART}${END_PAD}${right}${RST}\
+${N_LEFT_FG}${N_LEFT}${RST}${N1_BG}${N1_FG} ${BOLD}\\u${NOBOLD} \\d \\A ${RST}${N1_BG}${N2_BG}${N2_FG}${N_SEP}${RST}\
+${N2_BG}${N2_FG} ${HOST_PART}${PATH_SEP}${N_PATH_FG}${PATH_PART}${END_PAD}${RST}${N_RIGHT_FG}${N_RIGHT}${RST}\
 \n${N_FRAME}╰── ${RST}${prompt_sym} ${__PS1_SYM} "
       ;;
     forge)
-      local F1_BG="\[\e[48;5;94m\]"
+      local F1_BG_CODE=94
+      local F2_BG_CODE=166
+      local F1_BG="\[\e[48;5;${F1_BG_CODE}m\]"
       local F1_FG="\[\e[38;5;230m\]"
-      local F2_BG="\[\e[48;5;166m\]"
+      local F2_BG="\[\e[48;5;${F2_BG_CODE}m\]"
       local F2_FG="\[\e[38;5;231m\]"
       local F_PATH_FG="\[\e[38;5;224m\]"
       local F_FRAME="\[\e[38;5;130m\]"
+      local F_LEFT="${left}"
+      local F_RIGHT="${right}"
+      local F_SEP="${sep}"
+      local F_LEFT_FG=""
+      local F_RIGHT_FG=""
+      if [[ "$__PS1_USE_NF" -eq 1 ]]; then
+        F_LEFT=""
+        F_RIGHT=""
+        F_SEP=""
+        F_LEFT_FG="\[\e[38;5;${F1_BG_CODE}m\]"
+        F_RIGHT_FG="\[\e[38;5;${F2_BG_CODE}m\]"
+      fi
       PS1="\
 ${PREFIX}${F_FRAME}╭─${RST}\
-${F1_BG}${F1_FG}${left} ${BOLD}${L1}${NOBOLD} ${RST}${F1_BG}${F2_BG}${F2_FG}${sep}${RST}\
-${F2_BG}${F2_FG} ${HOST_PART}${PATH_SEP}${F_PATH_FG}${PATH_PART}${END_PAD}${right}${RST}\
+${F_LEFT_FG}${F_LEFT}${RST}${F1_BG}${F1_FG} ${BOLD}${L1}${NOBOLD} ${RST}${F1_BG}${F2_BG}${F2_FG}${F_SEP}${RST}\
+${F2_BG}${F2_FG} ${HOST_PART}${PATH_SEP}${F_PATH_FG}${PATH_PART}${END_PAD}${RST}${F_RIGHT_FG}${F_RIGHT}${RST}\
 \n${F_FRAME}╰── ${RST}${prompt_sym} ${__PS1_SYM} "
       ;;
     circuit)