diff --git a/fuzzel/.config/fuzzel/fuzzel.ini b/fuzzel/.config/fuzzel/fuzzel.ini
index 00d05e4..5de0ed5 100644
--- a/fuzzel/.config/fuzzel/fuzzel.ini
+++ b/fuzzel/.config/fuzzel/fuzzel.ini
@@ -28,12 +28,12 @@ width=50
 # exit-on-keyboard-focus-loss = yes
 
 [colors]
-background=191724dd
-text=e0def4ff
-match=c4a7e7ff
-selection=524f67dd
-selection-text=e0def4ff
-border=e0def4ff
+background=1a1b26cc
+text=c0caf5ff
+match=bb9af7ff
+selection=bb9af7ff
+selection-text=1a1b26ff
+border=c0caf5ff
 
 [border]
 width=2
diff --git a/kitty/.config/kitty/current-theme.conf b/kitty/.config/kitty/current-theme.conf
index fca9531..7ff8ff1 100644
--- a/kitty/.config/kitty/current-theme.conf
+++ b/kitty/.config/kitty/current-theme.conf
@@ -1,53 +1,45 @@
-## name: Rosé Pine
-## author: mvllow
+# vim:ft=kitty
+
+## name: Tokyo Night
 ## license: MIT
-## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine.conf
-## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
+## author: Folke Lemaitre
+## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_night.conf
 
-foreground               #e0def4
-background               #191724
-selection_foreground     #e0def4
-selection_background     #403d52
 
-cursor                   #524f67
-cursor_text_color        #e0def4
+background #1a1b26
+foreground #c0caf5
+selection_background #33467C
+selection_foreground #c0caf5
+url_color #73daca
+cursor #c0caf5
 
-url_color                #c4a7e7
+# Tabs
+active_tab_background #7aa2f7
+active_tab_foreground #1f2335
+inactive_tab_background #292e42
+inactive_tab_foreground #545c7e
+#tab_bar_background #15161E
 
-active_tab_foreground    #e0def4
-active_tab_background    #26233a
-inactive_tab_foreground  #6e6a86
-inactive_tab_background  #191724
+# normal
+color0 #15161E
+color1 #f7768e
+color2 #9ece6a
+color3 #e0af68
+color4 #7aa2f7
+color5 #bb9af7
+color6 #7dcfff
+color7 #a9b1d6
 
-# black
-color0   #26233a
-color8   #6e6a86
-
-# red
-color1   #eb6f92
-color9   #eb6f92
-
-# green
-color2   #31748f
-color10  #31748f
-
-# yellow
-color3   #f6c177
-color11  #f6c177
-
-# blue
-color4   #9ccfd8
-color12  #9ccfd8
-
-# magenta
-color5   #c4a7e7
-color13  #c4a7e7
-
-# cyan
-color6   #ebbcba
-color14  #ebbcba
-
-# white
-color7   #e0def4
-color15  #e0def4
+# bright
+color8 #414868
+color9 #f7768e
+color10 #9ece6a
+color11 #e0af68
+color12 #7aa2f7
+color13 #bb9af7
+color14 #7dcfff
+color15 #c0caf5
 
+# extended colors
+color16 #ff9e64
+color17 #db4b4b
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 14ca0dd..a22eef6 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -2392,6 +2392,6 @@ background_opacity 0.8
 
 
 # BEGIN_KITTY_THEME
-# Rosé Pine
+# Tokyo Night
 include current-theme.conf
 # END_KITTY_THEME
diff --git a/mako/.config/mako/config b/mako/.config/mako/config
index c7c62c7..0960d57 100644
--- a/mako/.config/mako/config
+++ b/mako/.config/mako/config
@@ -1,5 +1,5 @@
 font=FiraCode Nerd Font 16
-background-color=#191724dd
-text-color=#e0def4
-border-color=#e0def4
+background-color=#1a1b26
+text-color=#c0caf5
+border-color=#c0caf5
 default-timeout=30000
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 8a218d4..b11e6f0 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -141,10 +141,10 @@ bindsym Mod4+Shift+l resize grow width 30px
 include /etc/sway/config.d/*
 
 # Window styling
-client.focused #e0def4 #e0def4 #000000 #e0def4 #e0def4
-client.focused_inactive #524f67 #524f67 #000000 #524f67 #524f67
-client.unfocused #524f67 #524f67 #000000 #524f67 #524f67
-client.urgent #f6c177 #f6c177 #000000 #f6c177 #f6c177
+client.focused #c0caf5 #c0caf5 #000000 #c0caf5 #c0caf5
+client.focused_inactive #1a1b26 #1a1b26 #000000 #1a1b26 #1a1b26
+client.unfocused #1a1b26 #1a1b26 #000000 #1a1b26 #1a1b26
+client.urgent #e0af68 #e0af68 #000000 #e0af68 #e0af68
 default_border pixel 2
 default_floating_border pixel 2
 gaps inner 8
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 130ecb8..fcec139 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -5,18 +5,18 @@
 }
 
 window#waybar {
-    background: rgba(25, 23, 36, 0.8);
-    color: #e0def4;
+    background: rgba(26, 27, 38, 0.8);
+    color: #c0caf5;
 }
 
 tooltip {
-    background: rgba(25, 23, 36, 0.8);
-    border: 2px solid #e0def4;
+    background: rgba(26, 27, 38, 0.8);
+    border: 2px solid #c0caf5;
     border-radius: 0;
 }
 
 tooltip label {
-    color: #e0def4;
+    color: #c0caf5;
 }
 
 button,
@@ -26,6 +26,8 @@ button,
 #clock,
 #gamemode,
 #network,
+#tray,
+#window,
 #wireplumber {
     border-radius: 0;
     padding: 4px 10px;
@@ -33,29 +35,36 @@ button,
 
 #battery.warning,
 #network.linked {
-    background-color: #f6c177;
-    color: #191724;
+    background-color: #e0af68;
+    color: #1a1b26;
 }
 
 #battery.critical,
 #network.disconnected {
-    background-color: #eb6f92;
-    color: #191724;
+    background-color: #f7768e;
+    color: #1a1b26;
 }
 
 #battery.charging {
-    background-color: #31748f;
+    background-color: #9ece6a;
+    color: #1a1b26;
+}
+
+#window {
+    color: #c0caf5;
 }
 
 #workspaces button {
-    color: #6e6a86;
+    background-color: #c0caf5;
+    color: #1a1b26;
 }
 
 #workspaces button.focused {
-    color: #e0def4;
+    background-color: #bb9af7;
+    color: #1a1b26;
 }
 
 #workspaces button.urgent {
-    color: #191724;
-    background-color: #f6c177;
+    background-color: #e0af68;
+    color: #1a1b26;
 }