diff --git a/.config/fish/conf.d/theme.fish b/.config/fish/conf.d/theme.fish
new file mode 100644
index 0000000..e302719
--- /dev/null
+++ b/.config/fish/conf.d/theme.fish
@@ -0,0 +1,25 @@
+set -g fish_color_normal normal
+
+set -g fish_color_command blue
+set -g fish_color_quote yellow
+set -g fish_color_redirection cyan --bold
+set -g fish_color_end green
+set -g fish_color_error brred
+set -g fish_color_param cyan
+
+set -g fish_color_autosuggestion brblack
+set -g fish_color_comment red
+
+set -g fish_color_cancel --background=red
+set -g fish_color_escape brcyan
+set -g fish_color_history_current normal --bold
+set -g fish_color_operator brcyan
+set -g fish_color_search_match white --background=brblack
+set -g fish_color_selection white --bold --background=brblack
+set -g fish_color_status red
+set -g fish_color_valid_path normal --underline
+
+set -g fish_pager_color_description yellow --italic
+set -g fish_pager_color_prefix normal --bold --underline
+set -g fish_pager_color_progress brwhite --background=cyan
+set -g fish_pager_color_selected_background --background=red
diff --git a/.config/ghostty/config b/.config/ghostty/config
index d448f84..f3dd0b4 100644
--- a/.config/ghostty/config
+++ b/.config/ghostty/config
@@ -1,14 +1,15 @@
 # Theme
-theme = gruvbox-material-medium-dark
+theme = GruvboxDarkHard
 
 # Font
-font-family = JetBrainsMono Nerd Font Mono
+font-family = IosevkaDT Nerd Font
 font-style = Medium
 font-size = 16
 font-feature = -calt
 font-feature = -liga
 font-feature = -dlig
 
+# Misc
 window-padding-color = background
 macos-titlebar-style = hidden