diff --git a/build-all.sh b/build-all.sh
index ab22035..e7446e8 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -7,4 +7,5 @@ BASE_DIR=$(cd `dirname "$0"`; pwd)
 #"$BASE_DIR/build-opentoonz.sh"
 "$BASE_DIR/build-opentoonz-testing.sh"
 "$BASE_DIR/build-synfigstudio.sh"
+"$BASE_DIR/build-synfigstudio-debug.sh"
 "$BASE_DIR/build-papagayong.sh"
diff --git a/build-opentoonz-testing.sh b/build-opentoonz-testing.sh
index d8b5cc4..c86af6d 100755
--- a/build-opentoonz-testing.sh
+++ b/build-opentoonz-testing.sh
@@ -67,7 +67,15 @@ run_nsis() {
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingportable/envdeps_release/version-opentoonz-testing"
 }
 
-run_appimage linux 64
-run_appimage linux 32
-run_nsis win 64
-run_nsis win 32
+linux64() { run_appimage linux 64; }
+linux32() { run_appimage linux 32; }
+win64()   { run_nsis win 64; }
+win32()   { run_nsis win 32; }
+
+COMMANDS="$@"
+if [ -z "$COMMANDS" ]; then COMMANDS="linux64 linux32 win64 win32"; fi
+for COMMAND in $COMMANDS; do
+    echo "Command: $COMMAND"
+    $COMMAND
+done
+
diff --git a/build-opentoonz.sh b/build-opentoonz.sh
index 0793d0f..16b9eb4 100755
--- a/build-opentoonz.sh
+++ b/build-opentoonz.sh
@@ -66,7 +66,14 @@ run_nsis() {
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-portable/envdeps_release/version-opentoonz-master"
 }
 
-run_appimage linux 64
-run_appimage linux 32
-run_nsis win 64
-run_nsis win 32
+linux64() { run_appimage linux 64; }
+linux32() { run_appimage linux 32; }
+win64()   { run_nsis win 64; }
+win32()   { run_nsis win 32; }
+
+COMMANDS="$@"
+if [ -z "$COMMANDS" ]; then COMMANDS="linux64 linux32 win64 win32"; fi
+for COMMAND in $COMMANDS; do
+    echo "Command: $COMMAND"
+    $COMMAND
+done
diff --git a/build-papagayong.sh b/build-papagayong.sh
index 7eb633c..2299b3a 100755
--- a/build-papagayong.sh
+++ b/build-papagayong.sh
@@ -60,6 +60,14 @@ run_nsis() {
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-testing/unpack/version-papagayong-testing"
 }
 
-run_appimage linux 64
-run_appimage linux 32
-run_nsis win 32
+linux64() { run_appimage linux 64; }
+linux32() { run_appimage linux 32; }
+win32()   { run_nsis win 32; }
+
+COMMANDS="$@"
+if [ -z "$COMMANDS" ]; then COMMANDS="linux64 linux32 win32"; fi
+for COMMAND in $COMMANDS; do
+    echo "Command: $COMMAND"
+    $COMMAND
+done
+
diff --git a/build-synfigstudio-debug.sh b/build-synfigstudio-debug.sh
index a666184..f7f547b 100755
--- a/build-synfigstudio-debug.sh
+++ b/build-synfigstudio-debug.sh
@@ -75,7 +75,14 @@ run_nsis() {
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-debugportable/envdeps_release/version-synfigstudio-debug"
 }
 
-run_appimage linux 64
-run_appimage linux 32
-run_nsis win 64
-run_nsis win 32
+linux64() { run_appimage linux 64; }
+linux32() { run_appimage linux 32; }
+win64()   { run_nsis win 64; }
+win32()   { run_nsis win 32; }
+
+COMMANDS="$@"
+if [ -z "$COMMANDS" ]; then COMMANDS="linux64 linux32 win64 win32"; fi
+for COMMAND in $COMMANDS; do
+    echo "Command: $COMMAND"
+    $COMMAND
+done
diff --git a/build-synfigstudio.sh b/build-synfigstudio.sh
index 4db6c47..c0281b4 100755
--- a/build-synfigstudio.sh
+++ b/build-synfigstudio.sh
@@ -76,7 +76,14 @@ run_nsis() {
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-portable/envdeps_release/version-synfigstudio-master"
 }
 
-run_appimage linux 64
-run_appimage linux 32
-run_nsis win 64
-run_nsis win 32
+linux64() { run_appimage linux 64; }
+linux32() { run_appimage linux 32; }
+win64()   { run_nsis win 64; }
+win32()   { run_nsis win 32; }
+
+COMMANDS="$@"
+if [ -z "$COMMANDS" ]; then COMMANDS="linux64 linux32 win64 win32"; fi
+for COMMAND in $COMMANDS; do
+    echo "Command: $COMMAND"
+    $COMMAND
+done
diff --git a/env-builder-data/build/script/packet/synfigcore-debug.sh b/env-builder-data/build/script/packet/synfigcore-debug.sh
index 6cc6b87..c7cd9d7 100644
--- a/env-builder-data/build/script/packet/synfigcore-debug.sh
+++ b/env-builder-data/build/script/packet/synfigcore-debug.sh
@@ -1,6 +1,6 @@
 source "$PACKET_SCRIPT_DIR/synfigcore-master.sh"
 
 DEPS=`echo "$DEPS" | sed "s|synfigetl-master|synfigetl-debug|g"`
-PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
+PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
 PK_GIT_CHECKOUT="origin/debug"
 PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/env-builder-data/build/script/packet/synfigetl-debug.sh b/env-builder-data/build/script/packet/synfigetl-debug.sh
index 2245a5d..ebbb5f2 100644
--- a/env-builder-data/build/script/packet/synfigetl-debug.sh
+++ b/env-builder-data/build/script/packet/synfigetl-debug.sh
@@ -1,5 +1,5 @@
 source "$PACKET_SCRIPT_DIR/synfigetl-master.sh"
 
-PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
+PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
 PK_GIT_CHECKOUT="origin/debug"
 PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"
diff --git a/env-builder-data/build/script/packet/synfigstudio-debug.sh b/env-builder-data/build/script/packet/synfigstudio-debug.sh
index 87b01d6..19b5a66 100644
--- a/env-builder-data/build/script/packet/synfigstudio-debug.sh
+++ b/env-builder-data/build/script/packet/synfigstudio-debug.sh
@@ -1,6 +1,7 @@
 source "$PACKET_SCRIPT_DIR/synfigstudio-master.sh"
 
 DEPS=`echo "$DEPS" | sed "s|synfigcore-master|synfigcore-debug|g"`
-PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git"
+DEPS_NATIVE=`echo "$DEPS_NATIVE" | sed "s|synfigcore-master|synfigcore-debug|g"`
+PK_URL="https://github.com/synfig/$PK_DIRNAME.git"
 PK_GIT_CHECKOUT="origin/debug"
 PK_CONFIGURE_OPTIONS="--enable-debug --enable-optimization=0"