diff --git a/flake.lock b/flake.lock
index 0a6686d..9a6ccd9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -369,16 +369,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1661663669,
-        "narHash": "sha256-TsVDHYX9boTJPsgzGrQLZN5hv5V96pUVL5RgK5yLKPY=",
-        "owner": "NixOS",
+        "lastModified": 1661762682,
+        "narHash": "sha256-/i8xAhsX8MwiEucLIX+t7rNcsddFzbEOr/BROFSLeo4=",
+        "owner": "NULLx76",
         "repo": "nixpkgs",
-        "rev": "6cae4be2a768154ae9815d8238f00b03a89ea21f",
+        "rev": "fab092ddd75ec258d0b46611ba1730f33d041b10",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
+        "owner": "NULLx76",
+        "ref": "vscode-catppuccin",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 56c12fd..fe68483 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
   # * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:NULLx76/nixpkgs/vscode-catppuccin";
 
     colmena.url = "github:zhaofengli/colmena";
     colmena.inputs.nixpkgs.follows = "nixpkgs";
diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix
index 27303bc..8c2fa2a 100644
--- a/nixos/hosts/thalassa/null/home/default.nix
+++ b/nixos/hosts/thalassa/null/home/default.nix
@@ -1,10 +1,4 @@
 { config, pkgs, lib, fetchFromGithub, ... }:
-let
-  rofi = fetchTarball {
-    url = "https://github.com/adi1090x/rofi/archive/refs/heads/master.zip";
-    sha256 = "0wq8v758gnk1wjdqyqmda5rlxlpv33l3sdf3rb3nx834vc5hr1rn";
-  };
-in
 {
   programs.home-manager.enable = true;
   home.username = "victor";
@@ -34,19 +28,41 @@ in
     retroarchFull
     python3
     element-desktop-wayland
-    
+
     gnome.gnome-font-viewer
-  
+
     wofi # Wayland rofi
     grim # Screenshot tool
     wf-recorder # Screenrecorder
     wl-clipboard # Clipboard manager
     networkmanager_dmenu
     brightnessctl
+    libnotify
   ];
 
-  programs.alacritty = {
+  programs.foot = {
     enable = true;
+    # Note, pink and blue are switched
+    settings.colors = {
+      foreground = "c6d0f5"; # Text
+      background = "303446"; # Base
+      regular0 = "51576d"; # Surface 1
+      regular1 = "e78284"; # red
+      regular2 = "a6d189"; # green
+      regular3 = "e5c890"; # yellow
+      regular4 = "f4b8e4"; # pink
+      regular5 = "8caaee"; # blue
+      regular6 = "81c8be"; # teal
+      regular7 = "b5bfe2"; # Subtext 1
+      bright0 = "626880"; # Surface 2
+      bright1 = "e78284"; # red
+      bright2 = "a6d189"; # green
+      bright3 = "e5c890"; # yellow
+      bright4 = "f4b8e4"; # pink
+      bright5 = "8caaee"; # blue
+      bright6 = "81c8be"; # teal
+      bright7 = "a5adce"; # Subtext 0
+    };
   };
 
   programs.git = {
@@ -56,6 +72,14 @@ in
     userEmail = "victor@xirion.net";
   };
 
+  programs.mako = {
+    enable = true;
+    backgroundColor = "#292c3c";
+    borderRadius = 5;
+    borderColor = "#f4b8e4";
+    textColor = "#c6d0f5";
+  };
+
   programs.tmux = {
     enable = true;
     shortcut = "b";
@@ -72,10 +96,11 @@ in
     enable = true;
     package = pkgs.vscode;
     extensions = with pkgs.vscode-extensions; [
+      catppuccin.catppuccin-vsc
+      james-yu.latex-workshop
+      jnoortheen.nix-ide
       matklad.rust-analyzer
       mkhl.direnv
-      jnoortheen.nix-ide
-      james-yu.latex-workshop
       valentjn.vscode-ltex
     ];
   };
@@ -99,11 +124,16 @@ in
       name = "Arc";
       package = pkgs.arc-icon-theme;
     };
+    cursorTheme = {
+      name = "Catppuccin-Frappe-Pink-Cursors";
+      package = pkgs.catppuccin.cursors;
+      size = 32;
+    };
   };
 
   services.syncthing.enable = true;
 
-   home.file.".config/networkmanager-dmenu/config.ini".text = ''
+  home.file.".config/networkmanager-dmenu/config.ini".text = ''
     [dmenu]
     dmenu_command = wofi --dmenu -i
     # # Note that dmenu_command can contain arguments as well like:
diff --git a/nixos/hosts/thalassa/null/home/hyprland/default.nix b/nixos/hosts/thalassa/null/home/hyprland/default.nix
index 3576afd..ad162da 100644
--- a/nixos/hosts/thalassa/null/home/hyprland/default.nix
+++ b/nixos/hosts/thalassa/null/home/hyprland/default.nix
@@ -9,6 +9,7 @@
     enable = true;
     extraConfig = ''
       exec-once=${pkgs.hyprpaper}/bin/hyprpaper
+      exec-once=hyprctl setcursor Catppuccin-Frappe-Pink-Cursors 32
       exec-once=eww daemon
       exec-once=eww open bar
       
@@ -18,6 +19,7 @@
 
       general {
         layout = dwindle
+        col.active_border = 0xfff4b8e4
       }
 
       input {
@@ -41,7 +43,7 @@
         pseudotile=true
       }
 
-      bind=SUPER,RETURN,exec,alacritty
+      bind=SUPER,RETURN,exec,foot
       bind=SUPER,f,exec,firefox-devedition
       bind=SUPER,d,exec,wofi --show run,drun
 
@@ -86,7 +88,6 @@
 
       # Firefox notifications
       windowrule=float,title:^(\s*)$
-      windowrule=nofocus,title:^(\s*)$
       windowrule=move 1569 0,title:^(\s*)$
       windowrule=opacity 0.8,title:^(\s*)$
       windowrule=rounding 3,title:^(\s*)$
diff --git a/nixos/pkgs/catppuccin/cursors/default.nix b/nixos/pkgs/catppuccin/cursors/default.nix
new file mode 100644
index 0000000..fb301e3
--- /dev/null
+++ b/nixos/pkgs/catppuccin/cursors/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchFromGitHub, xorg, inkscape }:
+
+stdenv.mkDerivation rec {
+  pname = "catppuccin-cursors";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "cursors";
+    rev = "3d3023606939471c45cff7b643bffc5d5d4ff29c";
+    sha256 = "sha256-0wb84q1VtD1myIRxrfQMn9n6w1gFzMA1rHkPqXuXLP0=";
+  };
+
+  nativeBuildInputs = [
+    xorg.xcursorgen
+    inkscape
+  ];
+
+  installPhase = ''
+    PREFIX="/" DESTDIR=$out make install
+  '';
+
+  meta = with lib; {
+    description = "Soothing pastel mouse cursors";
+    homepage = "https://github.com/catppuccin/cursors";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix
index 211f868..00d25de 100644
--- a/nixos/pkgs/default.nix
+++ b/nixos/pkgs/default.nix
@@ -10,6 +10,8 @@ final: prev: {
 
   vmagent = prev.callPackage ./vmagent { };
 
+  catppuccin.cursors = prev.callPackage ./catppuccin/cursors { };
+
   v = {
     unbound = prev.unbound.override {
       withSystemd = true;