diff --git a/assets/avatar/Miku/^ b/assets/avatar/Miku/^
deleted file mode 100644
index 755ccfb..0000000
Binary files a/assets/avatar/Miku/^ and /dev/null differ
diff --git a/assets/avatar/Miku/avatar.png b/assets/avatar/Miku/avatar.png
deleted file mode 100644
index 5fdb43e..0000000
--- a/assets/avatar/Miku/avatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f6f93bddd46266963cb4e1c18a4ebb8cacc4c044ed617f16e2321e470b5c18c
-size 2366263
diff --git a/assets/avatar/Miku/avatar_bg.jpg b/assets/avatar/Miku/avatar_bg.jpg
deleted file mode 100644
index 37f544b..0000000
--- a/assets/avatar/Miku/avatar_bg.jpg
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbafe971db7796c44047f4af3316c4002738188ea97fb32996dbb586074a1add
-size 353129
diff --git a/assets/avatar/Miku/avatar_bg.png b/assets/avatar/Miku/avatar_bg.png
deleted file mode 100644
index 4ec5583..0000000
--- a/assets/avatar/Miku/avatar_bg.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be9cef47974467ff2acd63147fedcc310714f73d8e184a6882ea6d3bcb90d505
-size 1401388
diff --git a/assets/avatar/Miku/avatar_no_bg-0.png b/assets/avatar/Miku/avatar_no_bg-0.png
deleted file mode 100644
index 902309b..0000000
--- a/assets/avatar/Miku/avatar_no_bg-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e383dce09cb9f34ad67e0f519001e1545c5cfe8db5070a5e7aced7b54b2ed367
-size 1622497
diff --git a/assets/avatar/Miku/avatar_no_bg-1.png b/assets/avatar/Miku/avatar_no_bg-1.png
deleted file mode 100644
index 902309b..0000000
--- a/assets/avatar/Miku/avatar_no_bg-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e383dce09cb9f34ad67e0f519001e1545c5cfe8db5070a5e7aced7b54b2ed367
-size 1622497
diff --git a/assets/avatar/Miku/avatar_no_bg-2.png b/assets/avatar/Miku/avatar_no_bg-2.png
deleted file mode 100644
index 4ec5583..0000000
--- a/assets/avatar/Miku/avatar_no_bg-2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be9cef47974467ff2acd63147fedcc310714f73d8e184a6882ea6d3bcb90d505
-size 1401388
diff --git a/assets/avatar/Miku/avatar_no_bg-3.png b/assets/avatar/Miku/avatar_no_bg-3.png
deleted file mode 100644
index 4ec5583..0000000
--- a/assets/avatar/Miku/avatar_no_bg-3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be9cef47974467ff2acd63147fedcc310714f73d8e184a6882ea6d3bcb90d505
-size 1401388
diff --git a/assets/avatar/Miku/avatar_no_bg.png b/assets/avatar/Miku/avatar_no_bg.png
deleted file mode 100644
index 8efcce1..0000000
--- a/assets/avatar/Miku/avatar_no_bg.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d02fe030214263f658de48c4e77a9ed201f0a7585b11b7a831e6d37328f662a
-size 1564905
diff --git a/assets/avatar/Miku/avatar_sloth_git.png b/assets/avatar/Miku/avatar_sloth_git.png
deleted file mode 100644
index 6ca79b0..0000000
--- a/assets/avatar/Miku/avatar_sloth_git.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42295133921e5bec413a6b1dbea329336bcf9d10975e96b1cf24d9b1b739f33a
-size 1979219
diff --git a/assets/avatar/Miku/avatar_transparent.png b/assets/avatar/Miku/avatar_transparent.png
deleted file mode 100644
index b8867cf..0000000
--- a/assets/avatar/Miku/avatar_transparent.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72abb97f53e2387cb4e0407c70066ccca4c2750081dbaa8a1afc58d0f47517f1
-size 1563234
diff --git a/assets/avatar/avatar.png b/assets/avatar/avatar.png
deleted file mode 100644
index 6479838..0000000
--- a/assets/avatar/avatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c23d8a46fb03534f69be07dcc45ee5258b4b6ade986e142b2d796b1b602a45b6
-size 1914571
diff --git a/assets/avatar/avatar_high.png b/assets/avatar/avatar_high.png
deleted file mode 100644
index d24cfd6..0000000
--- a/assets/avatar/avatar_high.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5803cd82c4147014f6d3ee00d86ba1f1a6b94d6d7fdfc9c07ed71b6553283ac4
-size 1051722
diff --git a/assets/avatar/avatar_no_bg.png b/assets/avatar/avatar_no_bg.png
deleted file mode 100644
index 720fcc6..0000000
--- a/assets/avatar/avatar_no_bg.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2258ffc2528b6a00cc8b22e5bbb1092a92b663e681894aacc0ec2177ed86e5b8
-size 1236188
diff --git a/assets/avatar/avatar_sloth.png b/assets/avatar/avatar_sloth.png
deleted file mode 100644
index a43f25e..0000000
--- a/assets/avatar/avatar_sloth.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6185a8e77925bd652a2cabd4ee023f3df6492f129c3a32741a31eb66185333a1
-size 1642538
diff --git a/assets/avatar/avatar_sloth_git.png b/assets/avatar/avatar_sloth_git.png
deleted file mode 100644
index 6ca79b0..0000000
--- a/assets/avatar/avatar_sloth_git.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42295133921e5bec413a6b1dbea329336bcf9d10975e96b1cf24d9b1b739f33a
-size 1979219
diff --git a/assets/avatar/avatar_sloth_no_bg.png b/assets/avatar/avatar_sloth_no_bg.png
deleted file mode 100644
index 29a800d..0000000
--- a/assets/avatar/avatar_sloth_no_bg.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1eb37dec4337622bfb58e4b80665d8cb9cdb90a5b8fc3688e406687da81efac1
-size 1422040
diff --git a/assets/avatar/avatar_talking.gif b/assets/avatar/avatar_talking.gif
deleted file mode 100644
index df6f80f..0000000
--- a/assets/avatar/avatar_talking.gif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9ec4d76036c2090c5aefab6a83e4842adcd5631bd6c56e7452c69c0c16227e3
-size 23919469
diff --git a/assets/avatar/avatar_talking.mp4 b/assets/avatar/avatar_talking.mp4
deleted file mode 100644
index 7172714..0000000
--- a/assets/avatar/avatar_talking.mp4
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8494c886a0d93f8c91730c2ae165a32aa630a223bb9a46329f52b1fe54061c0e
-size 4320970
diff --git a/assets/avatar/avatar_talking_no_bg.gif b/assets/avatar/avatar_talking_no_bg.gif
deleted file mode 100644
index f989534..0000000
--- a/assets/avatar/avatar_talking_no_bg.gif
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5a472f591781f2edc2431fc21c8c943c8f573c1c9acaad8233f4ad4eb35fde33
-size 20553885
diff --git a/assets/avatar/avatar_talking_no_bg.mp4 b/assets/avatar/avatar_talking_no_bg.mp4
deleted file mode 100644
index 05e30e3..0000000
--- a/assets/avatar/avatar_talking_no_bg.mp4
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:674892bc22874a9323d6c307f7f3d9df737a6e8db1ca7a96428d8fd99ccb460a
-size 50084588
diff --git a/assets/avatar/avatar_weather.png b/assets/avatar/avatar_weather.png
deleted file mode 100644
index a05fc0b..0000000
--- a/assets/avatar/avatar_weather.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:508ad53b45e1e0acd3740c1c71ecdfe492a8f65c13db4c84276e1b37b0428a05
-size 2749045
diff --git a/assets/avatar/avatar_weather_no_bg.png b/assets/avatar/avatar_weather_no_bg.png
deleted file mode 100644
index e919f55..0000000
--- a/assets/avatar/avatar_weather_no_bg.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ff7adef38c19e05b11e8a9f87288e4d3930a16c19ed5f66757ed22b3f235da7
-size 2511600
diff --git a/assets/avatar/miku_happy.png b/assets/avatar/miku_happy.png
new file mode 100644
index 0000000..adbd6c6
--- /dev/null
+++ b/assets/avatar/miku_happy.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3e1b483c2bbfd2c2f8c6b010f62de3e67ff1011afb2695e5c550ec5e0e752e0
+size 508821
diff --git a/assets/avatar/miku_happy_no_bg.png b/assets/avatar/miku_happy_no_bg.png
new file mode 100644
index 0000000..020ff28
--- /dev/null
+++ b/assets/avatar/miku_happy_no_bg.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49fb898844a5062af8abec3df769176422d6da6cad6632e8a8cbe3d9c258b12d
+size 550359
diff --git a/assets/avatar/miku_happy_sparkels.png b/assets/avatar/miku_happy_sparkels.png
new file mode 100644
index 0000000..3125dad
--- /dev/null
+++ b/assets/avatar/miku_happy_sparkels.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78a240dec1170b2cd4c0595bbdebaa4dfa8450174c4ce103a329868d2de9e7e2
+size 657960
diff --git a/assets/avatar/miku_smiling.png b/assets/avatar/miku_smiling.png
new file mode 100644
index 0000000..7376260
--- /dev/null
+++ b/assets/avatar/miku_smiling.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffd64a1f554c09c68f64c9ef1966e21d7fec55ef0ed9d194708cd7031906e723
+size 477517
diff --git a/assets/avatar/miku_smiling_no_bg.png b/assets/avatar/miku_smiling_no_bg.png
new file mode 100644
index 0000000..6f60fcc
--- /dev/null
+++ b/assets/avatar/miku_smiling_no_bg.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1598dee8822e1dbd94ebaaca1bc280f8630acb0ee9c7a80af144505fb6edecae
+size 533469
diff --git a/assets/avatar/miku_window.png b/assets/avatar/miku_window.png
new file mode 100644
index 0000000..fcb9d79
--- /dev/null
+++ b/assets/avatar/miku_window.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd1acd44abac846ff12c781bec6e3f428c5626bfe69d3133c1b6a57800ca1a3d
+size 486193
diff --git a/assets/avatar/miku_window_no_bg.png b/assets/avatar/miku_window_no_bg.png
new file mode 100644
index 0000000..b5080b1
--- /dev/null
+++ b/assets/avatar/miku_window_no_bg.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84e5b2c3f47737df70b73ce231d43283a87bfe769a549a5eb4e01c2867abc4aa
+size 558527
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index b0b9ae9..1b224e0 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./hyprland
     ./rofi
