diff --git a/modules/darwin/fonts.nix b/modules/darwin/fonts.nix
index fc8462e..ac779b4 100644
--- a/modules/darwin/fonts.nix
+++ b/modules/darwin/fonts.nix
@@ -2,7 +2,7 @@
 {
   fonts.packages = with pkgs; [
     jetbrains-mono
-    _0xproto
+    maple-mono.truetype
   ];
   homebrew.casks = [
     "font-chomsky"
diff --git a/modules/home-manager/colors.nix b/modules/home-manager/colors.nix
index 940593c..3ba4510 100644
--- a/modules/home-manager/colors.nix
+++ b/modules/home-manager/colors.nix
@@ -1,37 +1,39 @@
 { pkgs, ... }:
 {
-  # Rosé Pine Moon (https://rosepinetheme.com)
+  ## Catppuccin (https://catppuccin.com/)
   programs = {
     bat = {
-      config.theme-dark = "rose-pine";
-      config.theme-light = "rose-pine-dawn";
+      config.theme = "catppuccin-macchiato";
+      # config.theme-dark = "catppuccin-macchiato";
+      # config.theme-light = "catppuccin-latte";
       themes =
         let
           rose-pine-github = pkgs.fetchFromGitHub {
-            owner = "rose-pine";
-            repo = "tm-theme";
-            rev = "417d201beb5f0964faded5448147c252ff12c4ae";
-            hash = "sha256-aNDOqY81FLFQ6bvsTiYgPyS5lJrqZnFMpvpTCSNyY0Y=";
+            owner = "catppuccin";
+            repo = "bat";
+            rev = "6810349b28055dce54076712fc05fc68da4b8ec0";
+            hash = "sha256-lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg=";
           };
         in
         {
-          rose-pine = {
+          catppuccin-macchiato = {
             src = rose-pine-github;
-            file = "dist/rose-pine.tmTheme";
-          };
-          rose-pine-dawn = {
-            src = rose-pine-github;
-            file = "dist/rose-pine-dawn.tmTheme";
+            file = "themes/Catppuccin Macchiato.tmTheme";
           };
+          # catppuccin-latte = {
+          #   src = rose-pine-github;
+          #   file = "themes/Catppuccin Latte.tmTheme";
+          # };
         };
     };
 
-    ghostty.settings.theme = "dark:Rose Pine,light:Rose Pine Dawn";
+    ghostty.settings.theme = "Catppuccin Macchiato";
+    # ghostty.settings.theme = "light:Catppuccin Latte,dark:Catppuccin Macchiato";
 
-    helix.settings.theme = "rose_pine";
+    helix.settings.theme = "catppuccin_macchiato";
     # {
-    #   dark = "rose_pine";
-    #   light = "rose_pine_dawn";
+    #   light = "catppuccin_latte";
+    #   dark = "catppuccin_macchiato";
     # };
   };
 }
diff --git a/modules/home-manager/ghostty.nix b/modules/home-manager/ghostty.nix
index 05bf38a..9c4446d 100644
--- a/modules/home-manager/ghostty.nix
+++ b/modules/home-manager/ghostty.nix
@@ -4,7 +4,7 @@
     package = null;
     enableZshIntegration = true;
     settings = {
-      font-family = "0xProto";
+      font-family = "Maple Mono";
       font-size = 16;
       window-padding-x = 5;
       window-padding-balance = true;