diff --git a/flake.nix b/flake.nix
index 90d828be..31025777 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,14 +46,14 @@
     let
       flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
       catppuccin-themes = with inputs; {
-        alacritty = "${catppuccin-alacritty}/catppuccin-mocha.yml";
-        bat = "${catppuccin-bat}/Catppuccin-mocha.tmTheme";
-        fish = "${catppuccin-fish}/themes/Catppuccin Mocha.theme";
-        gitui = "${catppuccin-gitui}/theme/mocha.ron";
-        hyprland = "${catppuccin-hyprland}/themes/mocha.conf";
-        zathura = "${catppuccin-zathura}/src/catppuccin-mocha";
+        alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml";
+        bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme";
+        fish = "${catppuccin-fish}/themes/Catppuccin Macchiato.theme";
+        gitui = "${catppuccin-gitui}/theme/macchiato.ron";
+        hyprland = "${catppuccin-hyprland}/themes/macchiato.conf";
+        zathura = "${catppuccin-zathura}/src/catppuccin-macchiato";
         zsh =
-          "${catppuccin-zsh}/themes/catppuccin_mocha-zsh-syntax-highlighting.zsh";
+          "${catppuccin-zsh}/themes/catppuccin_macchiato-zsh-syntax-highlighting.zsh";
       };
       default = {
         hostName = "Atlas";
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 5837cf9b..d29ef473 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -31,8 +31,8 @@
       gaps_in = 5
       gaps_out = 10
       border_size = 3
-      col.active_border = $mauve
-      col.group_border_active = $mauve
+      col.active_border = $lavender
+      col.group_border_active = $lavender
       col.inactive_border = $surface2
       col.group_border = $surface2
       cursor_inactive_timeout = 5
diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix
index a4e15ea0..e9051075 100644
--- a/home/hyprland/gtk.nix
+++ b/home/hyprland/gtk.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }:
 let
-  catppuccin-gtk-lavender = pkgs.catppuccin-gtk.override {
+  catppuccin-gtk = pkgs.catppuccin-gtk.override {
     accents = [ "lavender" ];
-    size = "standard";
-    tweaks = [ ];
-    variant = "mocha";
+    size = "compact";
+    tweaks = [ "rimless" ];
+    variant = "macchiato";
   };
 in {
   home.packages = with pkgs; [
@@ -15,16 +15,16 @@ in {
   gtk = {
     enable = true;
     cursorTheme = {
-      package = pkgs.catppuccin-cursors.mochaDark;
-      name = "Catppuccin-Mocha-Dark-Cursors";
+      package = pkgs.catppuccin-cursors.macchiatoLavender;
+      name = "Catppuccin-Macchiato-Lavender-Cursors";
     };
     iconTheme = {
       package = pkgs.callPackage ./pkgs/delta-icon-theme { };
       name = "Delta";
     };
     theme = {
-      package = catppuccin-gtk-lavender;
-      name = "Catppuccin-Mocha-Standard-Lavender-dark";
+      package = catppuccin-gtk;
+      name = "Catppuccin-Macchiato-Compact-Lavender-dark";
     };
   };
 }
diff --git a/home/hyprland/rofi/theme.rasi b/home/hyprland/rofi/theme.rasi
index 871cb5e3..4b447b87 100644
--- a/home/hyprland/rofi/theme.rasi
+++ b/home/hyprland/rofi/theme.rasi
@@ -2,7 +2,7 @@
     bg-col:  #24273a;
     bg-col-light: #24273a;
     border-col: #24273a;
-    mauve: #c6a0f6;
+    lavender: #b7bdf8;
     selected-col: #24273a;
     blue: #8aadf4;
     fg-col: #cad3f5;
@@ -22,7 +22,7 @@ window {
     height: 75%;
     border: 3px;
     border-radius: 10px;
-    border-color: @mauve;
+    border-color: @lavender;
     background-color: @bg-col;
 }
 
diff --git a/home/hyprland/swaylock.nix b/home/hyprland/swaylock.nix
index ae96146f..217c85f7 100644
--- a/home/hyprland/swaylock.nix
+++ b/home/hyprland/swaylock.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, ... }: {
   programs.swaylock = {
     enable = true;
     package = pkgs.swaylock-effects;
@@ -10,10 +10,10 @@
       indicator-thickness = 7;
       effect-blur = "7x5";
       effect-vignette = "0.5:0.5";
-      ring-color = "1e1e2e";  # Catppuccin base
-      key-hl-color = "b4befe";  # Catppuccin lavender
-      line-color = "1e1e2e";  # Catppuccin base
-      separator-color = "585b70";  # Catppuccin surface2
+      ring-color = "24273a"; # Catppuccin base
+      key-hl-color = "b7bdf8"; # Catppuccin lavender
+      line-color = "24273a"; # Catppuccin base
+      separator-color = "8bd5ca"; # Catppuccin teal
       grace = 2;
       fade-in = 0.2;
     };
diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css
index 36d39ab8..0f013ef2 100644
--- a/home/hyprland/waybar/style.css
+++ b/home/hyprland/waybar/style.css
@@ -54,7 +54,7 @@ window > box {
 
 tooltip {
     background: @base;
-    border: 3px solid @mauve;
+    border: 3px solid @lavender;
     border-radius: 10px;
 }
 
@@ -80,6 +80,6 @@ tooltip {
     border-radius: 0px;
 }
 
-#workspaces button.active { border-top: 3px solid @mauve; }
+#workspaces button.active { border-top: 3px solid @lavender; }
 
 #workspaces button.urgent { border-top: 3px solid @red; }
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index a909fa20..5c2af380 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -7,7 +7,7 @@
     vimAlias = true;
     plugins = with pkgs.vimPlugins; [{
       plugin = catppuccin-nvim;
-      config = "colorscheme catppuccin-mocha";
+      config = "colorscheme catppuccin-macchiato";
     }];
   };
 }