diff --git a/defaults/desktop/desktop-environment.nix b/defaults/desktop/desktop-environment.nix
index 8bf8d7f..f3d34cc 100644
--- a/defaults/desktop/desktop-environment.nix
+++ b/defaults/desktop/desktop-environment.nix
@@ -5,7 +5,6 @@
       freetype
       feh
       redshift
-      numlockx # TODO: Does this work?
       lxappearance
     ] ++ [ # Networking
       gnome.networkmanager-openconnect
@@ -14,7 +13,6 @@
       xfce.thunar-archive-plugin
       xfce.xfce4-appfinder # xfce.thunar-volman # needed?
       xfce.terminal
-      gnome.gnome-screenshot
       pinentry-gtk2 # Required by gnupg
     ];
 
diff --git a/defaults/desktop/hardware.nix b/defaults/desktop/hardware.nix
index ee0be44..4f8ee1d 100644
--- a/defaults/desktop/hardware.nix
+++ b/defaults/desktop/hardware.nix
@@ -22,7 +22,6 @@
     bluetooth = {
       enable = true;
       package = pkgs.bluezFull;
-      settings.General.Enable = "Source,Sink,Media,Socket";
     };
   };
 
diff --git a/defaults/user-configuration/fhauser/sway.nix b/defaults/user-configuration/fhauser/sway.nix
index 3f91bae..4f9964e 100644
--- a/defaults/user-configuration/fhauser/sway.nix
+++ b/defaults/user-configuration/fhauser/sway.nix
@@ -3,10 +3,10 @@
   # environment.systemPackages = with pkgs; [ polkit_gnome ]; #TODO: Needed?
   programs.sway.enable = true;
   services.gnome.gnome-remote-desktop.enable = true;
-  environment.systemPackages = with pkgs; [ pipewire_0_2 ];
-  systemd.user.services.pipewire.environment.XDG_CURRENT_DESKTOP = "sway";
-  systemd.user.services.xdg-desktop-portal-wlr.environment.XDG_CURRENT_DESKTOP =
-    "sway";
+  #environment.systemPackages = with pkgs; [ pipewire ];
+  #systemd.user.services.pipewire.environment.XDG_CURRENT_DESKTOP = "sway";
+  #systemd.user.services.xdg-desktop-portal-wlr.environment.XDG_CURRENT_DESKTOP =
+  #  "sway";
   #  systemd.user.services.xdg-desktop-portal-wlr.script = "${pkgs.xdg-desktop-portal-wlr}/libexec/xdg-desktop-portal-wlr";
   #  systemd.user.services.xdg-desktop-portal-wlr.scriptArgs = "--output=DP-1"; # TODO: Extract this *****
   home-manager.users.fhauser = let