diff --git a/defaults/base/applications.nix b/defaults/base/applications.nix
index 24a3ef2..6ee5847 100644
--- a/defaults/base/applications.nix
+++ b/defaults/base/applications.nix
@@ -40,11 +40,10 @@
       git
       git-lfs
     ] ++ [ # Filesystem & Disk Utilities
-      fuse_exfat
+      exfat
+      samba
       cifs-utils
       keyutils # required for cifs kerberos auth
-      smbclient
-      exfat-utils
       sshfs-fuse
       hdparm
       mtpfs
@@ -56,9 +55,7 @@
       bind
       curl
       wget
-      ncat
       tor
-      tor-arm
       mosh
       whois
       wol
diff --git a/defaults/base/default.nix b/defaults/base/default.nix
index 1080ffb..10d1a40 100644
--- a/defaults/base/default.nix
+++ b/defaults/base/default.nix
@@ -84,7 +84,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    email = "sysadmin@qo.is";
+    defaults.email = "sysadmin@qo.is";
   };
 
   # Default Settings
diff --git a/defaults/desktop/desktop-environment.nix b/defaults/desktop/desktop-environment.nix
index 8d9d795..363f033 100644
--- a/defaults/desktop/desktop-environment.nix
+++ b/defaults/desktop/desktop-environment.nix
@@ -11,7 +11,6 @@
       xfce.thunar
       xfce.thunar-archive-plugin
       xfce.xfce4-appfinder # xfce.thunar-volman # needed?
-      xfce.terminal
       pinentry-gtk2 # Required by gnupg
     ];
 
diff --git a/defaults/desktop/hardware.nix b/defaults/desktop/hardware.nix
index d9c78eb..6bec994 100644
--- a/defaults/desktop/hardware.nix
+++ b/defaults/desktop/hardware.nix
@@ -12,35 +12,6 @@
     enable = true;
     alsa.enable = true;
     pulse.enable = true;
-    media-session.enable = true;
-    media-session.config.bluez-monitor.rules = [
-      {
-        # Matches all cards
-        matches = [{ "device.name" = "~bluez_card.*"; }];
-        actions = {
-          "update-props" = {
-            "bluez5.reconnect-profiles" = [
-              "a2dp_sink"
-            ]; # Optional: "hfp_hf" "hsp_hs" for microphone support
-            # mSBC is not expected to work on all headset + adapter combinations.
-            "bluez5.msbc-support" = true;
-            # SBC-XQ is not expected to work on all headset + adapter combinations.
-            "bluez5.sbc-xq-support" = true;
-          };
-        };
-      }
-      {
-        matches = [
-          # Matches all sources
-          {
-            "node.name" = "~bluez_input.*";
-          }
-          # Matches all outputs
-          { "node.name" = "~bluez_output.*"; }
-        ];
-        actions = { "node.pause-on-idle" = false; };
-      }
-    ];
   };
   security.rtkit.enable = true;
 
diff --git a/home/fhauser/applications/default.nix b/home/fhauser/applications/default.nix
index b5cc9ee..a5af025 100644
--- a/home/fhauser/applications/default.nix
+++ b/home/fhauser/applications/default.nix
@@ -62,7 +62,7 @@
         #      gutenprintBin
         #      hplipWithPlugin
         simple-scan
-        gnome.gnome-online-accounts
+        pkgs.gnome-online-accounts
         gnome.gnome-control-center
       ] ++ [ # Communication
         #TODO: ekiga?
diff --git a/home/fhauser/applications/sway.nix b/home/fhauser/applications/sway.nix
index 9ae9ab9..6eb1282 100644
--- a/home/fhauser/applications/sway.nix
+++ b/home/fhauser/applications/sway.nix
@@ -18,7 +18,7 @@ in rec {
     sway-contrib.grimshot
     wl-clipboard
     libappindicator
-    gnome.defaultIconTheme
+    gnome.adwaita-icon-theme
     gnome2.gnome-icon-theme
     hicolor-icon-theme # TODO: Move these requirements?
   ];
diff --git a/home/fhauser/applications/waybar.nix b/home/fhauser/applications/waybar.nix
index b357b06..6eb261f 100644
--- a/home/fhauser/applications/waybar.nix
+++ b/home/fhauser/applications/waybar.nix
@@ -24,138 +24,136 @@
         "tray"
         "clock"
       ];
