diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 62fd177..e69de29 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1 +0,0 @@
-theme
diff --git a/fish/.config/fish/functions/_gruvbox_dark.fish b/fish/.config/fish/functions/_gruvbox_dark.fish
deleted file mode 100644
index 828265f..0000000
--- a/fish/.config/fish/functions/_gruvbox_dark.fish
+++ /dev/null
@@ -1,25 +0,0 @@
-function _gruvbox_dark -d "Set colortheme to gruvbox dark"
-  kitty @ --to unix:/tmp/kitty set-colors --reset
-
-  set -eU termTheme
-
-  set fish_color_normal ebdbb2
-  set fish_color_command fbf1c7 bold
-  set fish_color_quote 98971a
-  set fish_color_end d3869b
-  set fish_color_error cc241d
-  set fish_color_param a89984
-  set fish_color_comment 689d6a
-  set fish_color_match 458588
-  set fish_color_selection d79921
-  set fish_color_search_match d65d0e
-  set fish_color_operator b16286
-  set fish_color_escape a89984
-  set fish_color_cwd 789d6a
-  set fish_color_autosuggestion 8ec07c
-  set fish_color_user b8bb26
-  set fish_color_host d6c4a1
-  set fish_color_host_remote b8bb26
-  set fish_color_cancel cc241d
-  set fish_pager_color_background d79921
-end
diff --git a/fish/.config/fish/functions/_gruvbox_light.fish b/fish/.config/fish/functions/_gruvbox_light.fish
deleted file mode 100644
index e2a7384..0000000
--- a/fish/.config/fish/functions/_gruvbox_light.fish
+++ /dev/null
@@ -1,25 +0,0 @@
-function _gruvbox_light -d "Set colortheme to gruvbox light"
-  kitty @ --to unix:/tmp/kitty set-colors --all --configured ~/.config/kitty/themes/gruvbox-light.conf
-
-  set -xU termTheme "light"
-
-  set fish_color_normal 3c3836
-  set fish_color_command 282828 bold
-  set fish_color_quote 98971a
-  set fish_color_end d3869b
-  set fish_color_error cc241d
-  set fish_color_param 7c6f64
-  set fish_color_comment 689d6a
-  set fish_color_match 458588
-  set fish_color_selection d79921
-  set fish_color_search_match d65d0e
-  set fish_color_operator b16286
-  set fish_color_escape a89984
-  set fish_color_cwd 789d6a
-  set fish_color_autosuggestion 8ec07c
-  set fish_color_user b8bb26
-  set fish_color_host d6c4a1
-  set fish_color_host_remote b8bb26
-  set fish_color_cancel cc241d
-  set fish_pager_color_background d79921
-end
diff --git a/fish/.config/fish/functions/theme.fish b/fish/.config/fish/functions/theme.fish
deleted file mode 100644
index 418f12b..0000000
--- a/fish/.config/fish/functions/theme.fish
+++ /dev/null
@@ -1,22 +0,0 @@
-function theme -d "toggle kitty theme"
-  if test -z "$argv[1]"
-    if test "$termTheme" = "light"
-      _gruvbox_light
-    else
-      _gruvbox_dark
-    end
-  end
-  if test "$argv[1]" = "dark"
-    _gruvbox_dark
-  end
-  if test "$argv[1]" = "light"
-    _gruvbox_light
-  end
-  if test "$argv[1]" = "switch"
-    if test "$termTheme" = "light"
-      _gruvbox_dark
-    else
-      _gruvbox_light
-    end
-  end
-end
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index b98a203..846cb46 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -1,7 +1,7 @@
 # vim:fileencoding=utf-8:ft=conf
 
 # Theme
-include themes/gruvbox.conf
+include themes/moonfly.conf
 tab_bar_style powerline
 
 # OS specific changes
