diff --git a/etc/sway/config.d/30-applications-defaults.conf b/etc/sway/config.d/30-applications-defaults.conf
index 7b1aa9f..19489ab 100644
--- a/etc/sway/config.d/30-applications-defaults.conf
+++ b/etc/sway/config.d/30-applications-defaults.conf
@@ -1,6 +1,3 @@
-#don't show gaps if there's only one window on the desktop
-smart_gaps on
-
 # set floating mode for specific application
 for_window [app_id="firefox" title="^Library$"] floating enable, border pixel 1, sticky enable
 for_window [app_id="thunderbird" title=".*Reminder"] floating enable
@@ -22,6 +19,7 @@ for_window [app_id="gpk-update-viewer"] floating enable
 for_window [app_id="gpk-application"] floating enable
 for_window [app_id="nwg-displays"] floating enable
 for_window [class="calamares"] floating enable
+for_window [app_id="calamares"] floating enable
 for_window [app_id="sway-input-config"] floating enable
 for_window [title="Save File"] floating enable
 for_window [title="Firefox .*— Sharing Indicator"] floating enable, sticky enable, move to scratchpad
diff --git a/etc/sway/theme b/etc/sway/theme
index 260b4d4..ef5914d 100644
--- a/etc/sway/theme
+++ b/etc/sway/theme
@@ -1,8 +1,15 @@
 ################----------------THEMING----------------################
 
+#don't show gaps if there's only one window on the desktop
+smart_gaps on
+
 # Window borders
 default_border pixel 2
+
+# Disable borders if there is only one window
 smart_borders on
+
+# Default gaps interval
 gaps inner 6
 
 # Tittle bar font