diff --git a/.config/hypr/current-theme.conf b/.config/hypr/current-theme.conf
index abb52db..dedc1e1 100644
--- a/.config/hypr/current-theme.conf
+++ b/.config/hypr/current-theme.conf
@@ -1,10 +1,10 @@
-$menu = rofi -no-config -no-lazy-grab -show drun -modi drun -theme ~/.config/rofi/catppuccin-latte/launcher.rasi
-$wallpaper = hyprpaper --config ~/.config/hypr/wallpapers/catppuccin-latte.conf
-$bar = ~/.config/waybar/catppuccin-latte/launch.sh
-$swaync = swaync -c ~/.config/swaync/catppuccin-latte/config.json -s ~/.config/swaync/catppuccin-latte/style.css
+$menu = rofi -no-config -no-lazy-grab -show drun -modi drun -theme ~/.config/rofi/tokyonight/launcher.rasi
+$wallpaper = hyprpaper --config ~/.config/hypr/wallpapers/tokyonight.conf
+$bar = ~/.config/waybar/tokyonight/launch.sh
+$swaync = swaync -c ~/.config/swaync/tokyonight/config.json -s ~/.config/swaync/tokyonight/style.css
 
 general {
-  col.inactive_border = rgba(dc8a78ff)
-  col.active_border = rgba(8839efff)
+  col.inactive_border = rgba(3a4f5fff)
+  col.active_border = rgba(9aa5ceff)
 }
 
