diff --git a/home/laozi/jeroboam.nix b/home/laozi/jeroboam.nix
index 4b74c66..a482121 100644
--- a/home/laozi/jeroboam.nix
+++ b/home/laozi/jeroboam.nix
@@ -1,7 +1,9 @@
 { inputs, configVars, configLib, ... }:
 #map with prefix to refactor
 let
-  optionals = (configLib.mapPathsToPrefix { prefix = common/optional; list = [ /system /internet /comms /utilities /dev /office ];});
+  optionals = (configLib.mapPathsToPrefix { 
+    prefix = common/optional; list = [ /system /internet /comms /utilities /dev /office ];
+  });
 in
 {
   imports = [
@@ -20,3 +22,4 @@ in
     homeDirectory = "/home/${configVars.username}";
   }; 
 }
+ 
diff --git a/home/laozi/common/optional/system/bluetooth.nix b/systems/common/optional/bt.nix
similarity index 59%
rename from home/laozi/common/optional/system/bluetooth.nix
rename to systems/common/optional/bt.nix
index 75dbe75..445a512 100644
--- a/home/laozi/common/optional/system/bluetooth.nix
+++ b/systems/common/optional/bt.nix
@@ -1,6 +1,13 @@
 { pkgs, ... }: {
-  programs.bluez = {
-   enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+    
+    settings = {
+      General = {
+        Enable = "Source,Sink,Media,Socket";
+      };
+    };
   };
   systemd.user.services.mpris-proxy = {
     description = "Mpris proxy";