diff --git a/.config/sway/config b/.config/sway/config
index 524e29d..d32e438 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -191,35 +191,69 @@ popup_during_fullscreen smart
 
 #--- Floating Windows ------------------------------------------------------
 for_window [window_role="pop-up"] floating enable
+for_window [window_role="pop-up"]	floating enable; border normal $border
+for_window [class="pop-up"]		floating enable; border normal $border
 for_window [window_role="bubble"] floating enable
 for_window [window_role="task_dialog"] floating enable
-for_window [window_role="Preferences"] floating enable
-for_window [window_type="dialog"] floating enable
-for_window [window_type="menu"] floating enable
-for_window [window_role="About"] floating enable
-for_window [instance="Farge"] floating enable
-
-for_window [class="pop-up"]		floating enable; border normal $border
-for_window [window_role="pop-up"]	floating enable; border normal $border
 for_window [window_role="task_dialog"]	floating enable; border normal $border
+for_window [window_role="Preferences"] floating enable
+for_window [window_role = "dialog"] floating enable
+for_window [window_type="dialog"] floating enable
+for_window [window_role = "task_dialog"] floating enable
+for_window [window_type="menu"] floating enable
+for_window [app_id = "floating"] floating enable
+for_window [app_id = "floating_update"] floating enable, resize set width 1000px height 600px
+for_window [class = "(?i)pinentry"] floating enable
+for_window [window_role="About"] floating enable
+for_window [title = "About Mozilla Firefox"] floating enable
+for_window [instance="Farge"] floating enable
+for_window [title = ".*kdbx - KeePass"] floating enable, resize set 1276px 814pxofor_window [app_id = "virt-manager"] floating enable
+for_window [app_id = "xfce-polkit"] floating enable
+
+for_window [app_id = "keepassxc"] floating enable, resize set 1276px 814px
+
+for_window [title = "^Open File$"] floating enable
+for_window [app_id = "avizo-service"] border pixel 0, sticky toggle
+no_focus [app_id="avizo-service"]
+for_window [window_role = "GtkFileChooserDialog"] resize set 590 340
+for_window [window_role = "GtkFiileChooserDialog"] move position center
+
+for_window [title="Save File"] floating enable
+for_window [app_id="wdisplays"] floating enable
+for_window [app_id="floating_shell_portrait"] floating enable, border pixel 1, sticky enable, resize set width 30 ppt height 40 ppt
+for_window [app_id="floating_shell"] floating enable, border pixel 1, sticky enable
+for_window [app_id = "qt5ct"] floating enable
+for_window [app_id = "gnome-tweaks"] floating enable
+for_window [class = "Bluetooth-sendto" instance = "bluetooth-sendto"] floating enable
+for_window [window_role = "Preferences"] floating enable
+for_window [app_id="(?i)(?:blueman-manager|azote|gnome-disks|nwg-shell-config)"] floating enable
+for_window [app_id="(?i)(?:pavucontrol|nm-connection-editor|gsimplecal|galculator)"] floating enable
 for_window [class="MEGAsync"]		floating enable; border pixel 0
 for_window [title=".*JetBrains.*"]	floating enable; border pixel 1
 for_window [class="matplotlib"]		floating enable; border normal $border
 for_window [class="dosbox"]		floating enable; border normal $border
+for_window [app_id = "nm-openconnect-auth-dialog"] floating enable
 for_window [app_id="nm-connection-editor"]
 {
 	floating enable
 	resize set width  882px
 	resize set height 600px
 }
-for_window [app_id="pavucontrol"]
-{
-	floating enable
-	resize set width  882px
-	resize set height 600px
-}
+#for_window [app_id="pavucontrol"]
+#{
+#	floating enable
+#	resize set width  882px
+#	resize set height 600px
+#}
 # for_window [app_id="ulauncher"]		border none
 
+# Waybar Tooltips don't steel focus
+no_focus [app_id="waybar"]
+for_window [app_id="waybar" floating] {
+    move position cursor
+    move down 60px # adjust if some menus still don't fit
+}
+
 #--- Applications with CSD -------------------------------------------------
 for_window [app_id="glade"]		border pixel 2
 for_window [app_id="baobab"]		border pixel 2