diff --git a/docs/THEMES.md b/docs/THEMES.md
index 580f4e9..7419751 100644
--- a/docs/THEMES.md
+++ b/docs/THEMES.md
@@ -9,3 +9,17 @@ You can change the selected theme by changing the import statement at the top of
 
 Create a copy of one of the existing theme and change the variables.
 Wallpapers are loaded from the `home/wallpapers` folder.
+
+## Gallery
+
+### Nixy
+
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)
+
+### Catppuccin
+
+![catppuccin1](docs/src/catppuccin/1.png)
+![catppuccin2](docs/src/catppuccin/2.png)
+![catppuccin3](docs/src/catppuccin/3.png)
diff --git a/docs/scripts/compress_src_png.sh b/docs/scripts/compress_src_png.sh
index 09f744a..560382e 100644
--- a/docs/scripts/compress_src_png.sh
+++ b/docs/scripts/compress_src_png.sh
@@ -4,6 +4,6 @@
 
 [[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
 
-for file in ./docs/src/*.png; do
+for file in ./docs/src/*/*.png; do
   optipng "$file"
 done
diff --git a/docs/scripts/take_rice_screenshot.sh b/docs/scripts/take_rice_screenshot.sh
index db77178..e257906 100644
--- a/docs/scripts/take_rice_screenshot.sh
+++ b/docs/scripts/take_rice_screenshot.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-theme_name="nixy"
+[ "$1" = "" ] && echo "Usage: $0 <theme_name>" && exit 1
+theme_name=$1
 
 # Switch to workspace 1
 sleep 2
diff --git a/home/wallpapers/lavender-cat.png b/home/wallpapers/lavender-cat.png
new file mode 100644
index 0000000..db00183
Binary files /dev/null and b/home/wallpapers/lavender-cat.png differ
diff --git a/home/wallpapers/nix.png b/home/wallpapers/nix.png
new file mode 100644
index 0000000..fd596a4
Binary files /dev/null and b/home/wallpapers/nix.png differ
diff --git a/hosts/guest/variables.nix b/hosts/guest/variables.nix
index cb9a576..d353a9f 100644
--- a/hosts/guest/variables.nix
+++ b/hosts/guest/variables.nix
@@ -28,6 +28,6 @@
     # change the nvim's obsidian configuration if you want to enable that:
     obsidian = false;
 
-    theme = import ../themes/nixy.nix; # select your theme here
+    theme = import ../themes/catppuccin.nix; # select your theme here
   };
 }
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index 957710b..97d121f 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -28,6 +28,6 @@
     # change the nvim's obsidian configuration if you want to enable that:
     obsidian = true;
 
-    theme = import ../themes/nixy.nix; # select your theme here
+    theme = import ../themes/catppuccin.nix; # select your theme here
   };
 }
diff --git a/hosts/shared/fonts.nix b/hosts/shared/fonts.nix
index cdbf34b..339ce3e 100644
--- a/hosts/shared/fonts.nix
+++ b/hosts/shared/fonts.nix
@@ -20,7 +20,7 @@
       noto-fonts-cjk
       noto-fonts-emoji
       jetbrains-mono
-      (nerdfonts.override { fonts = [ "FiraCode" ]; })
+      (nerdfonts.override { fonts = [ "FiraCode" "Meslo" ]; })
       inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd
       inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd
       openmoji-color
diff --git a/hosts/themes/catppuccin.nix b/hosts/themes/catppuccin.nix
new file mode 100644
index 0000000..d1ada50
--- /dev/null
+++ b/hosts/themes/catppuccin.nix
@@ -0,0 +1,52 @@
+{
+  wallpaper = "nix.png";
+
+  font = "SFProDisplay Nerd Font";
+  font-mono = "FiraCode Nerd Font Mono";
+  font-size = 13;
+
+  rounding = 11;
+  gaps-in = 15;
+  gaps-out = 15 * 2;
+  border-size = 5;
+  animation-speed = "medium"; # "fast" | "medium" | "slow"
+  fetch = "neofetch"; # "nerdfetch" | "neofetch" | "none"
+
+  waybar = {
+    transparent = true;
+    float = true;
+    position = "top";
+    font-size = 15;
+  };
+
+  colors = {
+    c0 = "1e1e2e"; # black
+    c1 = "f38ba8"; # red
+    c2 = "a6e3a1"; # green
+    c3 = "fab387"; # yellow
+    c4 = "89b4fa"; # blue
+    c5 = "cba6f7"; # magenta
+    c6 = "74c7ec"; # cyan
+    c7 = "cdd6f4"; # white
+    c8 = "313244"; # bright black
+    c9 = "eba0ac"; # bright red
+    c10 = "94e2d5"; # bright green
+    c11 = "f9e2af"; # bright yellow
+    c12 = "b4befe"; # bright blue
+    c13 = "f5c2e7"; # bright magenta
+    c14 = "94e2d5"; # bright cyan
+    c15 = "bac2de"; # bright white
+
+    bg = "01010b";
+    fg = "cdd6f4";
+    bgalt = "181825";
+    fgalt = "bac2de";
+
+    accent = "89b4fa";
+    accentFg = "1e1e2e";
+
+    # Should make those automtic
+    accentName = "blue";
+    accentNumber = "4";
+  };
+}
diff --git a/hosts/themes/nixy.nix b/hosts/themes/nixy.nix
index 3688f09..f322793 100644
--- a/hosts/themes/nixy.nix
+++ b/hosts/themes/nixy.nix
@@ -16,7 +16,7 @@
     transparent = true;
     float = true;
     position = "top";
-    font-size = 11;
+    font-size = 15;
   };
 
   colors = {