diff --git a/nixos/H0615-elitherl.nix b/nixos/H0615-elitherl.nix
index 3ff58004..775887de 100644
--- a/nixos/H0615-elitherl.nix
+++ b/nixos/H0615-elitherl.nix
@@ -4,7 +4,7 @@
   imports = [
     ./common.nix
     ./locales/en_GB.nix
-    ./desktop/xfce.nix
+    ./desktop/xfce-bspwm.nix
   ];
 
   networking.hostName = "H0615"; # Define your hostname.
diff --git a/nixos/J0162-elitherl.nix b/nixos/J0162-elitherl.nix
index f0da4eb7..89383637 100644
--- a/nixos/J0162-elitherl.nix
+++ b/nixos/J0162-elitherl.nix
@@ -4,7 +4,7 @@
   imports = [
     ./common.nix
     ./locales/en_GB.nix
-    ./desktop/xfce.nix
+    ./desktop/xfce-bspwm.nix
   ];
 
   networking.hostName = "J0162"; # Define your hostname.
diff --git a/nixos/home-manager/env/polybar.nix b/nixos/home-manager/env/polybar.nix
index 07e8d010..c62373bc 100644
--- a/nixos/home-manager/env/polybar.nix
+++ b/nixos/home-manager/env/polybar.nix
@@ -1,5 +1,8 @@
 { pkgs, ... }:
 {
+  home.packages = with pkgs; [
+    bluez
+  ];
   services.polybar = {
     enable = true;
     config = ./config/polybar/polybar.ini;