diff --git a/flake.lock b/flake.lock
index b95f5c7..922f87a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,24 +54,6 @@
         "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz"
       }
     },
-    "elanmoc2": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1731852525,
-        "narHash": "sha256-t3wgLs3I38Ijc/JuxUKuVGZFF3eeYeFNibps5wbSsv4=",
-        "owner": "sandptel",
-        "repo": "elanmoc2",
-        "rev": "8b049aa1f184b34b7f6829472b10ea8453bd5806",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sandptel",
-        "repo": "elanmoc2",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -323,16 +305,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737062831,
-        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
+        "lastModified": 1736241350,
+        "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
+        "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -385,22 +367,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1736241350,
-        "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nuscht-search": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -427,12 +393,11 @@
     "root": {
       "inputs": {
         "catppuccin": "catppuccin",
-        "elanmoc2": "elanmoc2",
         "ghostty": "ghostty",
         "hardware": "hardware",
         "home-manager": "home-manager_2",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "snowfall-lib": "snowfall-lib",
         "sops-nix": "sops-nix",
         "zen-browser": "zen-browser"
diff --git a/flake.nix b/flake.nix
index 9c2ffc4..8810110 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,12 +17,6 @@
     # Hardware specific tweaks and performance optimizations.
     hardware = { url = "github:NixOS/nixos-hardware/master"; };
 
-    # Support for ElanTech fingerprint scanner 04f3:0c00
-    elanmoc2 = {
-      url = "github:sandptel/elanmoc2";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # Catppuccin theme nix configuration.
     catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; };
 
@@ -30,6 +24,7 @@
     nix-flatpak = { url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; };
 
     # Apps
+    zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; };
     ghostty = { url = "github:ghostty-org/ghostty"; };
   };
 
diff --git a/homes/x86_64-linux/jo@puzzlevision/default.nix b/homes/x86_64-linux/jo@puzzlevision/default.nix
index db665de..7a195fd 100644
--- a/homes/x86_64-linux/jo@puzzlevision/default.nix
+++ b/homes/x86_64-linux/jo@puzzlevision/default.nix
@@ -38,8 +38,6 @@
     g4music
     bitwarden-desktop
     youtube-music
-    ungoogled-chromium
-    firefox
 
     ### Development
     avra
diff --git a/systems/x86_64-linux/puzzlevision/default.nix b/systems/x86_64-linux/puzzlevision/default.nix
index fb344ea..8e6a8ea 100644
--- a/systems/x86_64-linux/puzzlevision/default.nix
+++ b/systems/x86_64-linux/puzzlevision/default.nix
@@ -4,6 +4,7 @@
   inputs,
   namespace,
   config,
+  system,
   ...
 }: with lib; with lib.${namespace};
 {
@@ -12,7 +13,6 @@
     inputs.hardware.nixosModules.common-pc-laptop
     inputs.hardware.nixosModules.common-cpu-intel
     inputs.hardware.nixosModules.common-pc-laptop-ssd
-    inputs.elanmoc2.nixosModules.elanmoc2
   ];
 
   # Configure Sops
@@ -46,9 +46,6 @@
   # Enable printing.
   services.printing.enable = true;
 
-  # Enable fingerprint support for ElanTech scanner 04f3:0c00
-  services.fprintd.elanmoc2.enable = true;
-
   # Enable docker
   virtualisation.docker.enable = true;
 
@@ -82,6 +79,7 @@
   environment.systemPackages = with pkgs; [
     ### General
     nano
+    inputs.zen-browser.packages."${system}".default
     inputs.ghostty.packages.x86_64-linux.default
     vlc