diff --git a/config/kitty/current-theme.conf b/config/kitty/current-theme.conf
new file mode 100644
index 0000000..014901b
--- /dev/null
+++ b/config/kitty/current-theme.conf
@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Moon
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_moon.conf
+
+
+background #222436
+foreground #c8d3f5
+selection_background #2d3f76
+selection_foreground #c8d3f5
+url_color #4fd6be
+cursor #c8d3f5
+cursor_text_color #222436
+
+# Tabs
+active_tab_background #82aaff
+active_tab_foreground #1e2030
+inactive_tab_background #2f334d
+inactive_tab_foreground #545c7e
+#tab_bar_background #1b1d2b
+
+# Windows
+active_border_color #82aaff
+inactive_border_color #2f334d
+
+# normal
+color0 #1b1d2b
+color1 #ff757f
+color2 #c3e88d
+color3 #ffc777
+color4 #82aaff
+color5 #c099ff
+color6 #86e1fc
+color7 #828bb8
+
+# bright
+color8 #444a73
+color9 #ff757f
+color10 #c3e88d
+color11 #ffc777
+color12 #82aaff
+color13 #c099ff
+color14 #86e1fc
+color15 #c8d3f5
+
+# extended colors
+color16 #ff966c
+color17 #c53b53
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index eed1798..8b02771 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -18,24 +18,30 @@ background_opacity 0.6
 # Theme / Colorscheme
 # Tomorrow Night Eighties
 #
-background            #2c2c2c
-foreground            #cccccc
-cursor                #cccccc
-selection_background  #505050
-color0                #000000
-color8                #000000
-color1                #f17779
-color9                #f17779
-color2                #99cc99
-color10               #99cc99
-color3                #ffcc66
-color11               #ffcc66
-color4                #6699cc
-color12               #6699cc
-color5                #cc99cc
-color13               #cc99cc
-color6                #66cccc
-color14               #66cccc
-color7                #fffefe
-color15               #fffefe
-selection_foreground #2c2c2c
+# background            #2c2c2c
+# foreground            #cccccc
+# cursor                #cccccc
+# selection_background  #505050
+# color0                #000000
+# color8                #000000
+# color1                #f17779
+# color9                #f17779
+# color2                #99cc99
+# color10               #99cc99
+# color3                #ffcc66
+# color11               #ffcc66
+# color4                #6699cc
+# color12               #6699cc
+# color5                #cc99cc
+# color13               #cc99cc
+# color6                #66cccc
+# color14               #66cccc
+# color7                #fffefe
+# color15               #fffefe
+# selection_foreground #2c2c2c
+
+
+# BEGIN_KITTY_THEME
+# Tokyo Night Moon
+include current-theme.conf
+# END_KITTY_THEME
diff --git a/config/kitty/kitty.conf.bak b/config/kitty/kitty.conf.bak
new file mode 100644
index 0000000..eed1798
--- /dev/null
+++ b/config/kitty/kitty.conf.bak
@@ -0,0 +1,41 @@
+#font
+font_family      JetBrains Mono
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
+
+font_size 12
+
+# Window
+background_opacity 0.6
+
+
+
+# Bindings
+
+
+
+# Theme / Colorscheme
+# Tomorrow Night Eighties
+#
+background            #2c2c2c
+foreground            #cccccc
+cursor                #cccccc
+selection_background  #505050
+color0                #000000
+color8                #000000
+color1                #f17779
+color9                #f17779
+color2                #99cc99
+color10               #99cc99
+color3                #ffcc66
+color11               #ffcc66
+color4                #6699cc
+color12               #6699cc
+color5                #cc99cc
+color13               #cc99cc
+color6                #66cccc
+color14               #66cccc
+color7                #fffefe
+color15               #fffefe
+selection_foreground #2c2c2c
diff --git a/config/sway/config b/config/sway/config
index 5a23ff2..758e027 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -59,7 +59,7 @@ set $down j
 set $up k
 set $right l
 # Your preferred terminal emulator
-set $term alacritty
+set $term kitty
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.