diff --git a/home/desktop/hyprland/hypridle.nix b/home/desktop/hyprland/hypridle.nix
index aac134e..971872b 100644
--- a/home/desktop/hyprland/hypridle.nix
+++ b/home/desktop/hyprland/hypridle.nix
@@ -6,7 +6,7 @@
         after_sleep_cmd = "hyprctl dispatch dpms on";
         ignore_dbus_inhibit = false;
         lock_cmd = "hyprlock";
-        before_sleep_cmd = "notify-send -u critical \"I'm getting sleepy… I'll see you in my code dreams 💖\" --icon=$HOME/.config/hypr/avatar.png --app-name=Hyprlock";
+        before_sleep_cmd = "notify-send -u critical \"I'm getting sleepy… I'll see you in my code dreams 💖\" --app-name=Hyprlock";
       };
 
       listener = [
diff --git a/home/desktop/hyprland/hyprlock.nix b/home/desktop/hyprland/hyprlock.nix
index f98df42..36fa8e9 100644
--- a/home/desktop/hyprland/hyprlock.nix
+++ b/home/desktop/hyprland/hyprlock.nix
@@ -14,7 +14,7 @@
 
       background = [
         {
-          path = "~/Pictures/Wallpapers/lucy_with_cat.png";
+          path = "$HOME/Pictures/Wallpapers/lucy_with_cat.png";
           blur_passes = 1;
           blur_size = 5;
         }
@@ -77,7 +77,7 @@
         outline_thickness = 4;
         dots_size = 0.2;
         dots_spacing = 0.2;
-        dots_center = "true";
+        dots_center = true;
         outer_color = "$red";
         inner_color = "$surface0";
         font_color = "$text";
@@ -93,16 +93,17 @@
         valign = "center";
       };
 
-      image = {
-        monitor = "";
-        path = "~/.config/hypr/avatar/avatar.png";
-        size = 300;
-        border_color = "$teal";
-        position = "0, 75";
-        halign = "center";
-        valign = "center";
-      };
+      image = [
+        {
+          monitor = "";
+          path = "$HOME/Pictures/Avatar/miku_happy_sparkels.png";
+          size = 300;
+          border_color = "$teal";
+          position = "0, 75";
+          halign = "center";
+          valign = "center";
+        }
+      ];
     };
   };
