diff --git a/etc/skel/.config/sway/config b/etc/skel/.config/sway/config
index 20e1c0d..ee6f482 100644
--- a/etc/skel/.config/sway/config
+++ b/etc/skel/.config/sway/config
@@ -4,12 +4,6 @@
 #
 # Read `man 5 sway` for a complete reference.
 
-# Color scheme and window's settings
-set $theme /usr/share/tileos/themes/catppuccin-macchiato
-
-# Theme variables
-include $theme/theme
-
 # Global variables
 include /etc/sway/variables
 
@@ -22,7 +16,7 @@ include /etc/sway/inputs/*.conf
 # include modes
 include /etc/sway/modes/*.conf
 
-# Additional configs
+# Additional configs (autostart, Sway theme, window rules, etc)
 include /etc/sway/config.d/*.conf
 
 # User config
diff --git a/usr/share/sway/themes/variables b/etc/sway/config.d/20-sway-theme.conf
similarity index 93%
rename from usr/share/sway/themes/variables
rename to etc/sway/config.d/20-sway-theme.conf
index 2ebccc7..407fed3 100644
--- a/usr/share/sway/themes/variables
+++ b/etc/sway/config.d/20-sway-theme.conf
@@ -6,11 +6,11 @@ smart_borders on
 gaps inner 6
 
 # Tittle bar font
-font pango:Noto Sans 10
+font pango:Noto Sans 11
 
 # Fonts
 set $term-font Hack 11
-set $gui-font Noto Sans 10
+set $gui-font Noto Sans 11
 
 # Use catppuccin-macchiato color scheme for i3/Sway
 include /usr/share/tileos/themes/Catppuccin/catppuccin-i3-theme/catppuccin-macchiato