diff --git a/hosts/miku.nix b/hosts/miku.nix
index 4f9af79..9548ed2 100644
--- a/hosts/miku.nix
+++ b/hosts/miku.nix
@@ -30,7 +30,7 @@
     virt-manager qemu scream
     replaysorcery # Custom package
     vfio-isolate # Custom Package
-    steam-wrapped discord-wrapped # Custom package
+    discord-wrapped # Custom package
     mumble
     piper trackma # Custom package
     anime-dl # Custom package
@@ -50,7 +50,7 @@
         primaryScreen = "C27F398";
         enable = true;
       }; 
-      sway.enable = true;
+      #sway.enable = true;
       alacritty.enable = true;
       emacs.enable = true;
       firefox.enable = true;
@@ -62,7 +62,7 @@
       };
       #xournalpp.enable = true;
       zsh.enable = true;
-      #office.enable = true;
+      office.enable = true;
       plasma.enable = true;
       gaming.enable = true;
     };
@@ -70,7 +70,7 @@
       gamemode.enable = true;
       #gnome.enable = true;
       input-remapper = {
-        enable = true;
+        enable = false;
         postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
       };
     };
@@ -128,13 +128,12 @@
       "pci=noaer"
     ];
     
-    extraModulePackages = [ pkgs.linuxPackages_zen.vendor-reset ];
+    extraModulePackages = [ pkgs.linuxPackages_xanmod.vendor-reset ];
 
-    #extraModulePackages = [ pkgs.linuxPackages.vendor-reset ];
     # NOTE: A regression appears to have happend between 5.10 and 5.12
     #       which leads to the RX590 to have the fence fallback timer on
     #       sdma0 time out (whatever this means). Maybe bisect?
-    kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_xanmod;
   };
   services = {
     ratbagd.enable = true;
diff --git a/modules/programs/firefox/default.nix b/modules/programs/firefox/default.nix
index 66679a0..b163c6b 100644
--- a/modules/programs/firefox/default.nix
+++ b/modules/programs/firefox/default.nix
@@ -9,7 +9,7 @@ in {
  
   config = lib.mkIf cfg.enable {
     environment = {
-      systemPackages = with pkgs; [ firefox-wayland /*tor-browser-bundle-bin*/ ];
+      systemPackages = with pkgs; [ firefox-wayland tor-browser-bundle-bin ];
 
       # Deploy a Firefox policy to set the search engine and do some other things
       etc."firefox/policies/policies.json".source = ./policies.json;
diff --git a/modules/programs/gaming/default.nix b/modules/programs/gaming/default.nix
index cdeb7e6..912ceb4 100644
--- a/modules/programs/gaming/default.nix
+++ b/modules/programs/gaming/default.nix
@@ -7,8 +7,22 @@ in {
     enable = lib.mkEnableOption "Configure gaming options";
   };
   config = lib.mkIf cfg.enable {
+    nixpkgs.config.retroarch = {
+      enableDesmume = true;
+      enableMGBA = true;
+      enableDolphin = true;
+    };
+
     environment.systemPackages = with pkgs; [
       winePackages.stagingFull winetricks lutris-free-wrapped
+
+      retroarch
+      
+      steam-wrapped # Custom package
+      
+      nur.repos.dukzcry.gamescope
     ];
+
+    hardware.steam-hardware.enable = true;
   };
 }
diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix
index f5f9663..b772449 100644
--- a/modules/programs/zsh/default.nix
+++ b/modules/programs/zsh/default.nix
@@ -100,8 +100,8 @@ in {
           src = pkgs.fetchFromGitHub {
             owner = "zsh-users";
             repo = "zsh-syntax-highlighting";
-            rev = "6e0e950154a4c6983d9e077ed052298ad9126144";
-            sha256 = "09bkg1a7qs6kvnq17jnw5cbcjhz9sk259mv0d5mklqaifd0hms4v";
+            rev = "c5ce0014677a0f69a10b676b6038ad127f40c6b1";
+            sha256 = "sha256-UqeK+xFcKMwdM62syL2xkV8jwkf/NWfubxOTtczWEwA=";
           };
         }
       ];
diff --git a/overlays/sandbox.nix b/overlays/sandbox.nix
index 0a4f9c2..0251ea7 100644
--- a/overlays/sandbox.nix
+++ b/overlays/sandbox.nix
@@ -15,12 +15,12 @@ in {
     version = "1.0.1";
     copyIntoSandbox = [ "share/pixmaps" ];
     desktopFileArgs = {
-      name = "Discord (wrapped)";
+      name = "discord-wrapped";
       #exec = "discord";
       icon = "discord";
       desktopName = "Discord (wrapped)";
       genericName = "Instant Messenger";
-      categories = "Network;InstantMessaging;";
+      categories = [ "Network" "InstantMessaging" ];
     };
   };
   minecraft-wrapped = wrapInSandbox {
diff --git a/overlays/simple.nix b/overlays/simple.nix
index d25d027..73e8545 100644
--- a/overlays/simple.nix
+++ b/overlays/simple.nix
@@ -90,7 +90,7 @@ final: prev:
     };
   });
 
-  # TODO: Remove when updated in nixos-unstable
+  /*
   discord = prev.discord.overrideAttrs (old: {
     version = "0.0.17";
     src = prev.fetchurl {
@@ -98,4 +98,9 @@ final: prev:
       sha256 = "sha256-NGJzLl1dm7dfkB98pQR3gv4vlldrII6lOMWTuioDExU=";
     };
   });
+  */
+
+  tor-browser-bundle-bin = prev.tor-browser-bundle-bin.override {
+    useHardenedMalloc = false;
+  };
 }