diff --git a/flake.lock b/flake.lock
index 122762c..bfe69ea 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1649676176,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "lastModified": 1652372896,
+        "narHash": "sha256-lURGussfF3mGrFPQT3zgW7+RC0pBhbHzco0C7I+ilow=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "0d347c56f6f41de822a4f4c7ff5072f3382db121",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651652192,
-        "narHash": "sha256-3FUsIJ81p57rOxODRVZ+anhnVav96VWbgNA1H3Np+TY=",
+        "lastModified": 1652452043,
+        "narHash": "sha256-nh3mdVB/Kk5ag1uRMAlKo8r+ssN3HNxwbLsqRG4xZkw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "267462dfb36d447421c789a3adf9d460cd09c147",
+        "rev": "273598f53e04f0111dca5724b37640e3907edaaf",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1651662302,
-        "narHash": "sha256-utlTjLa1s4ezdQIUvnBtmA9TBYFrPlXpAJnCXEiZFZI=",
+        "lastModified": 1652544513,
+        "narHash": "sha256-lFmU0/qodaMd6e7niNfrmi9tGxTcvE2etnNoTAxl7ho=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dff5496b12817e3d019983827c4b7ba7beb96580",
+        "rev": "6879c4f633ef6adeaeb3964c03964f7c3acd7f42",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1651632340,
-        "narHash": "sha256-Kq1yghXZxJ12Sw1nbzoO2Ag8/AxqbbD84wiz8go159o=",
+        "lastModified": 1652496760,
+        "narHash": "sha256-AM1almW0FjiUegqfJc6n+OO3yXTCXUsH2IEI323vbJ0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "88991ffbd57e10b474ea768ec0b54c4f379c566c",
+        "rev": "f9ddceabd2ccd2bf3d08c83832f3709c94287144",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1651558728,
-        "narHash": "sha256-8HzyRnWlgZluUrVFNOfZAOlA1fghpOSezXvxhalGMUo=",
+        "lastModified": 1652378906,
+        "narHash": "sha256-DeV2myAMArPvyqxp0M6z30kuXb2L9SO2QXjxbbsZQyY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cbe587c735b734405f56803e267820ee1559e6c1",
+        "rev": "d89d7af1ba23bd8a5341d00bdd862e8e9a808f56",
         "type": "github"
       },
       "original": {
diff --git a/home_manager/modules/pro_audio.nix b/home_manager/modules/pro_audio.nix
index d19e856..c40523c 100644
--- a/home_manager/modules/pro_audio.nix
+++ b/home_manager/modules/pro_audio.nix
@@ -1,12 +1,12 @@
 { pkgs, ... }:
 let
   variables = {
-    DSSI_PATH = "$HOME/.dssi:$HOME/.nix-profile/lib/dssi:/run/current-system/sw/lib/dssi";
-    LADSPA_PATH = "$HOME/.ladspa:$HOME/.nix-profile/lib/ladspa:/run/current-system/sw/lib/ladspa";
-    LV2_PATH = "$HOME/.lv2:$HOME/.nix-profile/lib/lv2:/run/current-system/sw/lib/lv2";
-    LXVST_PATH = "$HOME/.lxvst:$HOME/.nix-profile/lib/lxvst:/run/current-system/sw/lib/lxvst";
-    VST_PATH = "$HOME/.vst:$HOME/.nix-profile/lib/vst:/run/current-system/sw/lib/vst";
-    VST3_PATH = "$HOME/.vst3:$HOME/.nix-profile/lib/vst3:/run/current-system/sw/lib/vst3";
+    DSSI_PATH = "$HOME/.dssi:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/dssi:/run/current-system/sw/lib/dssi";
+    LADSPA_PATH = "$HOME/.ladspa:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/ladspa:/run/current-system/sw/lib/ladspa";
+    LV2_PATH = "$HOME/.lv2:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/lv2:/run/current-system/sw/lib/lv2";
+    LXVST_PATH = "$HOME/.lxvst:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/lxvst:/run/current-system/sw/lib/lxvst";
+    VST_PATH = "$HOME/.vst:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/vst:/run/current-system/sw/lib/vst";
+    VST3_PATH = "$HOME/.vst3:$NIX_USER_PROFILE_DIR/home-manager/home-path/lib/vst3:/run/current-system/sw/lib/vst3";
   };
 in
 {
@@ -14,7 +14,7 @@ in
     carla
     rnnoise
     ardour
-    unstable.zrythm
+    unstable.zrythm unstable.breeze-icons
     mixxx
 
     # Plugins
diff --git a/home_manager/thor.nix b/home_manager/thor.nix
index 73ad23e..de78f49 100644
--- a/home_manager/thor.nix
+++ b/home_manager/thor.nix
@@ -7,14 +7,9 @@
       options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
     };
     packages = with pkgs; [
-      # pulseaudio
-      easyeffects
-
       arandr
-      ark
       authy
       bitwarden
-      (unstable.blender.override { cudaSupport = true; })
       btop
       catgirl # IRC
       cava
@@ -22,68 +17,34 @@
       docker-compose
       docker-machine
       droidcam
+      easyeffects
       # electrum
-      # element-desktop
       # element-desktop # matrix client
       evolution
-      file
       filelight
       # firefox
       freecad
       gallery-dl
-      # gnome.dconf-editor
-      # gnome.eog
-      # gnome.evince
-      # gnomeExtensions.appindicator
-      # gnomeExtensions.caffeine
-      # gnomeExtensions.dash-to-dock
-      # # gnomeExtensions.dynamic-panel-transparency
-      # gnomeExtensions.dynamic-panel-transparency
-      # gnomeExtensions.gtile
-      # gnomeExtensions.just-perfection
-      # gnomeExtensions.vitals
-      # gnome.file-roller
       gnome.geary
       gnome.gnome-calendar
-      # gnome.gnome-screenshot
+      gnome.gnome-screenshot
       gnome.gnome-sound-recorder
-      gnome.gnome-sudoku
       # gnome.gnome-system-monitor
-      # gnome.gnome-tweaks
-      # gnome.nautilus
-      # gnome.quadrapassel
-      # gnome.seahorse
-      # gnome.sushi
       (google-chrome.override { commandLineArgs = [ "--password-store=gnome" ]; })
       gucharmap
       handbrake
-      htop
       httpie
-      # hyperspace-cli
+      hyperspace-cli
       inkscape
       jetbrains.datagrip
-      kcolorchooser
-      kdiff3
-      # keepassxc
-      kgpg
-      # kid3 # tag mp3
-      kmail
-      kompare
-      kontact
-      korganizer
       krita
-      ksystemlog
       kubectl
       lutris
       meld
       minecraft
-      mmv-go
       mpv
       mycrypto
-      neofetch
-      nixos-option
       nix-prefetch-scripts
-      nix-tree
       obsidian
       okular
       openvpn
@@ -92,6 +53,8 @@
       pcmanfm
       pentablet-driver
       procps
+      # pulseaudio
+      retroarchFull
       ripgrep
       shotwell
       skypeforlinux
@@ -99,32 +62,14 @@
       spotify
       tdesktop
       teams
-      tracker
       transmission-gtk
-      unrar
-      unzip
+      (unstable.blender.override { cudaSupport = true; })
+      unstable.zotero
       virt-manager
-      wget
       # wineFull
       wireguard-tools
-      xclip
       xournalpp
-      yq
-      zip
       zoom-us
-      unstable.zotero
-
-      retroarchFull
-      # (
-      #   retroarch.override {
-      #     cores = with pkgs.libretro; [
-      #       mgba
-      #       pcsx_rearmed
-      #       ppsspp
-      #     ];
-      #   }
-      # )
-
     ];
   };