diff --git a/arch-config/scripts/arch-config.sh b/arch-config/scripts/arch-config.sh
index 2d7f224f..a0cc17f2 100755
--- a/arch-config/scripts/arch-config.sh
+++ b/arch-config/scripts/arch-config.sh
@@ -223,14 +223,9 @@ cat <<EOF
 EOF
 
 #copy folders
-cp -r ~/configs/arch-config/.config/ ~/
-cp -r ~/configs/arch-config/.local/ ~/
-#cp -r ~/config/Dokumente ~/
-#cp -r ~/config/.mozilla/firefox/default-release/* ~/.mozilla/firefox/*.default-release/
-#cp -r ~/config/.easystroke ~/
-#cp -r ~/config/.elvish ~/
-#cp -r ~/configs/arch-config/.doom.d ~/
-cp -r ~/configs/arch-config/.ssh ~/
+cp -r "$tempdir/configs/arch-config/.config/" ~/
+cp -r "$tempdir/configs/arch-config/.local/" ~/
+cp -r "$tempdir/configs/arch-config/.ssh" ~/
 
 # copy firefox only if "-f" or "--firefox" is given as argument
 if [[ copy_firefox -eq 1 ]]; then
@@ -238,7 +233,7 @@ if [[ copy_firefox -eq 1 ]]; then
         # NOTE check if firefox default-release directory exists. 1 is good, 0 is bad
         firefoxdir=$(find ~/.mozilla/firefox/ -name \*.default-release | wc -l)
         if [[ $firefoxdir -eq 1 ]]; then
-            cp -r ~/configs/arch-config/.mozilla/firefox/default-release/* ~/.mozilla/firefox/*.default-release/
+            cp -r "$tempdir/configs/arch-config/.mozilla/firefox/default-release/"* ~/.mozilla/firefox/*.default-release/
         else
             echo "Please launch firefox and then update the config again"
         fi
@@ -248,43 +243,36 @@ if [[ copy_firefox -eq 1 ]]; then
 fi
 
 #copy single files
-#cp -r ~/configs/arch-config/.bashrc ~/
-cp -r ~/configs/arch-config/.face ~/
-cp -r ~/configs/arch-config/.gtkrc-2.0 ~/
-cp -r ~/configs/arch-config/.gitconfig ~/
-#cp -r ~/configs/arch-config/.tmux.conf ~/
-cp -r ~/configs/arch-config/.xinitrc ~/
-cp -r ~/configs/arch-config/.kopiaignore ~/
+cp -r "$tempdir/configs/arch-config/.face" ~/
+cp -r "$tempdir/configs/arch-config/.gtkrc-2.0" ~/
+cp -r "$tempdir/configs/arch-config/.gitconfig" ~/
+cp -r "$tempdir/configs/arch-config/.xinitrc" ~/
+cp -r "$tempdir/configs/arch-config/.kopiaignore" ~/
 echo Copied files
 
 # make .xinitrc executable
 chmod +x ~/.xinitrc
 
 #copy scripts
-cp -r ~/configs/arch-config/scripts/ ~/
-
-# copy cache
-#cp -r ~/configs/arch-config/.cache ~/
+cp -r "$tempdir/configs/arch-config/scripts/" ~/
 
 #copy stuff to /etc
-sudo cp -r ~/configs/arch-config/etc /
+sudo cp -r "$tempdir/configs/arch-config/etc" /
 
 echo Copied folders
 
 # NOTE Distro specific stuff
+# TODO simplify for Arch only
 distro=$(cat /etc/*-release | grep "^ID=")
-if [ "$distro" == "ID=arcolinux" ]; then
-    sudo mv /etc/arco-pacman.conf /etc/pacman.conf
-fi
 if [ "$distro" == "ID=arch" ]; then
     sudo mv /etc/arch-pacman.conf /etc/pacman.conf
 fi
 
 #copy usr stuff
-sudo cp -r ~/configs/arch-config/usr /
+sudo cp -r "$tempdir/configs/arch-config/usr" /
 
-# copy xresources
-cp ~/configs/arch-config/.Xdefaults ~/
+# copy xresources for sway
+cp "$tempdir/configs/arch-config/.Xdefaults" ~/
 
 echo
 cat <<EOF
@@ -294,6 +282,7 @@ cat <<EOF
 EOF
 
 # lupusregina
+# TODO analyse parts necessary for Wayland with Alita
 if [ "$(hostname)" == "lupusregina" ]; then
     echo "Applying overrides for $(hostname)"
     # polybar dpi
@@ -319,14 +308,14 @@ EOF
 seltheme="$(cat "$HOME/.seltheme")"
 if [[ "$seltheme" == "nyarch" ]]; then
     #cp -r "./themes/nyarch/i3" "$HOME/.config/"
-    cp "$HOME/configs/arch-themes/nyarch/sway/color" "$HOME/.config/sway/config.d/"
+    cp "$tempdir/configs/arch-themes/nyarch/sway/color" "$HOME/.config/sway/config.d/"
     #cp -r "$HOME/configs/arch-themes/nyarch/polybar" "$HOME/.config/"
     #cp -r "./themes/nyarch/neofetch/lowpoly_flamegirl_blue.txt" "$HOME/.config/neofetch/lowpoly_flamegirl.txt"
     #cp "./themes/.fehbg-nyarch" "$HOME/.fehbg"
     #sed -i 's/^NAME=".*"/NAME="Rawrch Linyux"/' /etc/os-release
 elif [[ "$seltheme" == "space-pink" ]]; then
     #cp -r "./themes/space-pink/i3" "$HOME/.config/"
-    cp "$HOME/configs/arch-themes/space-pink/sway/color" "$HOME/.config/sway/config.d/"
+    cp "$tempdir/configs/arch-themes/space-pink/sway/color" "$HOME/.config/sway/config.d/"
     #cp -r "$HOME/configs/arch-themes/space-pink/polybar" "$HOME/.config/"
     #cp -r "./themes/space-pink/neofetch/lowpoly_flamegirl_orange.txt" "$HOME/.config/neofetch/lowpoly_flamegirl.txt"
     #cp "./themes/.fehbg-space-pink" "$HOME/.fehbg"
@@ -358,7 +347,7 @@ EOF
 echo "Installing bash cat"
 git clone https://github.com/RealStickman/bash-cat-with-cat.git &>/dev/null
 cp ./bash-cat-with-cat/cat.sh "$HOME/scripts/pieces/cat.sh"
-rm -rf ./bash-cat-with-cat
+#rm -rf ./bash-cat-with-cat
 
 : '
 echo
@@ -413,9 +402,9 @@ if [[ $(pacman -Q | grep vmware-workstation) ]]; then
 fi
 
 # FIXME temporary
-if [ -f "/etc/pipewire/pipewire.conf" ]; then
-    sudo rm "/etc/pipewire/pipewire.conf"
-fi
+#if [ -f "/etc/pipewire/pipewire.conf" ]; then
+#    sudo rm "/etc/pipewire/pipewire.conf"
+#fi
 
 # enable fstrim timer
 sudo systemctl enable fstrim.timer