diff --git a/defaults/base/README.adoc b/defaults/base/README.adoc
deleted file mode 100644
index c5df8c7..0000000
--- a/defaults/base/README.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-== Base Role
-
-The base role handles basic system configuration, which includes:
-
-* User management
-* Nix configuration
-* System default settings
-* Global packages (like `git` and `curl`) and sane configuration
-defaults for them
-* Basic networking configuration (like firewall and ssh)
diff --git a/defaults/base/applications.nix b/defaults/base/applications.nix
index 431d81b..7ad3e50 100644
--- a/defaults/base/applications.nix
+++ b/defaults/base/applications.nix
@@ -9,9 +9,7 @@
   environment.systemPackages =
     with pkgs;
     [
-      vim
       tmux
-      fwupd
       pciutils
       dmidecode
       smartmontools
@@ -28,7 +26,6 @@
       gnupg
       pass-wayland
       pwgen
-      units
       powertop
       lm_sensors
       sbctl
@@ -52,7 +49,7 @@
       unrar
       iotop
       cabextract
-      tree # p7zip
+      tree
       vim
       vimPlugins.pathogen
       vimPlugins.airline
@@ -80,13 +77,12 @@
       curl
       wget
       tor
-      mosh
       whois
       wol
       rsync
       sshuttle
       iftop
-      mailutils # hash-slinger #TODO: hash-slinger has broken dependency pyunbound
+      mailutils
       imapsync
       bluez-tools
     ];
diff --git a/defaults/desktop/desktop-environment.nix b/defaults/desktop/desktop-environment.nix
index abee0a4..cfec370 100644
--- a/defaults/desktop/desktop-environment.nix
+++ b/defaults/desktop/desktop-environment.nix
@@ -12,17 +12,10 @@ in
   environment.systemPackages =
     with pkgs;
     [
-      # Utilities
       freetype
       lxappearance
       sound-theme-freedesktop
-    ]
-    ++ [
-      # Various
-      xfce.thunar
-      xfce.thunar-archive-plugin
-      xfce.xfce4-appfinder
-      pinentry-rofi # Required by gnupg
+
       qt5.qtwayland # Required for qt applications
     ];
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
@@ -31,7 +24,7 @@ in
     gnome-terminal.enable = false;
     evolution = {
       enable = true;
-      plugins = [ pkgs.evolution-ews ];
+      #plugins = [ pkgs.evolution-ews ];
     };
     geary.enable = false;
     light.enable = true;
@@ -41,6 +34,11 @@ in
     sway.enable = true;
   };
 
+  i18n.inputMethod = {
+    type = "ibus";
+    ibus.engines = [ pkgs.ibus-engines.uniemoji ];
+  };
+
   services.gnome = {
     # TODO: Do this manually and not all at once.
     core-utilities.enable = true;
@@ -73,7 +71,7 @@ in
   # Needed for themes and backgrounds
   environment.pathsToLink = [
     "/share" # TODO: https://github.com/NixOS/nixpkgs/issues/47173
-  ]; # #########
+  ];
 
   # GVFS
   services.gvfs.enable = true;
diff --git a/defaults/desktop/greeter.nix b/defaults/desktop/greeter.nix
index 1dce2fb..f1b4697 100644
--- a/defaults/desktop/greeter.nix
+++ b/defaults/desktop/greeter.nix
@@ -35,9 +35,4 @@
 
     updateDbusEnvironment = true;
   };
-
-  i18n.inputMethod = {
-    type = "ibus";
-    ibus.engines = [ pkgs.ibus-engines.uniemoji ];
-  };
 }
diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix
index 3498153..c4e3aaf 100644
--- a/home/fhauser/applications/default.nix
+++ b/home/fhauser/applications/default.nix
@@ -55,7 +55,12 @@
         google-chrome
         chromium
         nextcloud-client
+        xfce.thunar
+        xfce.thunar-archive-plugin
+        xfce.xfce4-appfinder
+        xfce.mousepad
         bitwarden-desktop
+        pinentry-rofi # Required by gnupg
       ]
       ++ [
         # office