diff --git a/.gitignore b/.gitignore
index ac639cd..c35290a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ torbrowser/
 vlc/
 qt6ct/
 sqlitebrowser/
+castero/
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 0b37b15..ab71395 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
 gtk-application-prefer-dark-theme=0
-gtk-theme-name=WhiteSur-dark-blue
+gtk-theme-name=Materia-dark-compact
 gtk-icon-theme-name=Tela-circle-blue-dark
 gtk-font-name=Roboto 10
 gtk-cursor-theme-name=Adwaita
diff --git a/i3/config b/i3/config
index f7e207f..9370f2b 100644
--- a/i3/config
+++ b/i3/config
@@ -38,21 +38,33 @@ exec --no-startup-id nm-applet --indicator
 exec --no-startup-id insync start
 
 ### Window config
+# custom
 for_window [class="aptus-upgrade"] floating enable
+
+# filemanagers/utils
+for_window [class="Thunar"] floating enable
 for_window [class="catfish"] floating enable
-for_window [class="Zoom"] floating enable
-for_window [class="zoom"] floating enable
-for_window [class="Pcmanfm"] floating enable
-for_window [class="Pavucontrol"] floating enable
-for_window [class="eog"] floating enable
-for_window [class="Transmission-gtk"] floating enable
-for_window [class="io.github.celluloid_player.Celluloid"] floating enable
+for_window [title="Catfish"] floating enable
+
+# terminals
 for_window [class="Alacritty"] floating enable
 for_window [class="kitty"] floating enable
 for_window [class="URxvt"] floating enable
-for_window [class="zenity"] floating enable
+
+# dialogs
 for_window [class="apostrophe" title="Export"] floating enable
-for_window [title="Catfish"] floating enable
+for_window [class="zenity"] floating enable
+
+# a/v
+for_window [class="Zoom"] floating enable
+for_window [class="zoom"] floating enable
+for_window [class="Pavucontrol"] floating enable
+
+# other
+for_window [class="eog"] floating enable
+for_window [class="Transmission-gtk"] floating enable
+for_window [class="io.github.celluloid_player.Celluloid"] floating enable
+
 for_window [class=".*"] border pixel 3
 
 # Use pactl to adjust volume in PulseAudio.
diff --git a/sway/config b/sway/config
index 7e7a0a1..7641c96 100644
--- a/sway/config
+++ b/sway/config
@@ -23,7 +23,7 @@ xwayland enable
 ### Gnome settings
 set $gnome-schema org.gnome.desktop.interface
 exec_always {
-    gsettings set $gnome-schema gtk-theme 'WhiteSur-dark-blue'
+    gsettings set $gnome-schema gtk-theme 'Materia-dark-compact'
     gsettings set $gnome-schema icon-theme 'Tela-circle-blue-dark'
     gsettings set $gnome-schema font-name 'Roboto Regular 10'
     gsettings set $gnome-schema monospace-font-name 'Roboto Regular 10'
@@ -59,7 +59,7 @@ exec insync start
 for_window [app_id=aptus-upgrade] floating enable
 
 # filemanagers
-for_window [app_id=Thunar] floating enable
+for_window [app_id=thunar] floating enable
 for_window [app_id=ranger] floating enable
 for_window [title="Catfish"] floating enable
 
@@ -263,7 +263,7 @@ smart_gaps off
 #
 # Titlebars
 #
-font pango:FiraCodeMedium 9
+font pango:KanitMedium 9
 default_border pixel 3
 default_floating_border none
 hide_edge_borders none
diff --git a/waybar/style.css b/waybar/style.css
index b52dafd..1c2bf44 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -17,7 +17,7 @@
 */
 
 * {
-	font-size: 11px;
+	font-size: 12px;
 	font-family: "Kanit Medium", "Font Awesome 5 Free";
 	/*font-weight: bold;*/
 	border-radius: 10px;