diff --git a/apps/hyprland/hypr/exec.nix b/apps/hyprland/hypr/exec.nix
index 7171bb9..92b13b2 100644
--- a/apps/hyprland/hypr/exec.nix
+++ b/apps/hyprland/hypr/exec.nix
@@ -2,6 +2,7 @@
   wayland.windowManager.hyprland.settings = {
     exec-once = [
       "uwsm app -- waybar"
+      "uwsm app -- hyprpaper"
     ];
   };
 }
diff --git a/apps/hyprpaper/home.nix b/apps/hyprpaper/home.nix
index 589544e..437e6d6 100644
--- a/apps/hyprpaper/home.nix
+++ b/apps/hyprpaper/home.nix
@@ -2,9 +2,9 @@
   services.hyprpaper = {
     enable = true;
     settings = {
-      preload = ["/home/${myConfig.nixos.username}/Pictures/Wallpapers/nord-1.png"];
+      preload = ["../../assets/Wallpapers/${myConfig.hyprland.wallpaper}"];
       wallpaper = [
-        "HDMI-A-1,/home/${myConfig.nixos.username}/Pictures/Wallpapers/nord-1.png"
+        "HDMI-A-1,../../assets/Wallpapers/${myConfig.hyprland.wallpaper}"
       ];
     };
   };
diff --git a/apps/starship/home.nix b/apps/starship/home.nix
index 0b757a4..d98f3a0 100644
--- a/apps/starship/home.nix
+++ b/apps/starship/home.nix
@@ -1,4 +1,4 @@
-{
+{config, ...}: {
   programs.starship = {
     enable = true;
     settings = {
@@ -8,17 +8,20 @@
         $character'';
 
       # Palette definition (Catppuccin Mocha-inspired)
-      palette = "pro_theme";
-      palettes.pro_theme = {
-        surface0 = "#313244";
-        surface1 = "#45475a";
-        text = "#cdd6f4";
-        peach = "#fab387";
-        sapphire = "#74c7ec";
-        lavender = "#b4befe";
-        green = "#a6e3a1";
-      };
+      # Tell Starship to use the palette Stylix is already generating
+      palette = "base16";
 
+      # Map your custom names to Stylix/Base16 colors
+      # Stylix colors are available at: config.lib.stylix.colors.withHashtag.base0X
+      palettes.base16 = {
+        # Using standard Catppuccin/Base16 mapping
+        surface0 = "${config.lib.stylix.colors.withHashtag.base00}"; # Darkest BG
+        surface1 = "${config.lib.stylix.colors.withHashtag.base01}"; # Slightly lighter BG
+        text = "${config.lib.stylix.colors.withHashtag.base05}"; # Main Text
+        peach = "${config.lib.stylix.colors.withHashtag.base09}"; # Orange accent
+        lavender = "${config.lib.stylix.colors.withHashtag.base0E}"; # Purple accent
+        sapphire = "${config.lib.stylix.colors.withHashtag.base0C}"; # Cyan accent
+      };
       os = {
         disabled = false;
         format = "[$symbol]($style)";
diff --git a/apps/stylix/home.nix b/apps/stylix/home.nix
index 99e8334..9cb7280 100644
--- a/apps/stylix/home.nix
+++ b/apps/stylix/home.nix
@@ -1,10 +1,19 @@
-{inputs, ...}: {
+{
+  inputs,
+  myConfig,
+  lib,
+  ...
+}: {
   imports = [
     inputs.stylix.homeModules.stylix
   ];
   stylix = {
     enable = true;
-    autoEnable = false;
-    image = ../../assets/Wallpapers/nord-1.png;
+    # autoEnable = false;
+    image = ../../assets/Wallpapers/${myConfig.hyprland.wallpaper};
+    polarity = "dark";
+    # base16Scheme = lib.mkDefault {
+    #   generator = "vibrant";
+    # };
   };
 }
diff --git a/apps/waybar/style.nix b/apps/waybar/style.nix
index a20997f..f9714cc 100644
--- a/apps/waybar/style.nix
+++ b/apps/waybar/style.nix
@@ -1,10 +1,11 @@
-{
+{config, ...}: let
+  colors = config.lib.stylix.colors.withHashtag;
+in {
   programs.waybar = {
     style = ''
-
       * {
-        background-color: #cdd6f4;
-        color: #181824;
+        background-color: ${colors.base11};
+        color: ${colors.base05};
 
         border: none;
         border-radius: 0;
diff --git a/assets/Wallpapers/cattppucin_minimal.png b/assets/Wallpapers/cattppucin_minimal.png
index 918f5d3..da95e50 100644
Binary files a/assets/Wallpapers/cattppucin_minimal.png and b/assets/Wallpapers/cattppucin_minimal.png differ
diff --git a/config.nix b/config.nix
index ba1c438..62d4361 100644
--- a/config.nix
+++ b/config.nix
@@ -32,6 +32,7 @@
     };
     hyprland = {
       monitors = ["HDMI-A-1, 1920x1080@120, auto, 1"];
+      wallpaper = "cattppucin_minimal.png";
     };
     firefox = {
       bookmarks = [