diff --git a/CLAUDE.md b/CLAUDE.md
index c372859..c375572 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -7,7 +7,7 @@ Reproduzierbares Arch-Linux-Setup basierend auf archinstall + Post-Install-Autom
 - `config/` — archinstall-Konfiguration (inkl. custom-commands die das Repo nach /opt/moonarch klonen)
 - `scripts/` — Post-Install- und Helper-Scripts
 - `packages/` — Paketlisten (offiziell + AUR), getrennt gepflegt
-- `defaults/` — XDG-Configs, Shell-Config, Helper-Binaries, greetd-Config, Wallpaper
+- `defaults/` — XDG-Configs, Shell-Config, Helper-Binaries, greetd/moongreet-Config, Wallpaper
 
 ## Konventionen
 
diff --git a/README.md b/README.md
index 81deb51..87ebd20 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Moonarch
 
-Reproduzierbares Arch-Linux-Setup mit Niri (Wayland Compositor), greetd/regreet, Catppuccin Mocha Theming und durchgehender Automatisierung.
+Reproduzierbares Arch-Linux-Setup mit Niri (Wayland Compositor), greetd/moongreet, Catppuccin Mocha Theming und durchgehender Automatisierung.
 
 ## Schnellstart
 
@@ -42,8 +42,8 @@ defaults/
   bin/           moonarch-* Helper-Scripts (/usr/local/bin/)
   xdg/           XDG-Defaults (/etc/xdg/)
   shell/         Zsh-Konfiguration
