diff --git a/flake.lock b/flake.lock
index d8ba2e8..c6c1af8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649711426,
-        "narHash": "sha256-tn5Hu9QkG6LhdgEOe+6cmULPeRCW0UY4o/GHU0viLu0=",
+        "lastModified": 1649887911,
+        "narHash": "sha256-Af0Ppb1RZ7HWuxUvF0/O7h3cy8tqU2eKFyVwyA1ZD+w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7049cf37a90e19ead7a379ce1c76dccea29450c4",
+        "rev": "7244c6715cb8f741f3b3e1220a9279e97b2ed8f5",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649887921,
-        "narHash": "sha256-h2LZzn5LLwIFvVFLCdR8+VWluEP3U1I5y+0mDZjFjAk=",
+        "lastModified": 1650478719,
+        "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "92f58b6728e7c631a7ea0ed68cd21bb29a4876ff",
+        "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1649849514,
-        "narHash": "sha256-zQyTr2UebTKUh1KLyLtevhHsM8umPK1LfQLGUGjRjiQ=",
+        "lastModified": 1650522846,
+        "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "1a0ccdbf4583ed0fce37eea7955e8ef90f840a9f",
+        "rev": "6b4ebea9093c997c5f275c820e679108de4871ab",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1649856708,
-        "narHash": "sha256-xVUExhQ3i/usCei3C4ZHUrW+8FfGV1Eo9CQmewjFd2k=",
+        "lastModified": 1650610227,
+        "narHash": "sha256-ofSO6FrMfC8+wmYy6ItxOfXpN0E6sumnQYQCauMjKvM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ec9e6968fec5f13cfa7f63a32f343ac2f990637",
+        "rev": "692729210d05e0ae2f33edfc072318520dd12666",
         "type": "github"
       },
       "original": {
@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1649903781,
-        "narHash": "sha256-m+3EZo0a4iS8IwHQhkM/riPuFpu76505xKqmN9j5O+E=",
+        "lastModified": 1650595807,
+        "narHash": "sha256-kpmnW7CS6t6nkFZbQZlmVKIZTg+/XqglUXBD8DH+BLk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "e45696bedc4a13a5970376b8fc09660fdd0e6f6c",
+        "rev": "9bf4a3706c99662e9a80cbd655c2b918ba3d5eaf",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1649673231,
-        "narHash": "sha256-1T3AFscfS7s9pkFA+UIDrHH3/RLVjRdYs5ImuLYpOlE=",
+        "lastModified": 1650161686,
+        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "33772708c6d0e33f697426ba386aa0149cbcbecb",
+        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 125724b..93db66f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,6 +58,7 @@
             font = final.rice.font.normal;
           };
         })
+        (final: prev: { unstable = unstablePkgs; })
       ];
       nixpkgsSettings = {
         inherit overlays system;
@@ -113,7 +114,7 @@
 
       thorStable = extraModules: nixpkgs.lib.nixosSystem {
         inherit system;
-        modules = odinBaseModules ++ [
+        modules = thorBaseModules ++ [
           home-manager.nixosModules.home-manager
           homeManagerSettings
           { home-manager.users.bertof = import ./thor.nix; }
@@ -122,7 +123,7 @@
 
       thorUnstable = extraModules: unstable.lib.nixosSystem {
         inherit system;
-        modules = odinBaseModules ++ [
+        modules = thorBaseModules ++ [
           home-manager-unstable.nixosModules.home-manager
           homeManagerSettings
           { home-manager.users.bertof = import ./thor.nix; }
@@ -131,9 +132,7 @@
 
     in
     {
-      exports = {
-        inherit pkgs unstablePkgs;
-      };
+      packages.${system} = pkgs;
 
       nixosConfigurations = rec {
 
diff --git a/modules/pro_audio.nix b/modules/pro_audio.nix
index 92b9044..122427e 100644
--- a/modules/pro_audio.nix
+++ b/modules/pro_audio.nix
@@ -29,7 +29,7 @@ in
     samplv1
     # speech-denoiser
     # stochas
-    sunvox
+    # sunvox
     # surge
     surge-XT
     talentedhack
diff --git a/modules/webapp.nix b/modules/webapp.nix
index cb02f36..630e938 100644
--- a/modules/webapp.nix
+++ b/modules/webapp.nix
@@ -3,7 +3,7 @@
 let
   cmd = link: "${pkgs.google-chrome}/bin/google-chrome-stable --app=${link}";
   links = [
-    { desktopName = "Google Calendar"; link = "https://google.com/calendar"; categories = [ "Calendar" "Office" ];  }
+    { desktopName = "Google Calendar"; link = "https://google.com/calendar"; categories = [ "Office" ];  }
     { desktopName = "Google Keep"; link = "https://keep.google.com"; categories = [ "Office" ];  }
     { desktopName = "Monkeytype"; link = "https://monkeytype.com/";  }
     { desktopName = "Netflix"; link = "https://www.netflix.com"; categories = [ "AudioVideo" ];  }
diff --git a/thor.nix b/thor.nix
index 7c25526..3730276 100644
--- a/thor.nix
+++ b/thor.nix
@@ -113,15 +113,16 @@
       zoom-us
       zotero
 
-      (
-        retroarch.override {
-          cores = with pkgs.libretro; [
-            mgba
-            pcsx_rearmed
-            ppsspp
-          ];
-        }
-      )
+      retroarchFull
+      # (
+      #   retroarch.override {
+      #     cores = with pkgs.libretro; [
+      #       mgba
+      #       pcsx_rearmed
+      #       ppsspp
+      #     ];
+      #   }
+      # )
 
     ];
   };