diff --git a/misc/build-containers/podman_build_all.sh b/misc/build-containers/podman_build_all.sh
index f0e6df27c..4ce168791 100755
--- a/misc/build-containers/podman_build_all.sh
+++ b/misc/build-containers/podman_build_all.sh
@@ -17,6 +17,14 @@ mkdir -p logs
 
 rm -f modules/modules_enabled.gen.h
 
+#todo -----
+# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
+sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
+export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
+export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
+export PATH="${GODOT_SDK_LINUX_ARMHF}/bin:${BASE_PATH}"
+#--------
+
 # Windows editor (release debug) 64 bit
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-windows:${img_version} scons tools=yes target=release_debug debug_symbols=no platform=windows bits=64 "$@" . 2>&1 | tee logs/windows_ed_64.log
 rm -f modules/modules_enabled.gen.h
@@ -40,8 +48,8 @@ rm -f modules/modules_enabled.gen.h
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_ed_64.log
 rm -f modules/modules_enabled.gen.h
 # Linux editor 32 bit
-#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_ed_32.log
-#rm -f modules/modules_enabled.gen.h
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_ed_32.log
+rm -f modules/modules_enabled.gen.h
 
 # Linux templates 64 bit
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@" . 2>&1 | tee logs/linux_template_rd_64.log
@@ -50,10 +58,10 @@ $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:
 rm -f modules/modules_enabled.gen.h
 
 # Linux templates 32 bit
-#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_rd_32.log
-#rm -f modules/modules_enabled.gen.h
-#$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_r_32.log
-#rm -f modules/modules_enabled.gen.h
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_rd_32.log
+rm -f modules/modules_enabled.gen.h
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@" . 2>&1 | tee logs/linux_template_r_32.log
+rm -f modules/modules_enabled.gen.h
 
 # Linux headless (editor) 64bit
 $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@" . 2>&1 | tee logs/headless.log
@@ -66,19 +74,19 @@ $podman run -v ${project_root}:/root/project -w /root/project pandemonium-linux:
 rm -f modules/modules_enabled.gen.h
 
 # Javascript editor
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_3.1.14/emsdk_env.sh;scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_ed.log
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_ed.log
 rm -f modules/modules_enabled.gen.h
 
 # Javascript templates normal
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_3.1.14/emsdk_env.sh;scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=javascript "$@"' . 2>&1 | tee logs/javascript_rd.log
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=javascript "$@"' . 2>&1 | tee logs/javascript_rd.log
 rm -f modules/modules_enabled.gen.h
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_3.1.14/emsdk_env.sh;scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=javascript "$@"' . 2>&1 | tee logs/javascript_r.log
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=javascript "$@"' . 2>&1 | tee logs/javascript_r.log
 rm -f modules/modules_enabled.gen.h
 
 # Javascript templates threads
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_3.1.14/emsdk_env.sh;scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_rd_threads.log
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_rd_threads.log
 rm -f modules/modules_enabled.gen.h
-$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk_3.1.14/emsdk_env.sh;scons tools=no target=release custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_r_threads.log
+$podman run -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_r_threads.log
 rm -f modules/modules_enabled.gen.h
 
 # Android editor
@@ -164,11 +172,11 @@ files=(
   "pandemonium.x11.opt.64"
   "pandemonium.x11.opt.debug.64"
 
-  #"pandemonium.x11.opt.32"
-  #"pandemonium.x11.opt.debug.32"
+  "pandemonium.x11.opt.32"
+  "pandemonium.x11.opt.debug.32"
 
   "pandemonium.x11.opt.tools.64"
-  #"pandemonium.x11.opt.tools.32"
+  "pandemonium.x11.opt.tools.32"
 
   # Server (Linux) - template
   "pandemonium_server.x11.opt.64"
diff --git a/misc/osx/lipo.sh b/misc/osx/lipo.sh
index 3e1a3785d..23871204a 100755
--- a/misc/osx/lipo.sh
+++ b/misc/osx/lipo.sh
@@ -1,6 +1,12 @@
+export STRIP="x86_64-apple-darwin21.4-strip -u -r" 
+
 # Tools
 lipo -create  ../../bin/pandemonium.osx.opt.tools.x86_64 ../../bin/pandemonium.osx.opt.tools.arm64 -output ../../bin/pandemonium.osx.opt.tools.universal
+$STRIP ../../bin/pandemonium.osx.opt.tools.universal
 
 # Export Templates
 lipo -create  ../../bin/pandemonium.osx.opt.x86_64 ../../bin/pandemonium.osx.opt.arm64 -output ../../bin/pandemonium.osx.opt.universal
+$STRIP ../../bin/pandemonium.osx.opt.universal
+
 lipo -create  ../../bin/pandemonium.osx.opt.debug.x86_64 ../../bin/pandemonium.osx.opt.debug.arm64 -output ../../bin/pandemonium.osx.opt.debug.universal
+$STRIP ../../bin/pandemonium.osx.opt.debug.universal