diff --git a/kitty/.config/kitty/themes/gruvbox-light.conf b/kitty/.config/kitty/themes/gruvbox-light.conf
deleted file mode 100644
index e8406f0..0000000
--- a/kitty/.config/kitty/themes/gruvbox-light.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# vim:fileencoding=utf-8:ft=conf
-
-# https://github.com/morhetz/gruvbox
-
-font_family      hasklig
-italic_font      hasklig
-bold_font        hasklig
-bold_italic_font hasklig
-
-# Font size (in pts)
-font_size        14.0
-
-foreground                 #3c3836
-background                 #F9F5D7
-background_opacity         1.0
-dynamic_background_opacity no
-dim_opacity                0.75
-selection_foreground       #000000
-selection_background       #FFFACD
-
-# black
-color0  #fbf1c7
-color8  #928374
-
-# red
-color1  #cc241d
-color9  #9d0006
-
-# green
-color2  #98971a
-color10 #79740e
-
-# yellow
-color3  #d79921
-color11 #b57614
-
-# blue
-color4  #458588
-color12 #076678
-
-# magenta
-color5  #b16286
-color13 #8f3f71
-
-# cyan
-color6  #689d6a
-color14 #427b58
-
-# white
-color7  #7c6f64
-color15 #3c3836
-
-cursor  #393432
diff --git a/kitty/.config/kitty/themes/gruvbox.conf b/kitty/.config/kitty/themes/gruvbox.conf
deleted file mode 100644
index 544aa38..0000000
--- a/kitty/.config/kitty/themes/gruvbox.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# vim:fileencoding=utf-8:ft=conf
-
-# https://github.com/morhetz/gruvbox
-
-font_family      jetbrains mono
-italic_font      jetbrains mono italic
-bold_font        jetbrains mono bold
-bold_italic_font jetbrains mono bold italic
-
-# Font size (in pts)
-font_size           14.0
-
-foreground                 #ebdbb2
-background                 #282828
-background_opacity         1.0
-dynamic_background_opacity no
-dim_opacity                0.75
-selection_foreground       #000000
-selection_background       #FFFACD
-
-# black
-color0  #282828
-color8  #928374
-
-# red
-color1  #cc241d
-color9  #fb4934
-
-# green
-color2  #98871a
-color10 #b8bb26
-
-# yellow
-color3  #d79921
-color11 #fabd2f
-
-# blue
-color4  #458588
-color12 #83a598
-
-# magenta
-color5  #b16286
-color13 #d3869b
-
-# cyan
-color6  #689d6a
-color14 #8ec07c
-
-# white
-color7  #a89984
-color15 #ebdbb2
-
-cursor  #cccccc
diff --git a/kitty/.config/kitty/themes/moonfly.conf b/kitty/.config/kitty/themes/moonfly.conf
new file mode 100644
index 0000000..4438dc8
--- /dev/null
+++ b/kitty/.config/kitty/themes/moonfly.conf
@@ -0,0 +1,33 @@
+# vim:fileencoding=utf-8:ft=conf
+
+# https://github.com/morhetz/gruvbox
+
+font_family      jetbrains mono
+italic_font      jetbrains mono italic
+bold_font        jetbrains mono bold
+bold_italic_font jetbrains mono bold italic
+
+# Font size (in pts)
+font_size           14.0
+
+background #080808
+foreground #b2b2b2
+cursor #9e9e9e
+color0 #373c40
+color1 #ff5454
+color2 #8cc85f
+color3 #e3c78a
+color4 #80a0ff
+color5 #d183e8
+color6 #79dac8
+color7 #a1aab8
+color8 #7c8f8f
+color9 #ff5189
+color10 #36c692
+color11 #bfbf97
+color12 #78c2ff
+color13 #ae81ff
+color14 #85dc85
+color15 #e2637f
+selection_background #b2ceee
+selection_foreground #080808
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 324b8bc..ac6f7f4 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -14,23 +14,14 @@ paq {'savq/paq-nvim', opt=true}
 
 
 -- THEME
--- gruvbox colors
-paq 'gruvbox-community/gruvbox'
-vim.g.gruvbox_italic = 1
-vim.g.gruvbox_improved_strings = 1
-vim.g.gruvbox_improved_warnings = 1
-vim.g.gruvbox_contrast_light = 'hard'
-vim.g.gruvbox_contrast_dark = 'medium'
-vim.cmd [[colorscheme gruvbox]]
+paq 'bluz71/vim-moonfly-colors'
+vim.cmd [[colorscheme moonfly]]
 -- statusline
 paq 'itchyny/lightline.vim'
 vim.g.lightline = {
-  colorscheme = 'gruvbox'
+  colorscheme = 'moonfly'
 }
 vim.o.showmode = false
-if os.getenv('termTheme') == 'light' then
-  vim.o.background = 'light'
-end
 
 
 -- UI