diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 8eb2367..31dd743 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -6,8 +6,10 @@
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-font_family    FiraCode-Retina
-bold_font      FiraCode-Bold
+# font_family    FiraCode-Retina
+# bold_font      FiraCode-Bold
+font_family    FiraCodeNFM-Ret
+bold_font      FiraCodeNFM-Bold
 italic_font    CascadiaCodePL-SemiBoldItalic
 bold_italic_font CascadiaCodePL-BoldItalic
 # italic_font    JetBrainsMono-MediumItalic
@@ -79,44 +81,44 @@ modify_font cell_width  100%
 # file: https://github.com/ryanoasis/nerd-fonts/blob/master/src/glyphs/Symbols-2048-em Nerd Font Complete.ttf
 ###########################################################
 
-# "Nerd Fonts - Pomicons"
-symbol_map  U+E000-U+E00D Symbols Nerd Font
-
-# "Nerd Fonts - Powerline"
-symbol_map U+e0a0-U+e0a2,U+e0b0-U+e0b3 Symbols Nerd Font
-
-# "Nerd Fonts - Powerline Extra"
-symbol_map U+e0a3-U+e0a3,U+e0b4-U+e0c8,U+e0cc-U+e0d2,U+e0d4-U+e0d4 Symbols Nerd Font
-
-# "Nerd Fonts - Symbols original"
-symbol_map U+e5fa-U+e62b Symbols Nerd Font
-
-# "Nerd Fonts - Devicons"
-symbol_map U+e700-U+e7c5 Symbols Nerd Font
-
-# "Nerd Fonts - Font awesome"
-symbol_map U+f000-U+f2e0 Symbols Nerd Font
-
-# "Nerd Fonts - Font awesome extension"
-symbol_map U+e200-U+e2a9 Symbols Nerd Font
-
-# "Nerd Fonts - Octicons"
-symbol_map U+f400-U+f4a8,U+2665-U+2665,U+26A1-U+26A1,U+f27c-U+f27c Symbols Nerd Font
-
-# "Nerd Fonts - Font Linux"
-symbol_map U+F300-U+F313 Symbols Nerd Font
-
-#  Nerd Fonts - Font Power Symbols"
-symbol_map U+23fb-U+23fe,U+2b58-U+2b58 Symbols Nerd Font
-
-#  "Nerd Fonts - Material Design Icons"
-symbol_map U+f500-U+fd46 Symbols Nerd Font
-
-# "Nerd Fonts - Weather Icons"
-symbol_map U+e300-U+e3eb Symbols Nerd Font
-
-# Misc Code Point Fixes
-symbol_map U+21B5,U+25B8,U+2605,U+2630,U+2632,U+2714,U+E0A3,U+E615,U+E62B Symbols Nerd Font
+### # "Nerd Fonts - Pomicons"
+### symbol_map  U+E000-U+E00D Symbols Nerd Font
+### 
+### # "Nerd Fonts - Powerline"
+### symbol_map U+e0a0-U+e0a2,U+e0b0-U+e0b3 Symbols Nerd Font
+### 
+### # "Nerd Fonts - Powerline Extra"
+### symbol_map U+e0a3-U+e0a3,U+e0b4-U+e0c8,U+e0cc-U+e0d2,U+e0d4-U+e0d4 Symbols Nerd Font
+### 
+### # "Nerd Fonts - Symbols original"
+### symbol_map U+e5fa-U+e62b Symbols Nerd Font
+### 
+### # "Nerd Fonts - Devicons"
+### symbol_map U+e700-U+e7c5 Symbols Nerd Font
+### 
+### # "Nerd Fonts - Font awesome"
+### symbol_map U+f000-U+f2e0 Symbols Nerd Font
+### 
+### # "Nerd Fonts - Font awesome extension"
+### symbol_map U+e200-U+e2a9 Symbols Nerd Font
+### 
+### # "Nerd Fonts - Octicons"
+### symbol_map U+f400-U+f4a8,U+2665-U+2665,U+26A1-U+26A1,U+f27c-U+f27c Symbols Nerd Font
+### 
+### # "Nerd Fonts - Font Linux"
+### symbol_map U+F300-U+F313 Symbols Nerd Font
+### 
+### #  Nerd Fonts - Font Power Symbols"
+### symbol_map U+23fb-U+23fe,U+2b58-U+2b58 Symbols Nerd Font
+### 
+### #  "Nerd Fonts - Material Design Icons"
+### symbol_map U+f500-U+fd46 Symbols Nerd Font
+### 
+### # "Nerd Fonts - Weather Icons"
+### symbol_map U+e300-U+e3eb Symbols Nerd Font
+### 
+### # Misc Code Point Fixes
+### symbol_map U+21B5,U+25B8,U+2605,U+2630,U+2632,U+2714,U+E0A3,U+E615,U+E62B Symbols Nerd Font
 
 #: Map the specified unicode codepoints to a particular font. Useful
 #: if you need special rendering for some symbols, such as for
@@ -148,6 +150,13 @@ font_features FiraCode-Light +zero +ss07 +cv31
 font_features FiraCode-Medium +zero +ss07 +cv31
 font_features FiraCode-Regular +zero +ss07 +cv31
 font_features FiraCode-Retina +zero +ss07 +cv31
+
+font_features FiraCodeNFM-Bold +zero +ss07 +cv31
+font_features FiraCodeNFM-Light +zero +ss07 +cv31
+font_features FiraCodeNFM-Med +zero +ss07 +cv31
+font_features FiraCodeNFM-Reg +zero +ss07 +cv31
+font_features FiraCodeNFM-Ret +zero +ss07 +cv31
+
 font_features JetBrainsMono-Italic +liga +calt +ss04 +ss05
 font_features JetBrainsMono-BoldItalic +liga +calt +ss04 +ss05
 font_features JetBrainsMono-MediumItalic +liga +calt +ss04 +ss05
diff --git a/.config/starship.toml b/.config/starship.toml
index 67398a6..33d9e84 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -22,8 +22,8 @@ disabled = true
 
 [character]
 success_symbol = "[➜](bold green)"
-# error_symbol = "[](bold #ee4e4e)"
-error_symbol = "[](bold red)" # the non-nerdfont default is 🔥
+# error_symbol = "[󰈸](bold #ee4e4e)"
+error_symbol = "[󰈸](bold red)" # the non-nerdfont default is 🔥
 vimcmd_symbol = "[N](bold green)"
 
 [battery]
@@ -43,7 +43,7 @@ format = "[$symbol($version)]($style) "
 
 [cmake]
 disabled = false
-symbol= "喝" # the non-nerdfont default is △
+symbol= "󰔷 " # the non-nerdfont default is △
 style = "blue"
 format = "[$symbol]($style)"
 
@@ -211,7 +211,7 @@ format = "[](fg:$style)[$symbol ](bg:$style)[\ue0b8 $status $common_meaning$s
 
 
 [terraform]
-format = "[💠 ($workspace )]($style)" # alternatively use 💨 or ﰉ for symbol
+format = "[💠 ($workspace )]($style)" # alternatively use 💨 or 󰜋 for symbol
 
 [time]
 disabled = true
@@ -237,7 +237,7 @@ disabled = false
 description = "The currently installed version of Harelang"
 detect_extensions = ["ha"]
 # since there is no hare emoji so far, the one for rabbit is used
-symbol = "🐰 "
+symbol = "󰤇 "
 command = "hare version | cut -f 2 -d ' '"
 style = "dimmed bold bright-black"
 format = "$symbol[($output)]($style) "