-
 }
diff --git a/home/desktop/waybar/common.nix b/home/desktop/waybar/common.nix
index 2f7fc98..5a6a63b 100644
--- a/home/desktop/waybar/common.nix
+++ b/home/desktop/waybar/common.nix
@@ -163,7 +163,7 @@
         clouds=$(echo "$data" | jq -r '.clouds.all')
         sunrise=$(echo "$data" | jq -r '.sys.sunrise | strftime("%H:%M")')
         sunset=$(echo "$data" | jq -r '.sys.sunset | strftime("%H:%M")')
-        notify-send "$city" "Temperature: $temp °C\nFeels Like: $feels °C\nHumidity: $humidity%\nWind: $wind m/s\nClouds: $clouds%\nSunrise at: $sunrise\nSunset at: $sunset" -u normal --icon="$HOME/Pictures/Avatar/avatar_weather_no_bg.png"
+        notify-send "$city" "Temperature: $temp °C\nFeels Like: $feels °C\nHumidity: $humidity%\nWind: $wind m/s\nClouds: $clouds%\nSunrise at: $sunrise\nSunset at: $sunset" -u normal --icon="$HOME/Pictures/Avatar/miku_window_no_bg.png"
       '';
     };
 
diff --git a/nixos/regreet.nix b/nixos/regreet.nix
index 4fe0a85..64bbd44 100644
--- a/nixos/regreet.nix
+++ b/nixos/regreet.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  primaryUser,
   ...
 }:
 {
@@ -8,35 +9,46 @@
     "greetd/background.png".source = ../assets/wallpapers/lucy_with_cat.png;
     "greetd/environments".text = ''
       Hyprland
-      niri-session
       fish
     '';
   };
 
   programs.regreet = {
-    enable = false;
-
+    enable = true;
     cageArgs = [
       "-s"
       "-m"
       "last"
     ];
-
+    theme = {
+      name = "catppuccin-mocha-standard-sky-dark";
+      package = pkgs.catppuccin-gtk;
+    };
+    cursorTheme = {
+      name = "catppuccin-mocha-sapphire-cursors";
+      package = pkgs.catppuccin-cursors.mochaSapphire;
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+    font = {
+      name = "FiraCode Nerd Font Propo";
+      size = 12;
+      package = pkgs.nerd-fonts.fira-code;
+    };
     settings = {
-
       background = {
         path = "/etc/greetd/background.png";
         fit = "Fill";
       };
-
       GTK = {
         application_prefer_dark_theme = true;
-        cursor_theme_name = lib.mkForce "catppuccin-mocha-dark-cursors";
+        cursor_theme_name = lib.mkForce "catppuccin-mocha-sapphire-cursors";
         font_name = lib.mkForce "FiraCode Nerd Font Propo 12";
         icon_theme_name = lib.mkForce "Papirus-Dark";
-        theme_name = lib.mkForce "catppuccin-mocha-standard-mauve-dark";
+        theme_name = lib.mkForce "catppuccin-mocha-standard-sky-dark";
       };
-
       commands = {
         reboot = [
           "systemctl"
@@ -46,16 +58,10 @@
           "systemctl"
           "poweroff"
         ];
-        x11_prefix = [
-          "startx"
-          "/usr/bin/env"
-        ];
       };
-
       appearance = {
         greeting_msg = "Hey there!";
       };
-
       widget.clock = {
         format = "%A %d.%m.%Y %T";
         resolution = "500ms";
@@ -69,12 +75,12 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --cmd start-hyprland";
+        command = "${pkgs.greetd.regreet}/bin/regreet";
         user = "greeter";
       };
       initial_session = {
-        command = "Hyprland";
-        user = "phil";
+        command = "start-hyprland";
+        user = primaryUser;
       };
     };
   };