diff --git a/arch-config/scripts/arch-config.sh b/arch-config/scripts/arch-config.sh
index 90012700..a1867360 100755
--- a/arch-config/scripts/arch-config.sh
+++ b/arch-config/scripts/arch-config.sh
@@ -74,7 +74,7 @@ git clone -b temporary-dir https://gitea.exu.li/realstickman/configs.git "$tempd
 # NOTE Arguments get passed automatically now
 if ! cmp --silent "$scriptloc" "$HOME/scripts/arch-config.sh"; then
     echo Removed old config file and launched new one.
-    cp "$tempdir/configs/arch-config/scripts/arch-config.sh" "$HOME/scripts/" && bash ~/scripts/arch-config.sh "$@"
+    cp "$tempdir/arch-config/scripts/arch-config.sh" "$HOME/scripts/" && bash ~/scripts/arch-config.sh "$@"
 fi
 
 # if no seltheme file exists, ask to select a theme
@@ -243,21 +243,21 @@ if [[ copy_firefox -eq 1 ]]; then
 fi
 
 #copy single files
-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" ~/
+cp -r "$tempdir/arch-config/.face" ~/
+cp -r "$tempdir/arch-config/.gtkrc-2.0" ~/
+cp -r "$tempdir/arch-config/.gitconfig" ~/
+cp -r "$tempdir/arch-config/.xinitrc" ~/
+cp -r "$tempdir/arch-config/.kopiaignore" ~/
 echo Copied files
 
 # make .xinitrc executable
 chmod +x ~/.xinitrc
 
 #copy scripts
-cp -r "$tempdir/configs/arch-config/scripts/" ~/
+cp -r "$tempdir/arch-config/scripts/" ~/
 
 #copy stuff to /etc
-sudo cp -r "$tempdir/configs/arch-config/etc" /
+sudo cp -r "$tempdir/arch-config/etc" /
 
 echo Copied folders
 
@@ -269,10 +269,10 @@ if [ "$distro" == "ID=arch" ]; then
 fi
 
 #copy usr stuff
-sudo cp -r "$tempdir/configs/arch-config/usr" /
+sudo cp -r "$tempdir/arch-config/usr" /
 
 # copy xresources for sway
-cp "$tempdir/configs/arch-config/.Xdefaults" ~/
+cp "$tempdir/arch-config/.Xdefaults" ~/
 
 echo
 cat <<EOF
@@ -308,14 +308,14 @@ EOF
 seltheme="$(cat "$HOME/.seltheme")"
 if [[ "$seltheme" == "nyarch" ]]; then
     #cp -r "./themes/nyarch/i3" "$HOME/.config/"
-    cp "$tempdir/configs/arch-themes/nyarch/sway/color" "$HOME/.config/sway/config.d/"
+    cp "$tempdir/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 "$tempdir/configs/arch-themes/space-pink/sway/color" "$HOME/.config/sway/config.d/"
+    cp "$tempdir/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"
@@ -345,24 +345,10 @@ EOF
 
 # download cat as cat
 echo "Installing bash cat"
-git clone https://github.com/RealStickman/bash-cat-with-cat.git &>/dev/null
+git clone https://github.com/RealStickman/bash-cat-with-cat.git "$tempdir" &>/dev/null
 cp ./bash-cat-with-cat/cat.sh "$HOME/scripts/pieces/cat.sh"
 #rm -rf ./bash-cat-with-cat
 
-: '
-echo
-cat <<EOF
-####################
-##### PSIPCalc #####
-####################
-EOF
-
-# download ip-calculator with powershell
-echo "Installing powershell ip calculator"
-git clone https://github.com/RealStickman/PSipcalc &>/dev/null
-cp ./PSipcalc/PSipcalc.ps1 "$HOME/scripts/in_path/sc-psipcalc"
-rm -rf ./PSipcalc
-'
 echo
 cat <<EOF
 ########################################