diff --git a/.config/X11/xresources b/.config/X11/xresources
index 727bdf3c2..bae14f6d9 100644
--- a/.config/X11/xresources
+++ b/.config/X11/xresources
@@ -1,6 +1,6 @@
 !! Set cursor size (Check GTK in .config too):
 Xcursor.size: 24
-Xcursor.theme: tokyo-night
+Xcursor.theme: tokyonight
 
 !! Set a default font and font size:
 *.font: Noto Sans:style=Regular:pixelsize=14:antialias=true;
diff --git a/.config/gtk-2.0/gtkrc-2.0 b/.config/gtk-2.0/gtkrc-2.0
index 2c8bf2f75..6367895e4 100644
--- a/.config/gtk-2.0/gtkrc-2.0
+++ b/.config/gtk-2.0/gtkrc-2.0
@@ -1,5 +1,5 @@
-gtk-theme-name="tokyo-night"
-gtk-icon-theme-name="tokyo-night"
+gtk-theme-name="tokyonight"
+gtk-icon-theme-name="tokyonight"
 gtk-font-name="Sans 10"
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 340266acd..4b7324154 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
-gtk-theme-name=tokyo-night
-gtk-icon-theme-name=tokyo-night
+gtk-theme-name=tokyonight
+gtk-icon-theme-name=tokyonight
 gtk-font-name=Sans 10
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
diff --git a/.local/share/icons/tokyonight-icons b/.local/share/icons/tokyonight-icons
index b2ac2bd85..c522c6a5d 160000
--- a/.local/share/icons/tokyonight-icons
+++ b/.local/share/icons/tokyonight-icons
@@ -1 +1 @@
-Subproject commit b2ac2bd858b32fe354a45529c33cf2505e856b2c
+Subproject commit c522c6a5dd1cb8d53c8bfc47745f313a734eea61
diff --git a/.local/share/themes/tokyonight-theme b/.local/share/themes/tokyonight-theme
index cbde81165..67c4bb6d6 160000
--- a/.local/share/themes/tokyonight-theme
+++ b/.local/share/themes/tokyonight-theme
@@ -1 +1 @@
-Subproject commit cbde8116525645fba402324499c93f21ff3e5700
+Subproject commit 67c4bb6d6bb415acea9d1c9a97152083d7f9c724