-  etc/           greetd/regreet Konfiguration
-  backgrounds/   Greeter-Wallpaper
+  etc/           greetd + moongreet Konfiguration
+  backgrounds/   Default-Wallpaper
 ```
 
 ## Update
@@ -57,7 +57,7 @@ Aktualisiert Repo, Systempakete, fehlende Pakete und Defaults — alles interakt
 ## Stack
 
 - **Compositor:** Niri (Scrollable Tiling Wayland)
-- **Greeter:** greetd + regreet
+- **Greeter:** greetd + moongreet
 - **Bar:** Waybar
 - **Launcher:** Rofi (lbonn Wayland Fork)
 - **Terminal:** Foot
diff --git a/config/user_configuration.json b/config/user_configuration.json
index 2d00b21..5e9a40b 100644
--- a/config/user_configuration.json
+++ b/config/user_configuration.json
@@ -41,7 +41,6 @@
         "fwupd",
         "ufw",
         "greetd",
-        "greetd-regreet",
         "niri",
         "waybar",
         "foot",
diff --git a/defaults/backgrounds/moonarch-greeter.jpg b/defaults/backgrounds/wallpaper.jpg
similarity index 100%
rename from defaults/backgrounds/moonarch-greeter.jpg
rename to defaults/backgrounds/wallpaper.jpg
diff --git a/defaults/etc/greetd/config.toml b/defaults/etc/greetd/config.toml
index fd56305..be924d8 100644
--- a/defaults/etc/greetd/config.toml
+++ b/defaults/etc/greetd/config.toml
@@ -1,9 +1,9 @@
 # ABOUTME: greetd-Konfiguration fuer Moonarch.
-# ABOUTME: Startet regreet unter niri als Wayland-Compositor.
+# ABOUTME: Startet moongreet als Wayland-Greeter via gtk4-layer-shell.
 
 [terminal]
 vt = 1
 
 [default_session]
-command = "niri -c /etc/greetd/niri-greeter.kdl"
+command = "moongreet"
 user = "greeter"
diff --git a/defaults/etc/greetd/niri-greeter.kdl b/defaults/etc/greetd/niri-greeter.kdl
deleted file mode 100644
index 788639b..0000000
--- a/defaults/etc/greetd/niri-greeter.kdl
+++ /dev/null
@@ -1,58 +0,0 @@
-// ABOUTME: Minimale Niri-Konfiguration fuer den regreet Login-Greeter.
-// ABOUTME: Wird von greetd gestartet statt cage, um Multi-Monitor korrekt zu handhaben.
-
-input {
-    keyboard {
-        xkb {
-            layout "de"
-        }
-        numlock
-    }
-
-    touchpad {
-        tap
-        natural-scroll
-    }
-
-    mouse {
-        accel-profile "flat"
-    }
-}
-
-cursor {
-    xcursor-theme "Sweet-cursors"
-}
-
-layout {
-    gaps 0
-
-    focus-ring {
-        off
-    }
-
-    border {
-        off
-    }
-}
-
-// regreet starten und niri beenden, sobald regreet sich schliesst
-spawn-at-startup "sh" "-c" "regreet; niri msg action quit --skip-confirmation"
-
-// Greeter-Fenster maximiert darstellen
-window-rule {
-    open-maximized true
-}
-
-hotkey-overlay {
-    skip-at-startup
-}
-
-prefer-no-csd
-
-animations {
-    off
-}
-
-binds {
-    // Keine Keybinds noetig fuer den Greeter
-}
diff --git a/defaults/etc/greetd/regreet.css b/defaults/etc/greetd/regreet.css
deleted file mode 100644
index bd6eb6e..0000000
--- a/defaults/etc/greetd/regreet.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ABOUTME: Catppuccin Mocha CSS-Overrides fuer regreet. */
-/* ABOUTME: Ergaenzt das GTK-Theme mit greeter-spezifischem Styling. */
-
-window {
-    background-color: #1e1e2e;
-}
-
-entry {
-    border-radius: 8px;
-    padding: 8px 12px;
-    border: 1px solid #45475a;
-    background-color: #313244;
-    color: #cdd6f4;
-}
-
-entry:focus {
-    border-color: #b4befe;
-}
-
-button {
-    border-radius: 8px;
-    padding: 8px 16px;
-    background-color: #313244;
-    color: #cdd6f4;
-    border: 1px solid #45475a;
-}
-
-button:hover {
-    background-color: #45475a;
-}
-
-button.suggested-action {
-    background-color: #b4befe;
-    color: #1e1e2e;
-    border: none;
-}
-
-button.suggested-action:hover {
-    background-color: #89b4fa;
-}
diff --git a/defaults/etc/greetd/regreet.toml b/defaults/etc/greetd/regreet.toml
deleted file mode 100644
index 9c106d7..0000000
--- a/defaults/etc/greetd/regreet.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-# ABOUTME: regreet-Konfiguration fuer Moonarch.
-# ABOUTME: Definiert Aussehen und Verhalten des Login-Greeters.
-
-[background]
-path = "/usr/share/backgrounds/moonarch-greeter.jpg"
-fit = "Cover"
-
-[GTK]
-application_prefer_dark_theme = true
-cursor_theme_name = "Sweet-cursors"
-font_name = "Hack Nerd Font 12"
-icon_theme_name = "Newaita-reborn-gray-dark"
-theme_name = "catppuccin-mocha-lavender-standard+default"
-
-[commands]
-reboot = ["systemctl", "reboot"]
-poweroff = ["systemctl", "poweroff"]
diff --git a/defaults/etc/moongreet/moongreet.toml b/defaults/etc/moongreet/moongreet.toml
new file mode 100644
index 0000000..caac283
--- /dev/null
+++ b/defaults/etc/moongreet/moongreet.toml
@@ -0,0 +1,9 @@
+# ABOUTME: Moongreet-Konfiguration fuer Moonarch.
+# ABOUTME: Definiert Aussehen und Verhalten des Login-Greeters.
+
+[appearance]
+background = "/usr/share/moonarch/wallpaper.jpg"
+
+[behavior]
+# show_user_list = true
+# default_session = "niri-session"
diff --git a/packages/official.txt b/packages/official.txt
index c8d7357..ab4ee69 100644
--- a/packages/official.txt
+++ b/packages/official.txt
@@ -63,7 +63,6 @@ gtklock-powerbar-module
 gtklock-userinfo-module
 nwg-look
 greetd
-greetd-regreet
 polkit-gnome
 
 # Dateimanager / XDG
diff --git a/scripts/post-install.sh b/scripts/post-install.sh
index 7f71442..0cbdc0a 100755
--- a/scripts/post-install.sh
+++ b/scripts/post-install.sh
@@ -108,19 +108,30 @@ if [[ ! -f "$HOME/.zshrc" ]]; then
     echo "source /etc/zsh/zshrc.moonarch" >> "$HOME/.zshrc"
 fi
 
-# --- greetd / regreet Konfiguration ---
+# --- moongreet installieren (Greeter aus Gitea) ---
 
-log "Konfiguriere greetd + regreet..."
+if ! command -v moongreet &>/dev/null; then
+    log "Installiere moongreet..."
+    MOONGREET_TMPDIR=$(mktemp -d)
+    git clone https://gitea.moonarch.de/nevaforget/greetd-moongreet.git "$MOONGREET_TMPDIR/moongreet"
+    (cd "$MOONGREET_TMPDIR/moongreet/pkg" && makepkg -si --noconfirm)
+    rm -rf "$MOONGREET_TMPDIR"
+else
+    log "moongreet bereits installiert."
+fi
+
+# --- greetd / moongreet Konfiguration ---
+
+log "Konfiguriere greetd + moongreet..."
 sudo mkdir -p /etc/greetd
 sudo cp "$DEFAULTS_DIR/etc/greetd/config.toml" /etc/greetd/config.toml
-sudo cp "$DEFAULTS_DIR/etc/greetd/niri-greeter.kdl" /etc/greetd/niri-greeter.kdl
-sudo cp "$DEFAULTS_DIR/etc/greetd/regreet.toml" /etc/greetd/regreet.toml
-sudo cp "$DEFAULTS_DIR/etc/greetd/regreet.css" /etc/greetd/regreet.css
+sudo mkdir -p /etc/moongreet
+sudo cp "$DEFAULTS_DIR/etc/moongreet/moongreet.toml" /etc/moongreet/moongreet.toml
 
-# Greeter-Wallpaper installieren
-log "Installiere Greeter-Wallpaper..."
-sudo mkdir -p /usr/share/backgrounds
-sudo cp "$DEFAULTS_DIR/backgrounds/moonarch-greeter.jpg" /usr/share/backgrounds/moonarch-greeter.jpg
+# Default-Wallpaper installieren (Greeter, Lockscreen, Desktop)
+log "Installiere Default-Wallpaper..."
+sudo mkdir -p /usr/share/moonarch
+sudo cp "$DEFAULTS_DIR/backgrounds/wallpaper.jpg" /usr/share/moonarch/wallpaper.jpg
 
 # --- Systemd-Services aktivieren ---