diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index a49ba5c..c4e1459 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -1,4 +1,4 @@
-include ./themes/mocha.conf
+include ./themes/gruvbox_dark_hard.conf
 # vim:fileencoding=utf-8:foldmethod=marker
 
 #: Fonts {{{
diff --git a/kitty/themes/gruvbox_dark.conf b/kitty/themes/gruvbox_dark.conf
new file mode 100644
index 0000000..9d938d2
--- /dev/null
+++ b/kitty/themes/gruvbox_dark.conf
@@ -0,0 +1,55 @@
+# Based on https://github.com/morhetz/gruvbox by morhetz <morhetz@gmail.com>
+# Adapted to kitty by wdomitrz <witekdomitrz@gmail.com>
+
+cursor                  #928374
+cursor_text_color       background
+
+url_color               #83a598
+
+visual_bell_color       #8ec07c
+bell_border_color       #8ec07c
+
+active_border_color     #d3869b
+inactive_border_color   #665c54
+
+foreground              #ebdbb2
+background              #282828
+selection_foreground    #928374
+selection_background    #ebdbb2
+
+active_tab_foreground   #fbf1c7
+active_tab_background   #665c54
+inactive_tab_foreground #a89984
+inactive_tab_background #3c3836
+
+# black  (bg3/bg4)
+color0                  #665c54
+color8                  #7c6f64
+
+# red
+color1                  #cc241d
+color9                  #fb4934
+
+#: green
+color2                  #98971a
+color10                 #b8bb26
+
+# yellow
+color3                  #d79921
+color11                 #fabd2f
+
+# blue
+color4                  #458588
+color12                 #83a598
+
+# purple
+color5                  #b16286
+color13                 #d3869b
+
+# aqua
+color6                  #689d6a
+color14                 #8ec07c
+
+# white (fg4/fg3)
+color7                  #a89984
+color15                 #bdae93
diff --git a/kitty/themes/gruvbox_dark_hard.conf b/kitty/themes/gruvbox_dark_hard.conf
new file mode 100644
index 0000000..21c0ddc
--- /dev/null
+++ b/kitty/themes/gruvbox_dark_hard.conf
@@ -0,0 +1,3 @@
+include gruvbox_dark.conf
+
+background  #1d2021
diff --git a/kitty/themes/gruvbox_dark_soft.conf b/kitty/themes/gruvbox_dark_soft.conf
new file mode 100644
index 0000000..f439cf1
--- /dev/null
+++ b/kitty/themes/gruvbox_dark_soft.conf
@@ -0,0 +1,3 @@
+include gruvbox_dark.conf
+
+background  #32302f
diff --git a/kitty/themes/gruvbox_light.conf b/kitty/themes/gruvbox_light.conf
new file mode 100644
index 0000000..e90ca74
--- /dev/null
+++ b/kitty/themes/gruvbox_light.conf
@@ -0,0 +1,55 @@
+# Based on https://github.com/morhetz/gruvbox by morhetz <morhetz@gmail.com>
+# Adapted to kitty by wdomitrz <witekdomitrz@gmail.com>
+
+cursor                  #928374
+cursor_text_color       background
+
+url_color               #458588
+
+visual_bell_color       #689d6a
+bell_border_color       #689d6a
+
+active_border_color     #b16286
+inactive_border_color   #1d2021
+
+foreground              #3c3836
+background              #fbf1c7
+selection_foreground    #928374
+selection_background    #3c3836
+
+active_tab_foreground   #282828
+active_tab_background   #928374
+inactive_tab_foreground #7c6f64
+inactive_tab_background #ebdbb2
+
+# white (bg3/bg4)
+color0                  #bdae93
+color8                  #a89984
+
+# red
+color1                  #cc241d
+color9                  #9d0006
+
+# green
+color2                  #98971a
+color10                 #79740e
+
+# yellow
+color3                  #d79921
+color11                 #b57614
+
+# blue
+color4                  #458588
+color12                 #076678
+
+# purple
+color5                  #b16286
+color13                 #8f3f71
+
+# aqua
+color6                  #689d6a
+color14                 #427b58
+
+# black (fg4/fg3)
+color7                  #7c6f64
+color15                 #665c54
diff --git a/kitty/themes/gruvbox_light_hard.conf b/kitty/themes/gruvbox_light_hard.conf
new file mode 100644
index 0000000..f42e0c3
--- /dev/null
+++ b/kitty/themes/gruvbox_light_hard.conf
@@ -0,0 +1,3 @@
+include gruvbox_light.conf
+
+background  #f9f5d7
diff --git a/kitty/themes/gruvbox_light_soft.conf b/kitty/themes/gruvbox_light_soft.conf
new file mode 100644
index 0000000..7f8f525
--- /dev/null
+++ b/kitty/themes/gruvbox_light_soft.conf
@@ -0,0 +1,3 @@
+include gruvbox_light.conf
+
+background  #f2e5bc