diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix
index 428c389..423e0e3 100644
--- a/machines/AMD-Workstation/default.nix
+++ b/machines/AMD-Workstation/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./hardware-configuration.nix
     inputs.self.nixosProfiles.desktop
+    inputs.self.nixosModules.print-scan
   ];
   deviceSpecific.devInfo = {
     cpu = {
diff --git a/machines/iso-image/default.nix b/machines/iso-image/default.nix
index 6fde1ee..3a59145 100644
--- a/machines/iso-image/default.nix
+++ b/machines/iso-image/default.nix
@@ -1,4 +1,4 @@
-{ modulesPath, lib, inputs, ... }: {
+{ modulesPath, lib, inputs, pkgs, ... }: {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
     inputs.self.nixosProfiles.base
@@ -6,5 +6,7 @@
   networking.wireless.enable = lib.mkForce false;
   services.openssh.permitRootLogin = lib.mkForce "no";
   services.getty.autologinUser = lib.mkForce "balsoft";
+  boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
+  boot.supportedFilesystems = lib.mkForce [ "ext4" "vfat" ];
   disabledModules = [ "installer/cd-dvd/channel.nix" ];
 }
diff --git a/modules/applications.nix b/modules/applications.nix
index 85142d9..7413f8d 100755
--- a/modules/applications.nix
+++ b/modules/applications.nix
@@ -22,6 +22,10 @@
         cmd = "${pkgs.gnome3.nautilus}/bin/nautilus";
         desktop = "org.gnome.Nautilus";
       };
+      matrix = {
+        cmd = "${pkgs.nheko}/bin/nheko";
+        desktop = "nheko";
+      };
       monitor = {
         cmd = "${pkgs.gnome3.gnome-system-monitor}/bin/gnome-system-monitor";
         desktop = "gnome-system-monitor";
@@ -66,6 +70,7 @@
             "x-scheme-handler/about" = browser;
             "x-scheme-handler/unknown" = browser;
             "x-scheme-handler/mailto" = mail;
+            "x-scheme-handler/matrix" = matrix;
             "application/pdf" = { desktop = "org.kde.okular"; };
             "application/vnd.openxmlformats-officedocument.wordprocessingml.document" =
               text_processor;
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index 39a9615..7b437d3 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -38,7 +38,6 @@
       pass-wayland
       gopass
       papirus-icon-theme
-      gnome3.simple-scan
       shellcheck
       proselint
     ];
diff --git a/modules/default.nix b/modules/default.nix
index 7d32fbf..9251350 100755
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -35,7 +35,6 @@ builtins.listToAttrs (builtins.map (path: {
   ./servers/nextcloud.nix
   ./servers/nginx.nix
   ./servers/vsftpd.nix
-  ./services.nix
   ./themes.nix
   ./virtualisation.nix
   ./workspace/cursor.nix
@@ -50,6 +49,7 @@ builtins.listToAttrs (builtins.map (path: {
   ./workspace/locale.nix
   ./workspace/mako.nix
   ./workspace/misc.nix
+  ./workspace/print-scan.nix
   ./workspace/simple-osd-daemons.nix
   ./workspace/ssh.nix
   ./workspace/sway
diff --git a/modules/hardware.nix b/modules/hardware.nix
index 23b8e0e..fab8470 100644
--- a/modules/hardware.nix
+++ b/modules/hardware.nix
@@ -12,9 +12,13 @@ with deviceSpecific; {
   hardware.bluetooth.enable = true;
   hardware.bluetooth.package = pkgs.bluezFull;
 
-  hardware.sane.enable = true;
 
-  services.saned.enable = true;
+  systemd.services.systemd-udev-settle.enable = false;
+
+  services.upower = {
+    enable = true;
+  };
+
 
   services.logind.lidSwitchExternalPower = "ignore";
 
diff --git a/modules/services.nix b/modules/services.nix
deleted file mode 100644
index a347567..0000000
--- a/modules/services.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-
-{ config, lib, pkgs, inputs, ... }: {
-
-  services.acpid.enable = true;
-
-  services.earlyoom = {
-    enable = config.deviceSpecific.devInfo.ram < 16;
-    freeMemThreshold = 5;
-    freeSwapThreshold = 100;
-  };
-
-  services.printing = {
-    enable = true;
-    drivers = [ pkgs.gutenprint ];
-  };
-
-  programs.mosh.enable = true;
-
-  services.fwupd.enable = true;
-
-  services.avahi.enable = true;
-
-  systemd.services.systemd-udev-settle.enable = false;
-
-  services.pcscd.enable = true;
-
-  services.blueman.enable = true;
-
-  services.upower = {
-    enable = true;
-  };
-}
diff --git a/modules/workspace/gpg.nix b/modules/workspace/gpg.nix
index b5ce730..91d3adf 100644
--- a/modules/workspace/gpg.nix
+++ b/modules/workspace/gpg.nix
@@ -1,13 +1,21 @@
 { pkgs, config, ... }: {
+  services.pcscd.enable = true;
+  services.udev.packages = [ pkgs.yubikey-personalization ];
+
   home-manager.users.balsoft = {
     services.gpg-agent = {
       enable = true;
       enableSshSupport = true;
       pinentryFlavor = "gtk2";
     };
+
     programs.gpg = {
       enable = true;
       homedir = "${config.home-manager.users.balsoft.xdg.dataHome}/gnupg";
+      scdaemonSettings = {
+        disable-ccid = true;
+        reader-port = "Yubico Yubi";
+      };
     };
   };
 }
diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix
index feae535..8f96a78 100644
--- a/modules/workspace/misc.nix
+++ b/modules/workspace/misc.nix
@@ -25,10 +25,11 @@
 
     programs.direnv.enable = true;
     programs.direnv.enableNixDirenvIntegration = true;
+
+    home.stateVersion = "20.09";
   };
 
-
-  home-manager.users.balsoft.home.stateVersion = "20.09";
+  services.avahi.enable = true;
 
   system.stateVersion = "18.03";
 
diff --git a/modules/workspace/print-scan.nix b/modules/workspace/print-scan.nix
new file mode 100644
index 0000000..4d76c45
--- /dev/null
+++ b/modules/workspace/print-scan.nix
@@ -0,0 +1,12 @@
+{ pkgs, config, ... }:
+{
+  services.printing = {
+    enable = true;
+    drivers = [ pkgs.gutenprint ];
+  };
+
+  hardware.sane.enable = true;
+  services.saned.enable = true;
+
+  environment.systemPackages = [ pkgs.gnome3.simple-scan ];
+}
diff --git a/modules/workspace/ssh.nix b/modules/workspace/ssh.nix
index cd41ac1..f5ec6d0 100644
--- a/modules/workspace/ssh.nix
+++ b/modules/workspace/ssh.nix
@@ -11,12 +11,8 @@
   users.users.balsoft.openssh.authorizedKeys.keys =
   ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDd2OdcSHUsgezuV+cpFqk9+Svtup6PxIolv1zokVZdqvS8qxLsA/rwYmQgTnuq4/zK/GIxcUCH4OxYlW6Or4M4G7qrDKcLAUrRPWkectqEooWRflZXkfHduMJhzeOAsBdMfYZQ9024GwKr/4yriw2BGa8GbbAnQxiSeTipzvXHoXuRME+/2GsMFAfHFvxzXRG7dNOiLtLaXEjUPUTcw/fffKy55kHtWxMkEvvcdyR53/24fmO3kLVpEuoI+Mp1XFtX3DvRM9ulgfwZUn8/CLhwSLwWX4Xf9iuzVi5vJOJtMOktQj/MwGk4tY/NPe+sIk+nAUKSdVf0y9k9JrJT98S/ comment"];
 
-  services.udev.packages = [ pkgs.yubikey-personalization ];
-
   # home-manager.users.balsoft.home.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh";
-  
-  home-manager.users.balsoft.home.file.".gnupg/scdaemon.conf".text = "reader-port Yubico Yubi";
-  
+
   home-manager.users.balsoft.programs.ssh = {
     enable = true;
     matchBlocks = {
diff --git a/profiles/desktop.nix b/profiles/desktop.nix
index 94eb7a7..e162718 100644
--- a/profiles/desktop.nix
+++ b/profiles/desktop.nix
@@ -6,7 +6,6 @@
     ezwg
     hardware
     power
-    services
     themes
     virtualisation