diff --git a/build-all.sh b/build-all.sh
index e4bd58a..4f98fbb 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -2,6 +2,7 @@
 
 BASE_DIR=$(cd `dirname "$0"`; pwd)
 
-"$BASE_DIR/build-opentoonz.sh"
+#"$BASE_DIR/build-opentoonz.sh"
 "$BASE_DIR/build-opentoonz-testing.sh"
-"$BASE_DIR/build-synfigstudio-linux.sh"
+"$BASE_DIR/build-synfigstudio.sh"
+"$BASE_DIR/build-papagayong.sh"
diff --git a/build-synfigstudio-linux.sh b/build-synfigstudio-linux.sh
deleted file mode 100755
index ab56097..0000000
--- a/build-synfigstudio-linux.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BASE_DIR=$(cd `dirname "$0"`; pwd)
-DATA_DIR="$BASE_DIR/docker-builder-data"
-BUILD_DIR=$DATA_DIR/build
-PUBLISH_DIR=$BASE_DIR/publish
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-    source $CONFIG_FILE
-fi
-
-SCRIPT="$BASE_DIR/docker/run.sh"
-
-run_appimage() {
-    export PLATFORM="$1"
-    export ARCH="$2"
-
-    echo ""
-    echo "Update synfigstudio for $PLATFORM-$ARCH"
-    echo ""
-    $SCRIPT update synfigetl-master
-    $SCRIPT update synfigcore-master
-    $SCRIPT update synfigstudio-master
-    $SCRIPT clean_before_do install_release synfigstudio-appimage
-
-    "$PUBLISH_DIR/publish.sh" \
-        "synfigstudio" \
-        "SynfigStudio-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.appimage" \
-        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-appimage/install_release" \
-        "*.appimage" \
-        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-appimage/envdeps_release/version-synfigstudio-master"
-}
-
-run_nsis() {
-    export PLATFORM="$1"
-    export ARCH="$2"
-
-    echo ""
-    echo "Update synfigstudio for $PLATFORM-$ARCH"
-    echo ""
-    $SCRIPT update synfigetl-master
-    $SCRIPT update synfigcore-master
-    $SCRIPT update synfigstudio-master
-    $SCRIPT clean_before_do install_release synfigstudio-nsis
-
-    "$PUBLISH_DIR/publish.sh" \
-        "synfigstudio" \
-        "SynfigStudio-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.exe" \
-        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-nsis/install_release" \
-        "*.exe" \
-        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-nsis/envdeps_release/version-synfigstudio-master"
-}
-
-run_appimage linux 64
-run_appimage linux 32
-#run_nsis win 64
-#run_nsis win 32
diff --git a/build-synfigstudio-win.sh b/build-synfigstudio-win.sh
deleted file mode 100755
index 5d03485..0000000
--- a/build-synfigstudio-win.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export IMAGE=build-fedora-cross-win
-export TASK=synfig-linux
-
-OLDDIR=`pwd`
-BASE_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-DATA_DIR="$BASE_DIR/docker-builder-data"
-BUILD_DIR=$DATA_DIR/build
-PUBLISH_DIR=$BASE_DIR/publish
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-
-run() {
-	export SCRIPT="$BASE_DIR/docker/run.sh"
-	export PLATFORM=win-${ARCH}
-	export PLATFORM_SUFFIX=${ARCH}bit
-
-	echo ""
-	echo "Update synfigstudio for ${PLATFORM}"
-	echo ""
-	
-	$SCRIPT /build/script/common/manager.sh update synfigstudio-master
-	# QUICK HACK:
-	$SCRIPT /build/packet/${PLATFORM}/synfigstudio-master/download/synfig/autobuild/fedora-crosscompile-win.sh
-	#local DIR="$PACKET_BUILD_DIR/$PLATFORM/synfigstudio-appimage/install_release"
-	#local VERSION_FILE="$PACKET_BUILD_DIR/$PLATFORM/synfigstudio-appimage/envdeps_release/version-synfigstudio-master"
-	#local VERSION=`cat "$VERSION_FILE" | cut -d'-' -f 1`
-	#local COMMIT=`cat "$VERSION_FILE" | cut -d'-' -f 2-`
-	#COMMIT="${COMMIT:0:5}"
-	#local DATE=`date -u +%Y.%m.%d`
-	#if [ -z "$COMMIT" ]; then
-	#	echo "Cannot find version, pheraps appimage not ready. Cancel."
-	#	return 1
-	#fi
-	cd $PACKET_BUILD_DIR/$PLATFORM/synfigstudio-master/build
-	FILE=`ls -1 *.exe | head -n 1`
-if ! ls $PUBLISH_DIR/${FILE} 1> /dev/null 2>&1; then
-		echo "Publish new version ${FILE}"
-		rm -f $PUBLISH_DIR/${FILE} || true
-		mv $PACKET_BUILD_DIR/$PLATFORM/synfigstudio-master/build/${FILE} $PUBLISH_DIR/
-		if [ -f "$PUBLISH_DIR/publish-synfigstudio.sh" ]; then
-			"$PUBLISH_DIR/publish-synfigstudio.sh" "$PUBLISH_DIR/${FILE}"
-		fi
-	else
-		echo "Version ${FILE} already published"
-	fi
-}
-
-if [ -z "$1" ] || [ -z "$2" ]; then
-export ARCH=64
-run
-export ARCH=32
-run
-else
-export ARCH=$2
-run
-fi
diff --git a/build-synfigstudio.sh b/build-synfigstudio.sh
new file mode 100755
index 0000000..ab56097
--- /dev/null
+++ b/build-synfigstudio.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+
+BASE_DIR=$(cd `dirname "$0"`; pwd)
+DATA_DIR="$BASE_DIR/docker-builder-data"
+BUILD_DIR=$DATA_DIR/build
+PUBLISH_DIR=$BASE_DIR/publish
+CONFIG_FILE="$BASE_DIR/config.sh"
+PACKET_BUILD_DIR="$BUILD_DIR/packet"
+SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+if [ -f $CONFIG_FILE ]; then
+    source $CONFIG_FILE
+fi
+
+SCRIPT="$BASE_DIR/docker/run.sh"
+
+run_appimage() {
+    export PLATFORM="$1"
+    export ARCH="$2"
+
+    echo ""
+    echo "Update synfigstudio for $PLATFORM-$ARCH"
+    echo ""
+    $SCRIPT update synfigetl-master
+    $SCRIPT update synfigcore-master
+    $SCRIPT update synfigstudio-master
+    $SCRIPT clean_before_do install_release synfigstudio-appimage
+
+    "$PUBLISH_DIR/publish.sh" \
+        "synfigstudio" \
+        "SynfigStudio-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.appimage" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-appimage/install_release" \
+        "*.appimage" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-appimage/envdeps_release/version-synfigstudio-master"
+}
+
+run_nsis() {
+    export PLATFORM="$1"
+    export ARCH="$2"
+
+    echo ""
+    echo "Update synfigstudio for $PLATFORM-$ARCH"
+    echo ""
+    $SCRIPT update synfigetl-master
+    $SCRIPT update synfigcore-master
+    $SCRIPT update synfigstudio-master
+    $SCRIPT clean_before_do install_release synfigstudio-nsis
+
+    "$PUBLISH_DIR/publish.sh" \
+        "synfigstudio" \
+        "SynfigStudio-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.exe" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-nsis/install_release" \
+        "*.exe" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-nsis/envdeps_release/version-synfigstudio-master"
+}
+
+run_appimage linux 64
+run_appimage linux 32
+#run_nsis win 64
+#run_nsis win 32