diff --git a/modules/home-manager/hyprland/windows.nix b/modules/home-manager/hyprland/windows.nix
index 94aeed7..80e6594 100644
--- a/modules/home-manager/hyprland/windows.nix
+++ b/modules/home-manager/hyprland/windows.nix
@@ -11,18 +11,27 @@
       # Force chromium into a tile to deal with --app bug
       "tile, class:^(chromium)$"
 
+      # Settings management
+      "float, class:^(org.pulseaudio.pavucontrol|blueberry.py)$"
+
+      # Float Steam, fullscreen RetroArch
+      "float, class:^(steam)$"
+      "fullscreen, class:^(com.libretro.RetroArch)$"
+      
+
+
+
       # Just dash of transparency
       "opacity 0.97 0.9, class:.*"
       "opacity 1 0.97, class:^(chromium|google-chrome|google-chrome-unstable)$"
       "opacity 0.97 0.9, initialClass:^(chrome-.*-Default)$ # web apps"
       "opacity 1 1, initialClass:^(chrome-youtube.*-Default)$ # Youtube"
       "opacity 1 1, class:^(zoom|vlc|org.kde.kdenlive|com.obsproject.Studio)$"
+      "opacity 1 1, class:^(com.libretro.RetroArch|steam)$"
 
       # Fix some dragging issues with XWayland
       "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
 
-      # Proper background blur for wofi
-
       # Float in the middle for clipse clipboard manager
       "float, class:(clipse)"
       "size 622 652, class:(clipse)"
@@ -30,6 +39,7 @@
     ];
 
     layerrule = [
+      # Proper background blur for wofi
       "blur,wofi"
     ];
   };
diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix
index d99f2de..4eaa404 100644
--- a/modules/home-manager/waybar.nix
+++ b/modules/home-manager/waybar.nix
@@ -61,7 +61,7 @@ in {
             "9" = "9";
             active = "󱓻";
           };
-          persistent_workspaces = {
+          persistent-workspaces = {
             "1" = [];
             "2" = [];
             "3" = [];
diff --git a/modules/packages.nix b/modules/packages.nix
index 11ff5bc..3568f35 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -2,7 +2,6 @@
   # Regular packages
   systemPackages = with pkgs; [
     # Base system tools
-
     git
     vim
     libnotify
@@ -18,6 +17,7 @@
     playerctl
     bibata-cursors
     gnome-themes-extra
+    blueberry
 
     # Shell tools
     fzf