diff --git a/system/gui/default.nix b/system/gui/default.nix
index 2925f92..0830564 100644
--- a/system/gui/default.nix
+++ b/system/gui/default.nix
@@ -3,6 +3,5 @@
 {
   imports = [
     ./fonts.nix
-    ./utilities.nix
   ];
 }
diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index 4ec8efe..39e34d3 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -3,25 +3,46 @@
 {
   imports = [
     ./default.nix
-    ./lightdm.nix
-    ./x11.nix
   ];
 
-  services.xserver.windowManager.dwm = {
+  services.xserver = {
     enable = true;
-    package = pkgs.dwm.overrideAttrs {
-      src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
-      buildInputs = with pkgs; [
-        xorg.libX11.dev
-        xorg.libXinerama
-        xorg.libXft
-        xorg.libxcb
-        xorg.xcbutil
-        yajl
-        jsoncpp
-      ];
+
+    xkb = {
+      layout = "us";
+      variant = "";
+      options = "";
+    };
+
+    windowManager.dwm = {
+      enable = true;
+
+      package = pkgs.dwm.overrideAttrs {
+        src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
+
+        buildInputs = with pkgs; [
+          xorg.libX11.dev
+          xorg.libXinerama
+          xorg.libXft
+          xorg.libxcb
+          xorg.xcbutil
+          yajl
+          jsoncpp
+        ];
+      };
+    };
+
+    displayManager = {
+      defaultSession = "none+dwm";
+      lightdm.enable = true;
     };
   };
 
-  services.xserver.displayManager.defaultSession = "none+dwm";
+  services.picom.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    arandr
+    autorandr
+    unclutter-xfixes
+  ];
 }
diff --git a/system/gui/fonts.nix b/system/gui/fonts.nix
index 2014727..8b07472 100644
--- a/system/gui/fonts.nix
+++ b/system/gui/fonts.nix
@@ -6,5 +6,10 @@
     powerline
     font-awesome
     ubuntu_font_family
+    (nerdfonts.override {
+      fonts = [
+        "FiraCode"
+      ];
+    })
   ];
 }
diff --git a/system/gui/gnome.nix b/system/gui/gnome.nix
index 8ad7b58..0782274 100644
--- a/system/gui/gnome.nix
+++ b/system/gui/gnome.nix
@@ -3,12 +3,14 @@
 {
   imports = [
     ./default.nix
-    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
   ];
 
-  services.xserver.displayManager.gdm = {
-    enable = true;
-    wayland = (if systemSettings.desktopType == "x11" then false else true);
+  services.xserver = {
+    displayManager.gdm = {
+      enable = true;
+      wayland = (if systemSettings.desktopType == "x11" then false else true);
+    };
+
+    desktopManager.gnome.enable = true;
   };
-  services.xserver.desktopManager.gnome.enable = true;
 }
diff --git a/system/gui/kde.nix b/system/gui/kde.nix
index ff9aa8b..2cd762c 100644
--- a/system/gui/kde.nix
+++ b/system/gui/kde.nix
@@ -3,13 +3,16 @@
 {
   imports = [
     ./default.nix
-    (if systemSettings.desktopType == "x11" then ./x11.nix else "")
   ];
 
   services.xserver.displayManager = {
-    sddm.enable = true;
-    sddm.wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
+    sddm = {
+      enable = true;
+      wayland.enable = (if systemSettings.desktopType == "x11" then false else true);
+    };
+
     defaultSession = (if systemSettings.desktopType == "x11" then "plasmax11" else "plasma");
   };
+
   services.desktopManager.plasma6.enable = true;
 }
diff --git a/system/gui/lightdm.nix b/system/gui/lightdm.nix
deleted file mode 100644
index 9b3a531..0000000
--- a/system/gui/lightdm.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.xserver.displayManager.lightdm.enable = true;
-}
diff --git a/system/gui/x11.nix b/system/gui/x11.nix
deleted file mode 100644
index d7f6de8..0000000
--- a/system/gui/x11.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.xserver = {
-    enable = true;
-    xkb = {
-      layout = "us";
-      variant = "";
-      options = "";
-    };
-  };
-}
diff --git a/system/hardware/audio.nix b/system/hardware/audio.nix
index 1b2c963..44e0739 100644
--- a/system/hardware/audio.nix
+++ b/system/hardware/audio.nix
@@ -11,4 +11,8 @@
     pulse.enable = true;
     jack.enable = true;
   };
+  environment.systemPackages = with pkgs; [
+    playerctl
+    pavucontrol
+  ];
 }
diff --git a/system/hardware/bluetooth.nix b/system/hardware/bluetooth.nix
index 038980c..97717ce 100644
--- a/system/hardware/bluetooth.nix
+++ b/system/hardware/bluetooth.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  hardware.bluetooth.enable = true;
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+  };
+
   services.blueman.enable = true;
 }
diff --git a/system/security/default.nix b/system/security/default.nix
index 60391d4..527c12b 100644
--- a/system/security/default.nix
+++ b/system/security/default.nix
@@ -4,5 +4,6 @@
   imports = [
     ./firewall.nix
     ./gpg.nix
+    ./polkit.nix
   ];
 }
diff --git a/system/gui/utilities.nix b/system/security/polkit.nix
similarity index 62%
rename from system/gui/utilities.nix
rename to system/security/polkit.nix
index 8a596ee..7d2fc91 100644
--- a/system/gui/utilities.nix
+++ b/system/security/polkit.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
+  security.polkit.enable = true;
   environment.systemPackages = with pkgs; [
-    arandr
-    autorandr
+    polkit_gnome
   ];
 }
diff --git a/user/media/creation.nix b/user/media/creation.nix
index f1cb2fd..e0323c9 100644
--- a/user/media/creation.nix
+++ b/user/media/creation.nix
@@ -4,5 +4,6 @@
   home.packages = (with pkgs; [
     blender
     obs-studio
+    freecad
   ]);
 }
diff --git a/user/media/editors.nix b/user/media/editors.nix
index eb5d2a3..d8333a3 100644
--- a/user/media/editors.nix
+++ b/user/media/editors.nix
@@ -5,5 +5,6 @@
     gimp
     libsForQt5.kdenlive
     ffmpeg
+    audacity
   ]);
 }
diff --git a/user/media/players.nix b/user/media/players.nix
index a93b83f..997544f 100644
--- a/user/media/players.nix
+++ b/user/media/players.nix
@@ -8,5 +8,7 @@
     pocket-casts
     spotify
     spicetify-cli
+    ani-cli
+    calibre
   ]);
 }
diff --git a/user/utilities/default.nix b/user/utilities/default.nix
index aa6a29a..8cfac5a 100644
--- a/user/utilities/default.nix
+++ b/user/utilities/default.nix
@@ -8,5 +8,6 @@
     ./keyboard-configuration.nix
     ./passwords.nix
     ./xdg.nix
+    ./screenshot.nix
   ];
 }
diff --git a/user/utilities/screenshot.nix b/user/utilities/screenshot.nix
new file mode 100644
index 0000000..f26e9b4
--- /dev/null
+++ b/user/utilities/screenshot.nix
@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    flameshot
+  ]);
+}