-      modules = {
-        backlight.format = " {percent}%";
-        disk.format = " {percentage_used}%";
-        clock.format = "{:%Y-%2m-%2d %H:%M}";
-        "sway/workspaces" = {
-          disable-scroll-wraparound = true;
-          enable-bar-scroll = true;
-          numeric-first = true;
-        };
+      backlight.format = " {percent}%";
+      disk.format = " {percentage_used}%";
+      clock.format = "{:%Y-%2m-%2d %H:%M}";
+      "sway/workspaces" = {
+        disable-scroll-wraparound = true;
+        enable-bar-scroll = true;
+        numeric-first = true;
+      };
 
-        battery = {
-          interval = 10;
-          states = {
-            warning = 15;
-            critical = 10;
-          };
-          format = " {capacity}% {time}"; # Icon: bolt
-          format-discharging = "{icon} {capacity}% {time}";
-          format-time = "{H}:{M}";
-          format-icons = [
-            "" # Icon: battery-full
-            "" # Icon: battery-three-quarters
-            "" # Icon: battery-half
-            "" # Icon: battery-quarter
-            "" # Icon: battery-empty
-          ];
-          tooltip = "true";
+      battery = {
+        interval = 10;
+        states = {
+          warning = 15;
+          critical = 10;
         };
+        format = " {capacity}% {time}"; # Icon: bolt
+        format-discharging = "{icon} {capacity}% {time}";
+        format-time = "{H}:{M}";
+        format-icons = [
+          "" # Icon: battery-full
+          "" # Icon: battery-three-quarters
+          "" # Icon: battery-half
+          "" # Icon: battery-quarter
+          "" # Icon: battery-empty
+        ];
+        tooltip = "true";
+      };
 
-        cpu = {
-          interval = "5";
-          format = " {usage}% ({load})"; # Icon: microchip
-          states = {
-            warning = "70";
-            critical = "90";
-          };
+      cpu = {
+        interval = "5";
+        format = " {usage}% ({load})"; # Icon: microchip
+        states = {
+          warning = "70";
+          critical = "90";
         };
+      };
 
-        #"custom/keyboard-layout" = {
-        #  exec = pkgs.writeShellScript "keyboard-layout" "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4";
-        #  # Interval set only as a fallback, as the value is updated by signal
-        #  interval = "30";
-        #  format = "  {}"; # Icon: keyboard
-        #  # Signal sent by Sway key binding (~/.config/sway/key-bindings)
-        #  signal = "1"; # SIGHUP
-        #  tooltip = "false";
-        #};
+      #"custom/keyboard-layout" = {
+      #  exec = pkgs.writeShellScript "keyboard-layout" "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4";
+      #  # Interval set only as a fallback, as the value is updated by signal
+      #  interval = "30";
+      #  format = "  {}"; # Icon: keyboard
+      #  # Signal sent by Sway key binding (~/.config/sway/key-bindings)
+      #  signal = "1"; # SIGHUP
+      #  tooltip = "false";
+      #};
 
-        memory = {
-          interval = "5";
-          format = " {}%"; # Icon: microchip
-          states = {
-            warning = "70";
-            critical = "90";
-          };
+      memory = {
+        interval = "5";
+        format = " {}%"; # Icon: microchip
+        states = {
+          warning = "70";
+          critical = "90";
         };
+      };
 
-        network = {
-          interval = "5";
-          format-wifi = " {essid} ({signalStrength}%)"; # Icon: wifi
-          format-ethernet = "🔗 {ifname}: {ipaddr}/{cidr}"; # Icon: ethernet
-          format-disconnected = "🔗";
-          tooltip-format = "{ifname}: {ipaddr}";
-        };
+      network = {
+        interval = "5";
+        format-wifi = " {essid} ({signalStrength}%)"; # Icon: wifi
+        format-ethernet = "🔗 {ifname}: {ipaddr}/{cidr}"; # Icon: ethernet
+        format-disconnected = "🔗";
+        tooltip-format = "{ifname}: {ipaddr}";
+      };
 
-        "sway/mode" = {
-          format =
-            ''<span style="italic">  {}</span>''; # Icon: expand-arrows-alt
-          tooltip = "false";
-        };
+      "sway/mode" = {
+        format =
+          ''<span style="italic">  {}</span>''; # Icon: expand-arrows-alt
+        tooltip = "false";
+      };
 
-        "sway/window" = {
-          format = "{}";
-          max-length = "120";
-        };
+      "sway/window" = {
+        format = "{}";
+        max-length = "120";
+      };
 
-        "sway/workspaces" = {
-          all-outputs = false;
-          disable-scroll = true;
-          format = "{icon}";
-          format-icons = {
-            "10" = " 10";
-            "11" = " 11";
-            "12" = " 12";
-            "13" = " 13";
-          };
+      "sway/workspaces" = {
+        all-outputs = false;
+        disable-scroll = true;
+        format = "{icon}";
+        format-icons = {
+          "10" = " 10";
+          "11" = " 11";
+          "12" = " 12";
+          "13" = " 13";
         };
+      };
 
-        pulseaudio = {
-          scroll-step = 3;
-          format = "{icon}  {volume}%";
-          format-bluetooth = "{icon}  {volume}%";
-          format-muted = "🔇";
-          format-icons = {
-            headphones = "";
-            handsfree = "";
-            headset = "";
-            phone = "";
-            portable = "";
-            car = "";
-            default = [ "" "" "" ];
-          };
-          on-click = "pavucontrol";
+      pulseaudio = {
+        scroll-step = 3;
+        format = "{icon}  {volume}%";
+        format-bluetooth = "{icon}  {volume}%";
+        format-muted = "🔇";
+        format-icons = {
+          headphones = "";
+          handsfree = "";
+          headset = "";
+          phone = "";
+          portable = "";
+          car = "";
+          default = [ "" "" "" ];
         };
+        on-click = "pavucontrol";
+      };
 
-        temperature = {
-          critical-threshold = 80;
-          interval = 5;
-          format = "{icon}  {temperatureC}°C";
-          format-icons = [
-            "" # Icon: temperature-empty
-            "" # Icon: temperature-quarter
-            "" # Icon: temperature-half
-            "" # Icon: temperature-three-quarters
-            "" # Icon: temperature-full
-          ];
-          tooltip = "true";
-          hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
-        };
+      temperature = {
+        critical-threshold = 80;
+        interval = 5;
+        format = "{icon}  {temperatureC}°C";
+        format-icons = [
+          "" # Icon: temperature-empty
+          "" # Icon: temperature-quarter
+          "" # Icon: temperature-half
+          "" # Icon: temperature-three-quarters
+          "" # Icon: temperature-full
+        ];
+        tooltip = "true";
+        hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
+      };
 
-        idle_inhibitor = {
-          format = "{icon}";
-          format-icons = {
-            activated = "";
-            deactivated = "";
-          };
+      idle_inhibitor = {
+        format = "{icon}";
+        format-icons = {
+          activated = "";
+          deactivated = "";
         };
+      };
 
-        tray = {
-          icon-size = "21";
-          spacing = "10";
-        };
+      tray = {
+        icon-size = "21";
+        spacing = "10";
       };
     }];
 
diff --git a/host/ochsenchopf/networking.nix b/host/ochsenchopf/networking.nix
index ee0547f..5b5202f 100644
--- a/host/ochsenchopf/networking.nix
+++ b/host/ochsenchopf/networking.nix
@@ -4,7 +4,7 @@
   networking = {
     networkmanager = {
       enable = true;
-      #enableFccUnlock = true; # TODO: Enable with nixos 22.05
+      enableFccUnlock = true;
     };
     useDHCP = false;
     hostName = "ochsenchopf";