diff --git a/buildscripts/build.sh b/buildscripts/build.sh
index 27ebc3d..8e1dd4f 100755
--- a/buildscripts/build.sh
+++ b/buildscripts/build.sh
@@ -25,7 +25,7 @@ if [ -z $machine ]; then
   esac
 fi
 
-ICON="src/icons/ui2pbrowser_icon.ico"
+ICON=""$SCRIPT_DIR"/src/icons/ui2pbrowser_icon.ico"
 
 if [ "$machine" = "Mac" ]; then
   rm -rf I2P
@@ -36,7 +36,7 @@ elif [ "$machine" = "Linux" ]; then
   ./buildscripts/getprebuilt.sh
   exit 0
 elif [ "$machine" = "unix" ]; then
-  ICON=src/icons/windowsUIToopie2.png
+  ICON="$SCRIPT_DIR"/src/icons/windowsUIToopie2.png
   export EXTRACODE="unix"
   export EXTRA="    public final static String EXTRA = \"-$EXTRACODE\";"
 fi
@@ -62,11 +62,11 @@ if [ ! -d "I2P" ]; then
   --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
   $JPACKAGE_OPTS \
   --resource-dir $SCRIPT_DIR/build \
-  --app-content src/I2P/config \
-  --app-content src/unix/torbrowser.sh \
-  --app-content src/win/torbrowser-windows.sh \
-  --app-content src/icons/windowsUIToopie2.png \
-  --app-content src/icons/ui2pbrowser_icon.ico \
+  --app-content "$SCRIPT_DIR"/src/I2P/config \
+  --app-content "$SCRIPT_DIR"/src/unix/torbrowser.sh \
+  --app-content "$SCRIPT_DIR"/src/win/torbrowser-windows.sh \
+  --app-content "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+  --app-content "$SCRIPT_DIR"/src/icons/ui2pbrowser_icon.ico \
   --icon "${ICON}" \
   --input $SCRIPT_DIR/build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
 fi
diff --git a/buildscripts/exe.sh b/buildscripts/exe.sh
index 505888a..3f43611 100755
--- a/buildscripts/exe.sh
+++ b/buildscripts/exe.sh
@@ -17,9 +17,9 @@ jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
-    --app-content src/I2P/config \
-    --app-content src/icons/windowsUIToopie2.png \
-    --icon src/icons/windowsUIToopie2.png \
+    --app-content "$SCRIPT_DIR"/src/I2P/config \
+    --app-content "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+    --icon "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
     --input "$SCRIPT_DIR/build" \
     --verbose \
     --type exe \
diff --git a/buildscripts/launcher.sh b/buildscripts/launcher.sh
index d26434f..0cfb255 100755
--- a/buildscripts/launcher.sh
+++ b/buildscripts/launcher.sh
@@ -66,20 +66,20 @@ ant jbigi
 
 cd "$SCRIPT_DIR"
 
-mkdir -p src/I2P/config
-rm -rf "src/I2P/config/geoip" "src/I2P/config/webapps" "src/I2P/config/certificates"
-cp -v "$RES_DIR/clients.config" "src/I2P/config/"
-cp -v "$RES_DIR/wrapper.config" "src/I2P/config/"
-#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
-cat router.config > src/I2P/config/router.config
-cat i2ptunnel.config > src/I2P/config/i2ptunnel.config
-cp -v "$RES_DIR/hosts.txt" "src/I2P/config/hosts.txt"
-cp -R "$RES_DIR/certificates" "src/I2P/config/certificates"
-cp -R "$RES_DIR/eepsite" "src/I2P/config/eepsite"
-mkdir -p src/I2P/config/geoip
-cp -v "$RES_DIR/GeoLite2-Country.mmdb.gz" "src/I2P/config/geoip/GeoLite2-Country.mmdb.gz"
-cp -R "$I2P_PKG/webapps" "src/I2P/config/webapps"
-cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
+mkdir -p "$SCRIPT_DIR"/src/I2P/config
+rm -rf ""$SCRIPT_DIR"/src/I2P/config/geoip" ""$SCRIPT_DIR"/src/I2P/config/webapps" ""$SCRIPT_DIR"/src/I2P/config/certificates"
+cp -v "$RES_DIR/clients.config" ""$SCRIPT_DIR"/src/I2P/config/"
+cp -v "$RES_DIR/wrapper.config" ""$SCRIPT_DIR"/src/I2P/config/"
+#grep -v 'router.updateURL' $(RES_DIR)/router.config > "$SCRIPT_DIR"/src/I2P/config/router.config
+cat router.config > "$SCRIPT_DIR"/src/I2P/config/router.config
+cat i2ptunnel.config > "$SCRIPT_DIR"/src/I2P/config/i2ptunnel.config
+cp -v "$RES_DIR/hosts.txt" ""$SCRIPT_DIR"/src/I2P/config/hosts.txt"
+cp -R "$RES_DIR/certificates" ""$SCRIPT_DIR"/src/I2P/config/certificates"
+cp -R "$RES_DIR/eepsite" ""$SCRIPT_DIR"/src/I2P/config/eepsite"
+mkdir -p "$SCRIPT_DIR"/src/I2P/config/geoip
+cp -v "$RES_DIR/GeoLite2-Country.mmdb.gz" ""$SCRIPT_DIR"/src/I2P/config/geoip/GeoLite2-Country.mmdb.gz"
+cp -R "$I2P_PKG/webapps" ""$SCRIPT_DIR"/src/I2P/config/webapps"
+cd "$SCRIPT_DIR"/src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
 
 echo "compiling custom launcher"
 mkdir -p "$SCRIPT_DIR/build"
diff --git a/buildscripts/msi.sh b/buildscripts/msi.sh
index 98c7cb4..98fdbc9 100755
--- a/buildscripts/msi.sh
+++ b/buildscripts/msi.sh
@@ -18,9 +18,9 @@ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
-    --app-content src/I2P/config \
-    --app-content src/icons/windowsUIToopie2.png \
-    --icon src/icons/windowsUIToopie2.png \
+    --app-content "$SCRIPT_DIR"/src/I2P/config \
+    --app-content "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+    --icon "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
     --input "$SCRIPT_DIR/build" \
     --verbose \
     --type msi \
diff --git a/buildscripts/targz.sh b/buildscripts/targz.sh
index 890372e..2524b1f 100755
--- a/buildscripts/targz.sh
+++ b/buildscripts/targz.sh
@@ -18,7 +18,7 @@ TORSOCKS=$(which torsocks)
 if [ -f "${TORSOCKS}" ]; then
     . "${TORSOCKS}" on
 fi
-./lib/torbrowser.sh
+"$SCRIPT_DIR"/src/unix/torbrowser.sh
 version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
 . "${TORSOCKS}" off
 locale="en-US" # mention your locale. default = en-US
diff --git a/buildscripts/zip.sh b/buildscripts/zip.sh
index e2b2a14..7ea2dd6 100644
--- a/buildscripts/zip.sh
+++ b/buildscripts/zip.sh
@@ -18,7 +18,7 @@ TORSOCKS=$(which torsocks)
 if [ -f "${TORSOCKS}" ]; then
     . "${TORSOCKS}" on
 fi
-../src/win/torbrowser-windows.sh
+"$SCRIPT_DIR"/src/win/torbrowser-windows.sh
 version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
 . "${TORSOCKS}" off
 locale="en-US" # mention your locale. default = en-US