diff --git a/extra/default.nix b/extra/default.nix
index 6b11320..bc78160 100644
--- a/extra/default.nix
+++ b/extra/default.nix
@@ -17,7 +17,7 @@ in
   programs.dconf.enable = true;
 
   # gnome services
-  services.dbus.packages = [ pkgs.gnome.dconf ];
+  services.dbus.packages = [ pkgs.dconf ];
   services.udev.packages = [ pkgs.gnome.gnome-settings-daemon ];
   services.gnome.gnome-keyring.enable = true;
 
diff --git a/extra/desktop-development.nix b/extra/desktop-development.nix
index be5925f..e1b1606 100644
--- a/extra/desktop-development.nix
+++ b/extra/desktop-development.nix
@@ -11,7 +11,7 @@ in
     filezilla
     fritzing
     gnome.gnome-font-viewer
-    gnome.meld
+    meld
     insomnia
     qgis
     sqlitebrowser
diff --git a/extra/docker.nix b/extra/docker.nix
index 4a90663..0bfb851 100644
--- a/extra/docker.nix
+++ b/extra/docker.nix
@@ -3,7 +3,7 @@
 {
   environment.systemPackages = with pkgs; [
     docker
-    docker_compose
+    docker-compose
   ];
 
   virtualisation.docker = {
diff --git a/extra/filesystem.nix b/extra/filesystem.nix
index 08e8daa..1d3d35e 100644
--- a/extra/filesystem.nix
+++ b/extra/filesystem.nix
@@ -3,7 +3,6 @@
   environment.systemPackages = with pkgs; [
     davfs2
     exfat
-    exfat-utils
     fuse3
     hfsprogs
     mtpfs
diff --git a/extra/sound.nix b/extra/sound.nix
index 3b6323b..f3833a2 100644
--- a/extra/sound.nix
+++ b/extra/sound.nix
@@ -11,10 +11,10 @@
     pulse.enable = true;
   };
 
-  programs.noisetorch.enable = true;
+  # programs.noisetorch.enable = true;
 
   environment.systemPackages = with pkgs; [
-    noisetorch
+    # noisetorch
     pavucontrol
     playerctl
     pulseaudio # provide pactl to enable keyboard shortcuts
diff --git a/thinkman.nix b/thinkman.nix
index 2a3e0d1..a39c8c9 100644
--- a/thinkman.nix
+++ b/thinkman.nix
@@ -60,7 +60,7 @@
   };
 
   system = {
-    stateVersion = "21.11";
+    stateVersion = "22.05";
     autoUpgrade.enable = true;
   };
 }