diff --git a/setup-desktop.sh b/setup-desktop.sh
index 4cc323b..a45ce6c 100755
--- a/setup-desktop.sh
+++ b/setup-desktop.sh
@@ -59,14 +59,54 @@ ok "PrusaSlicer installiert"
 
 # ── 4. Dot-Files ────────────────────────────────────────────────────────
 echo -e "\n=== 4/5 Dot-Files ==="
-if [[ ! -d ~/dotfiles ]]; then
-    git clone "$DOTFILES_REPO" ~/dotfiles
+DOTFILES_DIR="$HOME/git-projekte/dotfiles-rene"
+if [[ ! -d "$DOTFILES_DIR" ]]; then
+    mkdir -p "$HOME/git-projekte"
+    git clone "$DOTFILES_REPO" "$DOTFILES_DIR"
+fi
+
+# Neovim
+if [[ -f "$DOTFILES_DIR/nvim/install-nvim-dotfiles.sh" ]]; then
+    bash "$DOTFILES_DIR/nvim/install-nvim-dotfiles.sh"
+    ok "Dot-Files: nvim"
+fi
+
+# Micro
+if [[ -f "$DOTFILES_DIR/micro/install-micro-dotfiles.sh" ]]; then
+    bash "$DOTFILES_DIR/micro/install-micro-dotfiles.sh"
+    ok "Dot-Files: micro"
+fi
+
+# oh-my-zsh custom (Plugins, Themes, Aliase)
+if [[ -d "$DOTFILES_DIR/oh-my-zsh/custom" ]] && [[ -d ~/.oh-my-zsh/custom ]]; then
+    for f in "$DOTFILES_DIR/oh-my-zsh/custom"/*.zsh; do
+        [[ -f "$f" ]] && ln -sf "$f" ~/.oh-my-zsh/custom/
+    done
+    # Custom Plugins
+    if [[ -d "$DOTFILES_DIR/oh-my-zsh/custom/plugins" ]]; then
+        for plugin_dir in "$DOTFILES_DIR/oh-my-zsh/custom/plugins"/*/; do
+            plugin_name=$(basename "$plugin_dir")
+            ln -sfn "$plugin_dir" ~/.oh-my-zsh/custom/plugins/"$plugin_name"
+        done
+    fi
+    # Custom Themes
+    if [[ -d "$DOTFILES_DIR/oh-my-zsh/custom/themes" ]]; then
+        for theme_dir in "$DOTFILES_DIR/oh-my-zsh/custom/themes"/*/; do
+            theme_name=$(basename "$theme_dir")
+            ln -sfn "$theme_dir" ~/.oh-my-zsh/custom/themes/"$theme_name"
+        done
+    fi
+    ok "Dot-Files: oh-my-zsh custom"
+fi
+
+# heic-scripts nach ~/bin
+if [[ -d "$DOTFILES_DIR/heic-scripts" ]]; then
+    mkdir -p ~/bin
+    for script in "$DOTFILES_DIR/heic-scripts"/*; do
+        [[ -f "$script" ]] && ln -sf "$script" ~/bin/
+    done
+    ok "Dot-Files: heic-scripts → ~/bin"
 fi
-cd ~/dotfiles
-for pkg in nvim oh-my-zsh micro bin heic-scripts; do
-    [[ -d "$pkg" ]] && stow "$pkg" && ok "Dot-Files: $pkg"
-done
-cd ~
 
 # ── 5. XFCE Energieeinstellungen ────────────────────────────────────────
 echo -e "\n=== 5/5 XFCE Energieeinstellungen ==="