diff --git a/flake.lock b/flake.lock
index bc285a9..72bce9a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -152,22 +152,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1733759999,
-        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "catppuccin": "catppuccin",
@@ -176,8 +160,7 @@
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "snowfall-lib": "snowfall-lib",
-        "sops-nix": "sops-nix",
-        "zen-browser": "zen-browser"
+        "sops-nix": "sops-nix"
       }
     },
     "snowfall-lib": {
@@ -237,24 +220,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1734038753,
-        "narHash": "sha256-v2NetNrFvObcTx5Gw0MV9leJQr0KfCLtbpC4gZaq+Tc=",
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "rev": "b2a4aeaad1cdb4a0d8901313d6388a8b4bf2c59d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index ea0c4c0..dba152e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,10 +37,6 @@
     nix-flatpak = {
       url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
     };
-
-    zen-browser = {
-      url = "github:0xc000022070/zen-browser-flake";
-    };
   };
 
   outputs = inputs:
diff --git a/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix b/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix
index 45e567b..fa86efc 100644
--- a/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix
+++ b/homes/x86_64-linux/jo@puzzlevision/apps/gnome.nix
@@ -17,8 +17,8 @@
     "org/gnome/shell" = {
       favorite-apps = [
         "org.gnome.Nautilus.desktop"
-        "obsidian.desktop"
-        "zen.desktop"
+        "chromium-browser.desktop"
+        "spotify.desktop"
         "phpstorm.desktop"
       ];
 
diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix
index 125e127..a707122 100644
--- a/homes/x86_64-linux/jo@puzzlevision/default.nix
+++ b/homes/x86_64-linux/jo@puzzlevision/default.nix
@@ -12,10 +12,6 @@
 
   themes.catppuccin.gtk.enable = true;
 
-  home.file."~/.config/Yubico/u2f_keys".text = ''
-    jo:gtKwCQKVw5O4IkWg8J8o7vHIo3hStmOqVcnmk97E335DwHnPUMIDTMnD46qEn/1tucTZlYfGABfzVVG+iYeUOA==,fVRFZb9iBiqjOXvk5Gm9ygO/O4huEUR1Uq3DGBlnS1RtqqK0shif8aOlNLkmn8Xe9+x4HYIeNEX4fc8Z7Y2Hgw==,es256,+presence
-  '';
-
   # Flatpak configuration.
   services.flatpak = {
     enable = true;
@@ -48,7 +44,6 @@
     python39
     nil
     zed-editor
-    bruno
 
     ### Rust development specific
     rustup
diff --git a/modules/home/themes/catppuccin/gnome/default.nix b/modules/home/themes/catppuccin/gnome/default.nix
index e1152f4..8eb9a80 100644
--- a/modules/home/themes/catppuccin/gnome/default.nix
+++ b/modules/home/themes/catppuccin/gnome/default.nix
@@ -10,8 +10,8 @@ let
   css = pkgs.writeTextFile {
     name = "gtk-css";
     text = ''
-      @define-color accent_color ${config.palette.maroon.hex};
-      @define-color accent_bg_color ${config.palette.maroon.hex};
+      @define-color accent_color ${config.palette.blue.hex};
+      @define-color accent_bg_color ${config.palette.blue.hex};
       @define-color accent_fg_color ${config.palette.base.hex};
       @define-color destructive_color ${config.palette.red.hex};
       @define-color destructive_bg_color ${config.palette.red.hex};
@@ -128,8 +128,8 @@ in
       catppuccin = {
         icon = {
           enable = true;
-          accent = "maroon";
-          flavor = "mocha";
+          accent = "blue";
+          flavor = "macchiato";
         };
       };
 
@@ -156,8 +156,8 @@ in
       };
 
       "org/gnome/desktop/background" = {
-        picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/mocha-vibrant-colours.png";
-        picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/mocha-vibrant-colours.png";
+        picture-uri = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
+        picture-uri-dark = lib.snowfall.fs.get-file "resources/wallpapers/catppuccin_blue_cat.png";
       };
 
       "org/gnome/desktop/interface" = {
diff --git a/modules/nixos/security/yubikey/default.nix b/modules/nixos/security/yubikey/default.nix
index 4ae1cf8..3ce3aeb 100644
--- a/modules/nixos/security/yubikey/default.nix
+++ b/modules/nixos/security/yubikey/default.nix
@@ -21,7 +21,7 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ yubikey-manager yubioath-flutter ];
-
+    
     services.udev.packages = [ pkgs.yubikey-personalization ];
     services.pcscd.enable = true;
 
@@ -30,9 +30,11 @@ in
       enableSSHSupport = true;
     };
 
-    security.pam.services = {
-      login.u2fAuth = true;
-      sudo.u2fAuth = true;
+    security.pam.yubico = {
+      enable = true;
+      debug = false;
+      mode = "challenge-response";
+      id = cfg.key-id;
     };
   };
 }
\ No newline at end of file
diff --git a/resources/wallpapers/mocha-vibrant-colours.png b/resources/wallpapers/mocha-vibrant-colours.png
deleted file mode 100644
index 4f6f366..0000000
Binary files a/resources/wallpapers/mocha-vibrant-colours.png and /dev/null differ
diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix
index 609ce1f..12d6c26 100644
--- a/systems/x86_64-linux/puzzlevision/default.nix
+++ b/systems/x86_64-linux/puzzlevision/default.nix
@@ -4,7 +4,6 @@
   inputs,
   namespace,
   config,
-  system,
   ...
 }: with lib; with lib.${namespace};
 {
@@ -73,12 +72,17 @@
   environment.systemPackages = with pkgs; [
     ### General
     nano
-    inputs.zen-browser.packages."${system}".specific
+    firefox
+    chromium
     vlc
+    spotify
 
     ## Security
     pinentry-tty
     gnupg
+
+    ## Development
+    arduino-ide
   ];
 
   system.stateVersion = "23.05";