diff --git a/.config/kitty/.confgi/colorscheme.conf b/.config/kitty/.confgi/colorscheme.conf
new file mode 100644
index 0000000..ef68b50
--- /dev/null
+++ b/.config/kitty/.confgi/colorscheme.conf
@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Storm
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
+
+
+background #24283b
+foreground #c0caf5
+selection_background #2e3c64
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #24283b
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #1d202f
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
+
+# normal
+color0 #1d202f
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8  #414868
+color9  #ff899d
+color10 #9fe044
+color11 #faba4a
+color12 #8db0ff
+color13 #c7a9ff
+color14 #a4daff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
diff --git a/.config/kitty/.confgi/gruvbox.conf b/.config/kitty/.confgi/gruvbox.conf
new file mode 100644
index 0000000..a856d7f
--- /dev/null
+++ b/.config/kitty/.confgi/gruvbox.conf
@@ -0,0 +1,47 @@
+background #282828
+foreground #d4be98
+
+selection_background #d4be98
+selection_foreground #282828
+
+cursor #a89984
+cursor_text_color background
+
+active_tab_background #282828
+active_tab_foreground #d4be98
+active_tab_font_style bold
+inactive_tab_background #282828
+inactive_tab_foreground #a89984
+inactive_tab_font_style normal
+
+# Black
+color0 #665c54
+color8 #928374
+
+# Red
+color1 #ea6962
+color9 #ea6962
+
+# Green
+color2 #a9b665
+color10 #a9b665
+
+# Yellow
+color3 #e78a4e
+color11 #d8a657
+
+# Blue
+color4 #7daea3
+color12 #7daea3
+
+# Magenta
+color5 #d3869b
+color13 #d3869b
+
+# Cyan
+color6 #89b482
+color14 #89b482
+
+# White
+color7 #d4be98
+color15 #d4be98
diff --git a/.config/kitty/.confgi/kitty.conf b/.config/kitty/.confgi/kitty.conf
new file mode 100644
index 0000000..f876dfe
--- /dev/null
+++ b/.config/kitty/.confgi/kitty.conf
@@ -0,0 +1,6 @@
+include colorscheme.conf
+
+font_family JetBrains Mono Nerd Font
+font_size 14.0
+
+cursor_trail 3
diff --git a/.config/kitty/.confgi/tokyonight.conf b/.config/kitty/.confgi/tokyonight.conf
new file mode 100644
index 0000000..ef68b50
--- /dev/null
+++ b/.config/kitty/.confgi/tokyonight.conf
@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Storm
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
+
+
+background #24283b
+foreground #c0caf5
+selection_background #2e3c64
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #24283b
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #1d202f
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
+
+# normal
+color0 #1d202f
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8  #414868
+color9  #ff899d
+color10 #9fe044
+color11 #faba4a
+color12 #8db0ff
+color13 #c7a9ff
+color14 #a4daff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
diff --git a/.config/kitty/catppuccin-latte.conf b/.config/kitty/catppuccin-latte.conf
new file mode 100644
index 0000000..e57c5e1
--- /dev/null
+++ b/.config/kitty/catppuccin-latte.conf
@@ -0,0 +1,84 @@
+# vim:ft=kitty
+
+## name:     Catppuccin Kitty Latte
+## author:   Catppuccin Org
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/themes/latte.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground              #4c4f69
+background              #eff1f5
+selection_foreground    #eff1f5
+selection_background    #dc8a78
+
+# Cursor colors
+cursor                  #dc8a78
+cursor_text_color       #eff1f5
+
+# Scrollbar colors
+scrollbar_handle_color  #7c7f93
+scrollbar_track_color   #bcc0cc
+
+# URL color when hovering with mouse
+url_color               #dc8a78
+
+# Kitty window border colors
+active_border_color     #7287fd
+inactive_border_color   #9ca0b0
+bell_border_color       #df8e1d
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #eff1f5
+active_tab_background   #8839ef
+inactive_tab_foreground #4c4f69
+inactive_tab_background #9ca0b0
+tab_bar_background      #bcc0cc
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #eff1f5
+mark1_background #7287fd
+mark2_foreground #eff1f5
+mark2_background #8839ef
+mark3_foreground #eff1f5
+mark3_background #209fb5
+
+# The 16 terminal colors
+
+# black
+color0 #5c5f77
+color8 #6c6f85
+
+# red
+color1 #d20f39
+color9 #d20f39
+
+# green
+color2  #40a02b
+color10 #40a02b
+
+# yellow
+color3  #df8e1d
+color11 #df8e1d
+
+# blue
+color4  #1e66f5
+color12 #1e66f5
+
+# magenta
+color5  #ea76cb
+color13 #ea76cb
+
+# cyan
+color6  #179299
+color14 #179299
+
+# white
+color7  #acb0be
+color15 #bcc0cc
diff --git a/.config/kitty/colorscheme.conf b/.config/kitty/colorscheme.conf
new file mode 100644
index 0000000..ef68b50
--- /dev/null
+++ b/.config/kitty/colorscheme.conf
@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Storm
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
+
+
+background #24283b
+foreground #c0caf5
+selection_background #2e3c64
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #24283b
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #1d202f
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
+
+# normal
+color0 #1d202f
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8  #414868
+color9  #ff899d
+color10 #9fe044
+color11 #faba4a
+color12 #8db0ff
+color13 #c7a9ff
+color14 #a4daff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
diff --git a/.config/kitty/gruvbox.conf b/.config/kitty/gruvbox.conf
new file mode 100644
index 0000000..a856d7f
--- /dev/null
+++ b/.config/kitty/gruvbox.conf
@@ -0,0 +1,47 @@
+background #282828
+foreground #d4be98
+
+selection_background #d4be98
+selection_foreground #282828
+
+cursor #a89984
+cursor_text_color background
+
+active_tab_background #282828
+active_tab_foreground #d4be98
+active_tab_font_style bold
+inactive_tab_background #282828
+inactive_tab_foreground #a89984
+inactive_tab_font_style normal
+
+# Black
+color0 #665c54
+color8 #928374
+
+# Red
+color1 #ea6962
+color9 #ea6962
+
+# Green
+color2 #a9b665
+color10 #a9b665
+
+# Yellow
+color3 #e78a4e
+color11 #d8a657
+
+# Blue
+color4 #7daea3
+color12 #7daea3
+
+# Magenta
+color5 #d3869b
+color13 #d3869b
+
+# Cyan
+color6 #89b482
+color14 #89b482
+
+# White
+color7 #d4be98
+color15 #d4be98
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
new file mode 100644
index 0000000..f876dfe
--- /dev/null
+++ b/.config/kitty/kitty.conf
@@ -0,0 +1,6 @@
+include colorscheme.conf
+
+font_family JetBrains Mono Nerd Font
+font_size 14.0
+
+cursor_trail 3
diff --git a/.config/kitty/tokyonight.conf b/.config/kitty/tokyonight.conf
new file mode 100644
index 0000000..ef68b50
--- /dev/null
+++ b/.config/kitty/tokyonight.conf
@@ -0,0 +1,50 @@
+# vim:ft=kitty
+
+## name: Tokyo Night Storm
+## license: MIT
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty/tokyonight_storm.conf
+
+
+background #24283b
+foreground #c0caf5
+selection_background #2e3c64
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
+cursor_text_color #24283b
+
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #1d202f
+
+# Windows
+active_border_color #7aa2f7
+inactive_border_color #292e42
+
+# normal
+color0 #1d202f
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
+
+# bright
+color8  #414868
+color9  #ff899d
+color10 #9fe044
+color11 #faba4a
+color12 #8db0ff
+color13 #c7a9ff
+color14 #a4daff
+color15 #c0caf5
+
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
diff --git a/.config/nvim/colorscheme b/.config/nvim/colorscheme
index 365670c..72334fa 100644
--- a/.config/nvim/colorscheme
+++ b/.config/nvim/colorscheme
@@ -1 +1 @@
-catppuccin-latte
+tokyonight
diff --git a/.config/zsh/prompt.sh b/.config/zsh/prompt.sh
index f361e14..1dcada4 100755
--- a/.config/zsh/prompt.sh
+++ b/.config/zsh/prompt.sh
@@ -1,3 +1,3 @@
-export PROMPT="${NEWLINE}%K{#9ca0b0}%F{#4c4f69}$(date +%_I:%M%P) %K{#acb0be}%F{#4c4f69} %n %K{#bcc0cc} %~ %f%k ❯ "
+export PROMPT="${NEWLINE}%K{#1a1b26}%F{#c0caf5}$(date +%_I:%M%P) %K{#414868}%F{#c0caf5} %n %K{#565f89} %~ %f%k ❯ "
 
-echo -e "${NEWLINE}\033[48;2;156;160;176;38;2;76;79;105m $SHELL \033[0m\033[48;2;172;176;190;38;2;76;79;105m $(uptime -p | cut -c 4-) \033[0m\033[48;2;188;192;204;38;2;76;79;105m $(uname -r) \033[0m"
+echo -e "${NEWLINE}\033[48;2;26;27;38;38;2;192;202;245m $SHELL \033[0m\033[48;2;65;72;104;38;2;192;202;245m $(uptime -p | cut -c 4-) \033[0m\033[48;2;86;95;137;38;2;192;202;245m $(uname -r) \033[0m"
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..947483b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.bin/pinggy
+wallpapers/user.jpeg