diff --git a/.gitignore b/.gitignore
index 42c4a5cb5..29f6d0f19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,8 @@ build-*
 bin-*
 mkqtdecl.tmp
 testtmp
+*build.macos*
+*bin.macos*
 
 # private data
 private
@@ -54,3 +56,12 @@ src/klayout.pro.user
 *.egg-info/
 build/
 dist/
+
+
+# IDEs
+.vscode
+
+
+# Macos artifacts
+*.dmg
+*.dmg.md5
diff --git a/.travis.yml b/.travis.yml
index 34ac00e1e..bbe40495a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -162,37 +162,6 @@ matrix:
         directories:
         - ccache
 
-    - name: "cp34-cp34m-manylinux1_x86_64.whl"
-      os: linux
-      sudo: true
-      language: python
-      python: '3.4'
-      services:
-        - docker
-      env:
-        - DOCKER_IMAGE="quay.io/pypa/manylinux1_x86_64"
-        - PY_VERSION="cp34-cp34m"
-        - DOCKER_BUILD=true
-        - TEST_IN_HOST=true
-        - MATRIX_EVAL=""
-      cache:
-        directories:
-        - ccache
-
-    - name: "cp34-cp34m-manylinux1_i686.whl"
-      os: linux
-      sudo: true
-      services:
-        - docker
-      env:
-        - DOCKER_IMAGE="quay.io/pypa/manylinux1_i686"
-        - PY_VERSION="cp34-cp34m"
-        - DOCKER_BUILD=true
-        - MATRIX_EVAL=""
-      cache:
-        directories:
-        - ccache
-
     - name: "cp27-cp27mu-manylinux1_x86_64.whl"
       os: linux
       sudo: true
@@ -255,6 +224,229 @@ matrix:
         directories:
         - ccache
 
+    # python 3 osx
+    
+    # MacOS 10.15
+
+    # MacOS 10.15, Python 3.9
+    - name: "cp39-cp39m-macosx_10_15_x86_64.whl"
+      os: osx
+      osx_image: xcode12  # macOS 10.15
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.9
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.9/bin/python3'; alias pip='/usr/local/opt/python@3.9/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.15, Python 3.8
+    - name: "cp38-cp38m-macosx_10_15_x86_64.whl"
+      os: osx
+      osx_image: xcode12  # macOS 10.15
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.8
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.8/bin/python3'; alias pip='/usr/local/opt/python@3.8/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.15, Python 3.7
+    - name: "cp37-cp37m-macosx_10_15_x86_64.whl"
+      os: osx
+      osx_image: xcode12  # macOS 10.15
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.7
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.7/bin/python3'; alias pip='/usr/local/opt/python@3.7/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.14
+
+    # MacOS 10.14, Python 3.9
+    - name: "cp39-cp39m-macosx_10_14_x86_64.whl"
+      os: osx
+      osx_image: xcode11  # macOS 10.14
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.9
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.9/bin/python3'; alias pip='/usr/local/opt/python@3.9/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.14, Python 3.8
+    - name: "cp38-cp38m-macosx_10_14_x86_64.whl"
+      os: osx
+      osx_image: xcode11  # macOS 10.14
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.8
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.8/bin/python3'; alias pip='/usr/local/opt/python@3.8/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.14, Python 3.7
+    - name: "cp37-cp37m-macosx_10_14_x86_64.whl"
+      os: osx
+      osx_image: xcode11  # macOS 10.14
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.7
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.7/bin/python3'; alias pip='/usr/local/opt/python@3.7/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.13
+
+    # MacOS 10.13, Python 3.9
+    - name: "cp39-cp39m-macosx_10_13_x86_64.whl"
+      os: osx
+      osx_image: xcode10.1  # macOS 10.13
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.9
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.9/bin/python3'; alias pip='/usr/local/opt/python@3.9/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.13, Python 3.8
+    - name: "cp38-cp38m-macosx_10_13_x86_64.whl"
+      os: osx
+      osx_image: xcode10.1  # macOS 10.13
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.8
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.8/bin/python3'; alias pip='/usr/local/opt/python@3.8/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.13, Python 3.7
+    - name: "cp37-cp37m-macosx_10_13_x86_64.whl"
+      os: osx
+      osx_image: xcode10.1  # macOS 10.13
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python@3.7
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='/usr/local/opt/python@3.7/bin/python3'; alias pip='/usr/local/opt/python@3.7/bin/pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # MacOS 10.12, Python 3.7
+
+    # - name: "klayout python3 osx10.12"
+    - name: "cp37-cp37m-macosx_10_12_x86_64.whl"
+      os: osx
+      osx_image: xcode9.2  # macOS 10.12
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - python3
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+    
+  exclude:
+
+    # No XCode 8.2.1 for Mac OS 10.11
+
+    # - name: "klayout python3 osx10.11"
+    - name: "cp37-cp37m-macosx_10_11_x86_64.whl"
+      os: osx
+      osx_image: xcode8  # macOS 10.11
+      cache:
+        directories:
+        - ccache
+      addons:
+        homebrew:
+          packages:
+            - ccache
+          update: true
+      env:
+        - MATRIX_EVAL="brew update; brew config; brew upgrade python; brew postinstall python; ls -l /usr/local/opt/python/libexec/bin/; shopt -s expand_aliases; alias python='/usr/local/opt/python/libexec/bin/python'; alias pip='/usr/local/opt/python/libexec/bin/pip';"
+        - ARCHFLAGS="-std=c++11"
+        - PIP_UPDATE="1"
+        - PYTHON_BUILD=true
+
+    # Python 2 is EOL
 
     # python 2 osx
     
@@ -312,99 +504,7 @@ matrix:
         - PIP_UPDATE="1"
         - PYTHON_BUILD=true
 
-    # python 3 osx
-    
-    # - name: "klayout python3 osx10.13"
-    - name: "cp37-cp37m-macosx_10_13_x86_64.whl"
-      os: osx
-      osx_image: xcode9.4  # macOS 10.13
-      cache:
-        directories:
-        - ccache
-      addons:
-        homebrew:
-          packages:
-            - python3
-            - ccache
-          update: true
-      env:
-        - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';"
-        - ARCHFLAGS="-std=c++11"
-        - PIP_UPDATE="1"
-        - PYTHON_BUILD=true
-
-    # - name: "klayout python3.6.6 osx10.13"
-    - name: "cp36-cp36m-macosx_10_13_x86_64.whl"
-      os: osx
-      osx_image: xcode9.4  # macOS 10.13
-      cache:
-        directories:
-        - ccache
-      addons:
-        homebrew:
-          packages:
-            - ccache
-          update: true
-      env:
-        - MATRIX_EVAL="brew update; brew tap sashkab/python; brew install sashkab/python/python36; brew link --force --overwrite python36; shopt -s expand_aliases; alias python='/usr/local/opt/python36/bin/python3.6'; alias pip='/usr/local/opt/python36/bin/pip3.6';"
-        - ARCHFLAGS="-std=c++11"
-        - PIP_UPDATE="1"
-        - PYTHON_BUILD=true
-
-    # - name: "klayout python3.5.6 osx10.13"
-    - name: "cp35-cp35m-macosx_10_13_x86_64.whl"
-      os: osx
-      osx_image: xcode9.4  # macOS 10.13
-      cache:
-        directories:
-        - ccache
-      addons:
-        homebrew:
-          packages:
-            - ccache
-          update: true
-      env:
-        - MATRIX_EVAL="brew update; brew tap sashkab/python; brew install sashkab/python/python35; brew link --force --overwrite python35; shopt -s expand_aliases; alias python='/usr/local/opt/python35/bin/python3.5'; alias pip='/usr/local/opt/python35/bin/pip3.5';"
-        - ARCHFLAGS="-std=c++11"
-        - PIP_UPDATE="1"
-        - PYTHON_BUILD=true
-    
-    # - name: "klayout python3 osx10.12"
-    - name: "cp37-cp37m-macosx_10_12_x86_64.whl"
-      os: osx
-      osx_image: xcode8.3  # macOS 10.12
-      cache:
-        directories:
-        - ccache
-      addons:
-        homebrew:
-          packages:
-            - python3
-            - ccache
-          update: true
-      env:
-        - MATRIX_EVAL="shopt -s expand_aliases; alias python='python3'; alias pip='pip3';"
-        - ARCHFLAGS="-std=c++11"
-        - PIP_UPDATE="1"
-        - PYTHON_BUILD=true
-    
-    # - name: "klayout python3 osx10.11"
-    - name: "cp37-cp37m-macosx_10_11_x86_64.whl"
-      os: osx
-      osx_image: xcode8  # macOS 10.11
-      cache:
-        directories:
-        - ccache
-      addons:
-        homebrew:
-          packages:
-            - ccache
-          update: true
-      env:
-        - MATRIX_EVAL="brew update; brew config; brew upgrade python; brew postinstall python; ls -l /usr/local/opt/python/libexec/bin/; shopt -s expand_aliases; alias python='/usr/local/opt/python/libexec/bin/python'; alias pip='/usr/local/opt/python/libexec/bin/pip';"
-        - ARCHFLAGS="-std=c++11"
-        - PIP_UPDATE="1"
-        - PYTHON_BUILD=true
+    # KLayout builds not enabled for now on MacOS
 
     # KLayout builds for mac
     # Python 3
diff --git a/MANIFEST.in b/MANIFEST.in
index 8088e14c0..4116c5b22 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,3 +9,4 @@ include src/plugins/*/*/db_plugin/*.cc
 include src/plugins/*/db_plugin/*.h
 include src/plugins/*/*/db_plugin/*.h
 recursive-include src/plugins/common *.h
+include version.sh
diff --git a/Makefile b/Makefile
index a8e1d727b..b96f80895 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@
 GITCOMMIT := $(shell git rev-parse --short HEAD)
 KLAYOUT_VERSION := $(shell source version.sh && echo $$KLAYOUT_VERSION)
 ifndef PYTHON_VERSION
-    PYTHON_VERSION := B37
+    PYTHON_VERSION := HB38
 endif
 ifndef MACOS_VERSION
-	MACOS_VERSION := HighSierra
+	MACOS_VERSION := Catalina
 endif
 
 .ONESHELL:
@@ -15,11 +15,11 @@ default: help
 
 help:
 	@echo "For Mac OS only"
-	@echo "make build PYTHON_VERSION=B37"
-	@echo "make deploy PYTHON_VERSION=B37"
+	@echo "make build PYTHON_VERSION=HB38"
+	@echo "make deploy PYTHON_VERSION=HB38"
 	@echo "make test MACOS_VERSION=HighSierra"
-	@echo "Valid Mac OS Versions: [Yosemite, ElCapitan, Sierra, HighSierra]"
-	@echo "Valid Python Version: [nil, Sys, B37]"
+	@echo "Valid Mac OS Versions: [Yosemite, ElCapitan, Sierra, HighSierra, Mojave, Catalina]"
+	@echo "Valid Python Version: [nil, Sys, HB38]"
 
 build:
 	@echo "Building for Mac $(GITCOMMIT)"
@@ -29,11 +29,11 @@ build:
 deploy:
 	@echo "Deploying 4 Mac $(GITCOMMIT)"
 	./build4mac.py -p $(PYTHON_VERSION) -q Qt5Brew -y
-	
+
 test:
 	@echo "Testing 4 Mac $(GITCOMMIT)"
-	qt5.pkg.macos-$(MACOS_VERSION)-release/klayout.app/Contents/MacOS/klayout -b -r test-pylib-script.py; \
-	cd qt5.build.macos-$(MACOS_VERSION)-release; \
+	PIP_REQUIRE_VIRTUALENV="false" HW-qt5Brew.pkg.macos-$(MACOS_VERSION)-release-RsysPhb38/klayout.app/Contents/MacOS/klayout -b -r test-pylib-script.py; \
+	cd qt5Brew.build.macos-$(MACOS_VERSION)-release-RsysPhb38; \
 	ln -s klayout.app/Contents/MacOS/klayout klayout; \
 	export TESTTMP=testtmp; \
 	export TESTSRC=..; \
@@ -41,18 +41,24 @@ test:
 	./ut_runner -h || true; \
 	cd ..
 
+dmg-template:
+	mkdir -p testtemplate/klayout.app
+	./makeDMG4mac.py -p testtemplate -m -z -t klayoutDMGTemplate.dmg
+	cp -a klayoutDMGTemplate.dmg* macbuild/Resources/
+	rm -Rf testtemplate
+
 dropbox-deploy:
 	@echo "Preparing for dropbox deployment $(MACOS_VERSION) $(GITCOMMIT)"
-	mkdir -p deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION); \
-	pwd; \
-	ls -lah; \
-	touch build.txt; \
-	cp build.txt deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).log.txt; \
-	hdiutil convert macbuild/Resources/klayoutDMGTemplate.dmg -format UDRW -o work-KLayout.dmg; \
-	hdiutil resize -size 500m work-KLayout.dmg; \
-	hdiutil attach work-KLayout.dmg -readwrite -noverify -quiet -mountpoint tempKLayout -noautoopen; \
-	cp -a qt5.pkg.macos-$(MACOS_VERSION)-release/ tempKLayout/; \
-	hdiutil detach tempKLayout; \
-	hdiutil convert work-KLayout.dmg -format UDZO -imagekey zlib-level=9 -o deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg; \
-	md5 -q deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg > deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg.md5; \
+	mkdir -p deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)
+	pwd
+	ls -lah
+	touch build.txt
+	cp build.txt deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).log.txt
+	hdiutil convert macbuild/Resources/klayoutDMGTemplate.dmg -ov -format UDRW -o work-KLayout.dmg
+	hdiutil resize -size 500m work-KLayout.dmg
+	hdiutil attach -readwrite -noverify -quiet -mountpoint tempKLayout -noautoopen work-KLayout.dmg
+	cp -a HW-qt5Brew.pkg.macos-$(MACOS_VERSION)-release-RsysPhb38/ tempKLayout/
+	hdiutil detach tempKLayout
+	hdiutil convert work-KLayout.dmg -ov -format UDZO -imagekey zlib-level=9 -o deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg
+	md5 -q deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg > deploy/$(MACOS_VERSION)/$(PYTHON_VERSION)/$(KLAYOUT_VERSION)/qt5.pkg.macos-$(MACOS_VERSION)-$(PYTHON_VERSION)-release-$(KLAYOUT_VERSION)-$(GITCOMMIT).dmg.md5
 	rm work-KLayout.dmg
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 55921a370..33e89610e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,6 +28,9 @@ jobs:
       cp38-cp38-win_amd64.whl:
         python.version: '3.8'
         python.architecture: 'x64'
+      cp39-cp39-win_amd64.whl:
+        python.version: '3.9'
+        python.architecture: 'x64'
       cp35-cp35m-win32.whl:
         python.version: '3.5'
         python.architecture: 'x86'
@@ -40,6 +43,9 @@ jobs:
       cp38-cp38-win32.whl:
         python.version: '3.8'
         python.architecture: 'x86'
+      cp39-cp39-win32.whl:
+        python.version: '3.9'
+        python.architecture: 'x86'
     maxParallel: 6
 
   steps:
@@ -123,6 +129,11 @@ jobs:
     vmImage: 'vs2017-win2016' # other options: 'macOS-10.13', 'ubuntu-16.04'
   steps:
     - checkout: none #skip checking out the default repository resource
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.9.x64'
+      inputs:
+        artifactName: 'wheel-3.9.x64'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
     - task: DownloadBuildArtifacts@0
       displayName: 'Download Build Artifacts wheel-3.8.x64'
       inputs:
@@ -143,6 +154,11 @@ jobs:
       inputs:
         artifactName: 'wheel-3.5.x64'
         downloadPath: '$(System.DefaultWorkingDirectory)'
+    - task: DownloadBuildArtifacts@0
+      displayName: 'Download Build Artifacts wheel-3.9.x86'
+      inputs:
+        artifactName: 'wheel-3.9.x86'
+        downloadPath: '$(System.DefaultWorkingDirectory)'
     - task: DownloadBuildArtifacts@0
       displayName: 'Download Build Artifacts wheel-3.8.x86'
       inputs:
diff --git a/build.sh b/build.sh
index 6c6150e8f..676d8aa99 100755
--- a/build.sh
+++ b/build.sh
@@ -532,6 +532,11 @@ if [ "$BIN" = "" ]; then
   BIN=$CURR_DIR/bin-$CONFIG
 fi
 
+if [ "$QMAKE_CCACHE" = 1 ]; then
+  echo "    Compilation caching is activated."
+else
+  echo "    Compilation caching is deactivated!"
+fi
 echo "    Installation target: $BIN"
 echo "    Build directory: $BUILD"
 
diff --git a/etc/klayout.desktop b/etc/klayout.desktop
index a84e2abcf..2be01f169 100644
--- a/etc/klayout.desktop
+++ b/etc/klayout.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=Klayout, viewer and editor of mask layouts.
 GenericName=layout viewer
 Comment=Klayout is a viewer (and editor) of mask layout in a.o. GDSII and CIF format.
-Exec=klayout
+Exec=klayout %f
 Icon=klayout
 Type=Application
 Categories=Development;Engineering;Electronics;
diff --git a/macbuild/.gitignore b/macbuild/.gitignore
index 0d20b6487..4081080e3 100644
--- a/macbuild/.gitignore
+++ b/macbuild/.gitignore
@@ -1 +1,2 @@
 *.pyc
+KLayoutDMG.applescript
diff --git a/macbuild/ReadMe.md b/macbuild/ReadMe.md
index 09344755b..c23589f7b 100644
--- a/macbuild/ReadMe.md
+++ b/macbuild/ReadMe.md
@@ -1,27 +1,28 @@
-Relevant KLayout version: 0.26.7
+Relevant KLayout version: 0.26.9
 
 # 1. Introduction
-This directory **`macbuild`** contains different files required for building KLayout (http://www.klayout.de/) version 0.26.1 or later for different 64-bit Mac OSXs including:
+This directory **`macbuild`** contains different files required for building KLayout (http://www.klayout.de/) version 0.26.1 or later for different 64-bit Mac OSXs, including:
 * El Capitan  (10.11)
 * Sierra      (10.12)
 * High Sierra (10.13)
 * Mojave      (10.14)
-* Catalina    (10.15)
+* Catalina    (10.15) : the primary development environment
+* Big Sur     (11.0)  : under development for the future support
 
 # 2. Qt5 Frameworks
-By default, Qt frameworks are "Qt5" from MacPorts (https://www.macports.org/) which is usually located under:
+By default, the Qt framework is "Qt5" from MacPorts (https://www.macports.org/), which is usually located under:
 ```
 /opt/local/libexec/qt5/
 ```
 
-Alternatively, you can use "Qt5" from Homebrew (https://brew.sh/) which is usually located under:
+Alternatively, you can use "Qt5" from Homebrew (https://brew.sh/), which is usually located under:
 ```
 /usr/local/opt/qt/
 ```
 
    OR
 
-"Qt5" from Anaconda3 (https://www.anaconda.com/) which is usually located under:
+"Qt5" from Anaconda3 (https://www.anaconda.com/), which is usually located under:
 ```
 $HOME/opt/anaconda3/pkgs/qt-{version}
 ```
@@ -41,9 +42,9 @@ $ /usr/bin/ruby -v
 $ /usr/bin/python --version
   Python 2.7.16
 ```
-Even in the latest OS as of today (December 2019), Python 3.x is not bundled with the OS, and this is the main reason why users want non-OS-standard script language support.
+Even in the latest OS (11.0 Big Sur) as of today (November 2020), Python 3.x is not bundled with the OS, which is why users want non-OS-standard script language support.
 
-To meet such a requirement, the build script **`build4mac.py`** provides several possible combinations of Qt5, Ruy and Python module.<br>
+To meet such a requirement, the build script **`build4mac.py`** provides several possible combinations of Qt5, Ruy, and Python module.<br>
 Some typical use cases are described in Section 6.
 
 # 4. Prerequisites
@@ -66,22 +67,24 @@ $ [python] ./build4mac.py
                         :   Qt5MacPorts: use Qt5 from MacPorts                           |
                         :       Qt5Brew: use Qt5 from Homebrew                           |
                         :       Qt5Ana3: use Qt5 from Anaconda3                          |
-   [-r|--ruby <type>]   : case-insensitive type=['nil', 'Sys', 'MP26', 'HB27', 'Ana3']   | sys
+   [-r|--ruby <type>]   : case-insensitive type=['nil', 'Sys', 'MP27', 'HB27', 'Ana3']   | sys
                         :    nil: don't bind Ruby                                        |
                         :    Sys: use OS-bundled Ruby [2.0 - 2.6] depending on OS        |
-                        :   MP26: use Ruby 2.6 from MacPorts                             |
+                        :   MP27: use Ruby 2.7 from MacPorts                             |
                         :   HB27: use Ruby 2.7 from Homebrew                             |
                         :   Ana3: use Ruby 2.5 from Anaconda3                            |
-   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']   | sys
+   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3',   | sys
+                        :                        'HBAuto']                               |
                         :    nil: don't bind Python                                      |
-                        :    Sys: use OS-bundled Python 2.7 [ElCapitan -- Catalina]      |
+                        :    Sys: use OS-bundled Python 2.7 [ElCapitan -- BigSur]        |
                         :   MP38: use Python 3.8 from MacPorts                           |
                         :   HB38: use Python 3.8 from Homebrew                           |
-                        :   Ana3: use Python 3.8 from Anaconda3                          |
+                        :   Ana3: use Python 3.7 from Anaconda3                          |
+                        : HBAuto: use the latest Python 3.x auto-detected from Homebrew  |
    [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled
    [-m|--make <option>] : option passed to 'make'                                        | '-j4'
    [-d|--debug]         : enable debug mode build                                        | disabled
-   [-c|--checkcom]      : check command line and exit without building                   | disabled
+   [-c|--checkcom]      : check command-line and exit without building                   | disabled
    [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled
    [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled
                         : from the source code and use the tools in the same machine     |
@@ -98,7 +101,7 @@ $ [python] ./build4mac.py
 ```
 
 # 6. Use-cases
-In this section, the actual file- and directory names are those obtained on macOS Catalina.<br>
+In this section, the actual file names and directory names are those obtained on macOS Catalina.<br>
 On different OS, those names differ accordingly.
 
 ### 6A. Standard build using the OS-bundled Ruby and Python
@@ -108,40 +111,40 @@ $ cd /where/'build.sh'/exists
 $ ./build4mac.py
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
-3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-y" to deploy executables and libraries (including Qt's frameworks) under **`klayout.app`** bundle.<br>
+3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-y" to deploy executables and libraries (including Qt's framework) under **`klayout.app`** bundle.<br>
    The buddy command-line tools (strm*) will also be deployed in this step.
 ```
 $ ./build4mac.py -y
 ```
   The application bundle **`klayout.app`** is located under:<br>
-  **`ST-qt5MP.pkg.macos-Catalina-release-RsysPsys`** directory, where the three parts below are important.
+  **`ST-qt5MP.pkg.macos-Catalina-release-RsysPsys`** directory, where the three name parts below are important.
 * "ST-"      means that this is a standard package (LW-, HW-, and EX- are other possibilities explained below).
 * "qt5MP"    means that Qt5 from MacPorts is used.
 * "RsysPsys" means that Ruby is OS-bundled; Python is OS-bundled.
 4. Copy/move the generated application bundle **`klayout.app`** to your **`/Applications`** directory for installation.
 
-If you use "-Y" option instead of "-y" in Step-3, Qt5 frameworks is NOT deployed in the application bundle.<br>
+If you use the "-Y" option instead of the "-y" in Step-3, the Qt5 framework is NOT deployed in the application bundle.<br>
 Then the directory name will be **`LW-qt5MP.pkg.macos-Catalina-release-RsysPsys`**, where
 * "LW-" means that this is a lightweight package.
 
-#### If you build KLayout from the source code AND use it on the same machine, "-Y" option is highly recommended. ####
+#### If you build KLayout from the source code AND run it on the same machine, the "-Y" option is highly recommended. ####
 
-### 6B. Fully MacPorts-flavored build with MacPorts Ruby 2.6 and MacPorts Python 3.8
+### 6B. Fully MacPorts-flavored build with MacPorts Ruby 2.7 and MacPorts Python 3.8
 ```
 $ cd /where/'build.sh'/exists
-$ ./build4mac.py -q qt5macports -r mp26 -p mp38
+$ ./build4mac.py -q qt5macports -r mp27 -p mp38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
 3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-Y" to deploy executables and libraries under **`klayout.app`** bundle.<br>
    The buddy command-line tools (strm*) will also be deployed in this step.
 ```
-$ ./build4mac.py -q qt5macports -r mp26 -p mp38 -Y
+$ ./build4mac.py -q qt5macports -r mp27 -p mp38 -Y
 ```
   The application bundle **`klayout.app`** is located under:<br>
-  **`LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp38`** directory, where
+  **`LW-qt5MP.pkg.macos-Catalina-release-Rmp27Pmp38`** directory, where
 * "LW-"        means that this is a lightweight package.
 * "qt5MP"      means that Qt5 from MacPorts is used.
-* "Rmp26Pmp38" means that Ruby is 2.6 from MacPorts; Python is 3.8 from MacPorts.
+* "Rmp27Pmp38" means that Ruby is 2.7 from MacPorts; Python is 3.8 from MacPorts.
 4. Copy/move the generated application bundle **`klayout.app`** to your **`/Applications`** directory for installation.
 
 ### 6C. Fully Homebrew-flavored build with Homebrew Ruby 2.7 and Homebrew Python 3.8
@@ -168,7 +171,7 @@ $ cd /where/'build.sh'/exists
 $ ./build4mac.py -q qt5brew -r sys -p hb38
 ```
 2. Confirm successful build (it will take about one hour depending on your machine spec).
-3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-y" to deploy executables and libraries (including Qt's frameworks and Python frameworks) under **`klayout.app`** bundle.<br>
+3. Run **`build4mac.py`** again with the same options used in 1. PLUS "-y" to deploy executables and libraries (including Qt's framework and Python framework) under **`klayout.app`** bundle.<br>
    The buddy command-line tools (strm*) will also be deployed in this step.
 ```
 $ ./build4mac.py -q qt5brew -r sys -p hb38 -y
@@ -180,8 +183,8 @@ $ ./build4mac.py -q qt5brew -r sys -p hb38 -y
 * "RsysPhb38"  means that Ruby is OS-bundled; Python is 3.8 from Homebrew.
 4. Copy/move the generated application bundle **`klayout.app`** to your **`/Applications`** directory for installation.
 ### Important ###
-So far, deployment of Homebrew Ruby is not supported. <br>
-Therefore, if you intend to use "-y" option, you need to use "-r sys" for building.
+So far, the deployment of Homebrew Ruby is not supported. <br>
+Therefore, if you intend to use the "-y" option for deployment, you need to use the "-r sys" option for building.
 
 ### 6E. Fully Anaconda3-flavored build with Anaconda3 Ruby 2.5 and Anaconda3 Python 3.8
 ```
@@ -225,8 +228,8 @@ $ cd /where/'build.sh'/exists
 $ ./makeDMG4mac.py -p ST-qt5MP.pkg.macos-Catalina-release-RsysPsys -m
 ```
 This command will generate the two files below:<br>
-* **`ST-klayout-0.26.5-macOS-Catalina-1-qt5MP-RsysPsys.dmg`**      ---(1) the main DMG file
-* **`ST-klayout-0.26.5-macOS-Catalina-1-qt5MP-RsysPsys.dmg.md5`**  ---(2) MD5-value text file
+* **`ST-klayout-0.26.9-macOS-Catalina-1-qt5MP-RsysPsys.dmg`**      ---(1) the main DMG file
+* **`ST-klayout-0.26.9-macOS-Catalina-1-qt5MP-RsysPsys.dmg.md5`**  ---(2) MD5-value text file
 
 # Known issues
 Because we assume some specific versions of non-OS-standard Ruby and Python, updating MacPorts, Homebrew, or Anaconda3 may cause build- and link errors.<br>
@@ -234,7 +237,7 @@ In such cases, you need to update the dictionary contents of **`build4mac_env.py
 
 # Final comments
 No need to say, KLayout is a great tool! <br>
-With the object-oriented script language (both Ruby and Python) support, our error-prone jobs can be simplified and speed-up.<br>
+With the object-oriented script language (both Ruby and Python) support, our error-prone jobs can be greatly simplified and speed-up.<br>
 Building KLayout from its source code is not difficult. Try it with your favorite environment!
 
 [End of File]
diff --git a/macbuild/Resources/KLayoutDMG-Back.logoist b/macbuild/Resources/KLayoutDMG-Back.logoist
index 336c51a9e..c85a5342e 100644
Binary files a/macbuild/Resources/KLayoutDMG-Back.logoist and b/macbuild/Resources/KLayoutDMG-Back.logoist differ
diff --git a/macbuild/Resources/KLayoutDMG-Back.png b/macbuild/Resources/KLayoutDMG-Back.png
index 88e0a1108..b2433a0fc 100644
Binary files a/macbuild/Resources/KLayoutDMG-Back.png and b/macbuild/Resources/KLayoutDMG-Back.png differ
diff --git a/macbuild/Resources/klayoutDMGTemplate.dmg b/macbuild/Resources/klayoutDMGTemplate.dmg
index 8ad28f4ad..65ca57755 100644
Binary files a/macbuild/Resources/klayoutDMGTemplate.dmg and b/macbuild/Resources/klayoutDMGTemplate.dmg differ
diff --git a/macbuild/Resources/script-bundle-P.zip b/macbuild/Resources/script-bundle-P.zip
index afdc90968..22987f14b 100644
Binary files a/macbuild/Resources/script-bundle-P.zip and b/macbuild/Resources/script-bundle-P.zip differ
diff --git a/macbuild/Resources/template-KLayoutDMG.applescript b/macbuild/Resources/template-KLayoutDMG.applescript
index 78d5b00d7..c27b6c10c 100644
--- a/macbuild/Resources/template-KLayoutDMG.applescript
+++ b/macbuild/Resources/template-KLayoutDMG.applescript
@@ -26,6 +26,12 @@
 -------------------------------------------------------------------------------------------------
 on run (volumeName) -- most likely, the volume name is "KLayout"
     tell application "Finder"
+        repeat 20 times
+            if (exists (disk (volumeName as string))) then
+                exit repeat
+            end if
+            delay 1
+        end repeat
         tell disk (volumeName as string)
             -- [1] Open the volume
             open
diff --git a/macbuild/build4mac.py b/macbuild/build4mac.py
index d9a99e74c..5e3e884be 100755
--- a/macbuild/build4mac.py
+++ b/macbuild/build4mac.py
@@ -15,6 +15,7 @@ import glob
 import platform
 import optparse
 import subprocess
+import pprint
 
 #-------------------------------------------------------------------------------
 ## To import global dictionaries of different modules and utility functions
@@ -25,552 +26,653 @@ from build4mac_env  import *
 from build4mac_util import *
 
 #-------------------------------------------------------------------------------
-## To set global variables including present directory and platform info.
+## To get the default configurations
+#
+# @return a dictionary containing the default configuration for the macOS build
 #-------------------------------------------------------------------------------
-def SetGlobals():
-  global ProjectDir         # project directory where "build.sh" exists
-  global Usage              # string on usage
-  global BuildBash          # the main build Bash script
-  global Platform           # platform
-  global ModuleQt           # Qt module to be used
-  global ModuleRuby         # Ruby module to be used
-  global ModulePython       # Python module to be used
-  global NonOSStdLang       # True if non-OS-standard language is chosen
-  global NoQtBindings       # True if not creating Qt bindings for Ruby scripts
-  global MakeOptions        # options passed to `make`
-  global DebugMode          # True if debug mode build
-  global CheckComOnly       # True if only for checking the command line parameters to "build.sh"
-  global DeploymentF        # True if fully (including Qt's Frameworks) deploy the binaries for bundles
-  global DeploymentP        # True if partially deploy the binaries excluding Qt's Frameworks
-  global PackagePrefix      # the package prefix: 'ST-', 'LW-', 'HW-', or 'EX-'
-  global DeployVerbose      # -verbose=<0-3> level passed to 'macdeployqt' tool
-  global Version            # KLayout's version
-  global ModuleSet          # (Qt, Ruby, Python)-tuple
-  # auxiliary variables on platform
-  global System             # 6-tuple from platform.uname()
-  global Node               # - do -
-  global Release            # - do -
-  global Version            # - do -
-  global Machine            # - do -
-  global Processor          # - do -
-  global Bit                # machine bit-size
+def Get_Default_Config():
+    Usage  = "\n"
+    Usage += "---------------------------------------------------------------------------------------------------------\n"
+    Usage += "<< Usage of 'build4mac.py' >>\n"
+    Usage += "       for building KLayout 0.26.1 or later on different Apple Mac OSX platforms.\n"
+    Usage += "\n"
+    Usage += "$ [python] ./build4mac.py \n"
+    Usage += "   option & argument    : descriptions (refer to 'macbuild/build4mac_env.py' for details)| default value\n"
+    Usage += "   --------------------------------------------------------------------------------------+---------------\n"
+    Usage += "   [-q|--qt <type>]     : case-insensitive type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']    | qt5macports \n"
+    Usage += "                        :   Qt5MacPorts: use Qt5 from MacPorts                           | \n"
+    Usage += "                        :       Qt5Brew: use Qt5 from Homebrew                           | \n"
+    Usage += "                        :       Qt5Ana3: use Qt5 from Anaconda3                          | \n"
+    Usage += "   [-r|--ruby <type>]   : case-insensitive type=['nil', 'Sys', 'MP27', 'HB27', 'Ana3']   | sys \n"
+    Usage += "                        :    nil: don't bind Ruby                                        | \n"
+    Usage += "                        :    Sys: use OS-bundled Ruby [2.0 - 2.7] depending on OS        | \n"
+    Usage += "                        :   MP27: use Ruby 2.7 from MacPorts                             | \n"
+    Usage += "                        :   HB27: use Ruby 2.7 from Homebrew                             | \n"
+    Usage += "                        :   Ana3: use Ruby 2.5 from Anaconda3                            | \n"
+    Usage += "   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3',   | sys \n"
+    Usage += "                        :                        'HBAuto']                               | \n"
+    Usage += "                        :    nil: don't bind Python                                      | \n"
+    Usage += "                        :    Sys: use OS-bundled Python 2.7 [ElCapitan -- BigSur]        | \n"
+    Usage += "                        :   MP38: use Python 3.8 from MacPorts                           | \n"
+    Usage += "                        :   HB38: use Python 3.8 from Homebrew                           | \n"
+    Usage += "                        :   Ana3: use Python 3.7 from Anaconda3                          | \n"
+    Usage += "                        : HBAuto: use the latest Python 3.x auto-detected from Homebrew  | \n"
+    Usage += "   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled \n"
+    Usage += "   [-m|--make <option>] : option passed to 'make'                                        | '-j4' \n"
+    Usage += "   [-d|--debug]         : enable debug mode build                                        | disabled \n"
+    Usage += "   [-c|--checkcom]      : check command-line and exit without building                   | disabled \n"
+    Usage += "   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled \n"
+    Usage += "   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled \n"
+    Usage += "                        : from the source code and use the tools in the same machine     | \n"
+    Usage += "                        : ! After confirmation of successful build of 'klayout.app',     | \n"
+    Usage += "                        :   rerun this script with BOTH:                                 | \n"
+    Usage += "                        :     1) the same options used for building AND                  | \n"
+    Usage += "                        :     2) <-y|--deploy> OR <-Y|--DEPLOY>                          | \n"
+    Usage += "                        :   optionally with [-v|--verbose <0-3>]                         | \n"
+    Usage += "   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1 \n"
+    Usage += "                        : 0 = no output, 1 = error/warning (default),                    | \n"
+    Usage += "                        : 2 = normal,    3 = debug                                       | \n"
+    Usage += "   [-?|--?]             : print this usage and exit                                      | disabled \n"
+    Usage += "-----------------------------------------------------------------------------------------+---------------\n"
 
-  Usage  = "\n"
-  Usage += "---------------------------------------------------------------------------------------------------------\n"
-  Usage += "<< Usage of 'build4mac.py' >>\n"
-  Usage += "       for building KLayout 0.26.1 or later on different Apple Mac OSX platforms.\n"
-  Usage += "\n"
-  Usage += "$ [python] ./build4mac.py \n"
-  Usage += "   option & argument    : descriptions (refer to 'macbuild/build4mac_env.py' for details)| default value\n"
-  Usage += "   --------------------------------------------------------------------------------------+---------------\n"
-  Usage += "   [-q|--qt <type>]     : case-insensitive type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']    | qt5macports \n"
-  Usage += "                        :   Qt5MacPorts: use Qt5 from MacPorts                           | \n"
-  Usage += "                        :       Qt5Brew: use Qt5 from Homebrew                           | \n"
-  Usage += "                        :       Qt5Ana3: use Qt5 from Anaconda3                          | \n"
-  Usage += "   [-r|--ruby <type>]   : case-insensitive type=['nil', 'Sys', 'MP26', 'HB27', 'Ana3']   | sys \n"
-  Usage += "                        :    nil: don't bind Ruby                                        | \n"
-  Usage += "                        :    Sys: use OS-bundled Ruby [2.0 - 2.6] depending on OS        | \n"
-  Usage += "                        :   MP26: use Ruby 2.6 from MacPorts                             | \n"
-  Usage += "                        :   HB27: use Ruby 2.7 from Homebrew                             | \n"
-  Usage += "                        :   Ana3: use Ruby 2.5 from Anaconda3                            | \n"
-  Usage += "   [-p|--python <type>] : case-insensitive type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']   | sys \n"
-  Usage += "                        :    nil: don't bind Python                                      | \n"
-  Usage += "                        :    Sys: use OS-bundled Python 2.7 [ElCapitan -- Catalina]      | \n"
-  Usage += "                        :   MP38: use Python 3.8 from MacPorts                           | \n"
-  Usage += "                        :   HB38: use Python 3.8 from Homebrew                           | \n"
-  Usage += "                        :   Ana3: use Python 3.7 from Anaconda3                          | \n"
-  Usage += "   [-n|--noqtbinding]   : don't create Qt bindings for ruby scripts                      | disabled \n"
-  Usage += "   [-m|--make <option>] : option passed to 'make'                                        | '-j4' \n"
-  Usage += "   [-d|--debug]         : enable debug mode build                                        | disabled \n"
-  Usage += "   [-c|--checkcom]      : check command line and exit without building                   | disabled \n"
-  Usage += "   [-y|--deploy]        : deploy executables and dylibs including Qt's Frameworks        | disabled \n"
-  Usage += "   [-Y|--DEPLOY]        : deploy executables and dylibs for those who built KLayout      | disabled \n"
-  Usage += "                        : from the source code and use the tools in the same machine     | \n"
-  Usage += "                        : ! After confirmation of successful build of 'klayout.app',     | \n"
-  Usage += "                        :   rerun this script with BOTH:                                 | \n"
-  Usage += "                        :     1) the same options used for building AND                  | \n"
-  Usage += "                        :     2) <-y|--deploy> OR <-Y|--DEPLOY>                          | \n"
-  Usage += "                        :   optionally with [-v|--verbose <0-3>]                         | \n"
-  Usage += "   [-v|--verbose <0-3>] : verbose level of `macdeployqt' (effective with -y only)        | 1 \n"
-  Usage += "                        : 0 = no output, 1 = error/warning (default),                    | \n"
-  Usage += "                        : 2 = normal,    3 = debug                                       | \n"
-  Usage += "   [-?|--?]             : print this usage and exit                                      | disabled \n"
-  Usage += "-----------------------------------------------------------------------------------------+---------------\n"
+    ProjectDir = os.getcwd()
+    BuildBash  = "./build.sh"
+    (System, Node, Release, MacVersion, Machine, Processor) = platform.uname()
 
-  ProjectDir = os.getcwd()
-  BuildBash  = "./build.sh"
-  (System, Node, Release, Version, Machine, Processor) = platform.uname()
+    if not System == "Darwin":
+        print("")
+        print( "!!! Sorry. Your system <%s> looks like non-Mac" % System, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  if not System == "Darwin":
-    print("")
-    print( "!!! Sorry. Your system <%s> looks like non-Mac" % System, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    release = int( Release.split(".")[0] ) # take the first of ['19', '0', '0']
+    if   release == 20:
+        Platform = "BigSur"
+    elif release == 19:
+        Platform = "Catalina"
+    elif release == 18:
+        Platform = "Mojave"
+    elif release == 17:
+        Platform = "HighSierra"
+    elif release == 16:
+        Platform = "Sierra"
+    elif release == 15:
+        Platform = "ElCapitan"
+    else:
+        Platform = ""
+        print("")
+        print( "!!! Sorry. Unsupported major OS release <%d>" % release, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  release = int( Release.split(".")[0] ) # take the first of ['19', '0', '0']
-  if   release == 19:
-    Platform = "Catalina"
-  elif release == 18:
-    Platform = "Mojave"
-  elif release == 17:
-    Platform = "HighSierra"
-  elif release == 16:
-    Platform = "Sierra"
-  elif release == 15:
-    Platform = "ElCapitan"
-  else:
-    Platform = ""
-    print("")
-    print( "!!! Sorry. Unsupported major OS release <%d>" % release, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    if not Machine == "x86_64":
+        print("")
+        print( "!!! Sorry. Only x86_64 architecture machine is supported but found <%s>" % Machine, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  if not Machine == "x86_64":
-    print("")
-    print( "!!! Sorry. Only x86_64 architecture machine is supported but found <%s>" % Machine, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    # Set the default modules
+    ModuleQt = "Qt5MacPorts"
+    if   Platform == "BigSur":
+        ModuleRuby   = "RubyBigSur"
+        ModulePython = "PythonBigSur"
+    elif Platform == "Catalina":
+        ModuleRuby   = "RubyCatalina"
+        ModulePython = "PythonCatalina"
+    elif Platform == "Mojave":
+        ModuleRuby   = "RubyMojave"
+        ModulePython = "PythonMojave"
+    elif Platform == "HighSierra":
+        ModuleRuby   = "RubyHighSierra"
+        ModulePython = "PythonHighSierra"
+    elif Platform == "Sierra":
+        ModuleRuby   = "RubySierra"
+        ModulePython = "PythonSierra"
+    elif Platform == "ElCapitan":
+        ModuleRuby   = "RubyElCapitan"
+        ModulePython = "PythonElCapitan"
+    else:
+        ModuleRuby   = "nil"
+        ModulePython = "nil"
 
-  # Set the default modules
-  ModuleQt = "Qt5MacPorts"
-  if   Platform == "Catalina":
-    ModuleRuby   = "RubyCatalina"
-    ModulePython = "PythonCatalina"
-  elif Platform == "Mojave":
-    ModuleRuby   = "RubyMojave"
-    ModulePython = "PythonMojave"
-  elif Platform == "HighSierra":
-    ModuleRuby   = "RubyHighSierra"
-    ModulePython = "PythonHighSierra"
-  elif Platform == "Sierra":
-    ModuleRuby   = "RubySierra"
-    ModulePython = "PythonSierra"
-  elif Platform == "ElCapitan":
-    ModuleRuby   = "RubyElCapitan"
-    ModulePython = "PythonElCapitan"
-  else:
-    ModuleRuby   = "nil"
-    ModulePython = "nil"
+    NonOSStdLang  = False
+    NoQtBindings  = False
+    MakeOptions   = "-j4"
+    DebugMode     = False
+    CheckComOnly  = False
+    DeploymentF   = False
+    DeploymentP   = False
+    PackagePrefix = ""
+    DeployVerbose = 1
+    Version       = GetKLayoutVersionFrom( "./version.sh" )
+    ModuleSet     = ( 'qt5MP', 'Sys', 'Sys' )
 
-  NonOSStdLang  = False
-  NoQtBindings  = False
-  MakeOptions   = "-j4"
-  DebugMode     = False
-  CheckComOnly  = False
-  DeploymentF   = False
-  DeploymentP   = False
-  PackagePrefix = ""
-  DeployVerbose = 1
-  Version       = GetKLayoutVersionFrom( "./version.sh" )
-  ModuleSet     = ( 'qt5MP', 'Sys', 'Sys' )
+    config = dict()
+    config['ProjectDir']    = ProjectDir        # project directory where "build.sh" exists
+    config['Usage']         = Usage             # string on usage
+    config['BuildBash']     = BuildBash         # the main build Bash script
+    config['Platform']      = Platform          # platform
+    config['ModuleQt']      = ModuleQt          # Qt module to be used
+    config['ModuleRuby']    = ModuleRuby        # Ruby module to be used
+    config['ModulePython']  = ModulePython      # Python module to be used
+    config['NonOSStdLang']  = NonOSStdLang      # True if non-OS-standard language is chosen
+    config['NoQtBindings']  = NoQtBindings      # True if not creating Qt bindings for Ruby scripts
+    config['MakeOptions']   = MakeOptions       # options passed to `make`
+    config['DebugMode']     = DebugMode         # True if debug mode build
+    config['CheckComOnly']  = CheckComOnly      # True if only for checking the command line parameters to "build.sh"
+    config['DeploymentF']   = DeploymentF       # True if fully (including Qt's Frameworks) deploy the binaries for bundles
+    config['DeploymentP']   = DeploymentP       # True if partially deploy the binaries excluding Qt's Frameworks
+    config['PackagePrefix'] = PackagePrefix     # the package prefix: 'ST-', 'LW-', 'HW-', or 'EX-'
+    config['DeployVerbose'] = DeployVerbose     # -verbose=<0-3> level passed to 'macdeployqt' tool
+    config['Version']       = Version           # KLayout's version
+    config['ModuleSet']     = ModuleSet         # (Qt, Ruby, Python)-tuple
+    # auxiliary variables on platform
+    config['System']        = System            # 6-tuple from platform.uname()
+    config['Node']          = Node              # - do -
+    config['Release']       = Release           # - do -
+    config['MacVersion']    = MacVersion        # - do -
+    config['Machine']       = Machine           # - do -
+    config['Processor']     = Processor         # - do -
+    return config
 
 #------------------------------------------------------------------------------
-## To get command line parameters
+## To parse the command line parameters
+#
+# @param[in] config     dictionary containing the default configuration
+#
+# @return the configuration dictionary updated with the CLI parameters
 #------------------------------------------------------------------------------
-def ParseCommandLineArguments():
-  global Usage
-  global Platform
-  global ModuleQt
-  global ModuleRuby
-  global ModulePython
-  global NonOSStdLang
-  global NoQtBindings
-  global MakeOptions
-  global DebugMode
-  global CheckComOnly
-  global DeploymentF
-  global DeploymentP
-  global PackagePrefix
-  global DeployVerbose
-  global ModuleSet
+def Parse_CLI_Args(config):
+    #-----------------------------------------------------
+    # [1] Retrieve the configuration
+    #-----------------------------------------------------
+    Usage         = config['Usage']
+    Platform      = config['Platform']
+    Release       = config['Release']
+    Machine       = config['Machine']
+    ModuleQt      = config['ModuleQt']
+    ModuleRuby    = config['ModuleRuby']
+    ModulePython  = config['ModulePython']
+    NonOSStdLang  = config['NonOSStdLang']
+    NoQtBindings  = config['NoQtBindings']
+    MakeOptions   = config['MakeOptions']
+    DebugMode     = config['DebugMode']
+    CheckComOnly  = config['CheckComOnly']
+    DeploymentF   = config['DeploymentF']
+    DeploymentP   = config['DeploymentP']
+    PackagePrefix = config['PackagePrefix']
+    DeployVerbose = config['DeployVerbose']
+    ModuleSet     = config['ModuleSet']
 
-  p = optparse.OptionParser( usage=Usage )
-  p.add_option( '-q', '--qt',
-                dest='type_qt',
-                help="Qt type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']" )
+    #-----------------------------------------------------
+    # [2] Parse the CLI arguments
+    #-----------------------------------------------------
+    p = optparse.OptionParser(usage=Usage)
+    p.add_option( '-q', '--qt',
+                    dest='type_qt',
+                    help="Qt type=['Qt5MacPorts', 'Qt5Brew', 'Qt5Ana3']" )
 
-  p.add_option( '-r', '--ruby',
-                dest='type_ruby',
-                help="Ruby type=['nil', 'Sys', 'MP26', 'HB27', 'Ana3']" )
+    p.add_option( '-r', '--ruby',
+                    dest='type_ruby',
+                    help="Ruby type=['nil', 'Sys', 'MP27', 'HB27', 'Ana3']" )
 
-  p.add_option( '-p', '--python',
-                dest='type_python',
-                help="Python type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3']" )
+    p.add_option( '-p', '--python',
+                    dest='type_python',
+                    help="Python type=['nil', 'Sys', 'MP38', 'HB38', 'Ana3', 'HBAuto']" )
 
-  p.add_option( '-n', '--noqtbinding',
-                action='store_true',
-                dest='no_qt_binding',
-                default=False,
-                help="do not create Qt bindings for Ruby scripts" )
+    p.add_option( '-n', '--noqtbinding',
+                    action='store_true',
+                    dest='no_qt_binding',
+                    default=False,
+                    help="do not create Qt bindings for Ruby scripts" )
 
-  p.add_option( '-m', '--make',
-                dest='make_option',
-                help="options passed to `make`" )
+    p.add_option( '-m', '--make',
+                    dest='make_option',
+                    help="options passed to `make`" )
 
-  p.add_option( '-d', '--debug',
-                action='store_true',
-                dest='debug_build',
-                default=False,
-                help="enable debug mode build" )
+    p.add_option( '-d', '--debug',
+                    action='store_true',
+                    dest='debug_build',
+                    default=False,
+                    help="enable debug mode build" )
 
-  p.add_option( '-c', '--checkcom',
-                action='store_true',
-                dest='check_command',
-                default=False,
-                help="check command line and exit without building" )
+    p.add_option( '-c', '--checkcom',
+                    action='store_true',
+                    dest='check_command',
+                    default=False,
+                    help="check command line and exit without building" )
 
-  p.add_option( '-y', '--deploy',
-                action='store_true',
-                dest='deploy_full',
-                default=False,
-                help="fully deploy built binaries" )
+    p.add_option( '-y', '--deploy',
+                    action='store_true',
+                    dest='deploy_full',
+                    default=False,
+                    help="fully deploy built binaries" )
 
-  p.add_option( '-Y', '--DEPLOY',
-                action='store_true',
-                dest='deploy_partial',
-                default=False,
-                help="deploy built binaries when non-OS-standard script language is chosen" )
+    p.add_option( '-Y', '--DEPLOY',
+                    action='store_true',
+                    dest='deploy_partial',
+                    default=False,
+                    help="deploy built binaries when non-OS-standard script language is chosen" )
 
-  p.add_option( '-v', '--verbose',
-                dest='deploy_verbose',
-                help="verbose level of `macdeployqt` tool" )
+    p.add_option( '-v', '--verbose',
+                    dest='deploy_verbose',
+                    help="verbose level of `macdeployqt` tool" )
 
-  p.add_option( '-?', '--??',
-                action='store_true',
-                dest='checkusage',
-                default=False,
-                help='check usage' )
+    p.add_option( '-?', '--??',
+                    action='store_true',
+                    dest='checkusage',
+                    default=False,
+                    help='check usage' )
 
-  p.set_defaults( type_qt        = "qt5macports",
-                  type_ruby      = "sys",
-                  type_python    = "sys",
-                  no_qt_binding  = False,
-                  make_option    = "-j4",
-                  debug_build    = False,
-                  check_command  = False,
-                  deploy_full    = False,
-                  deploy_partial = False,
-                  deploy_verbose = "1",
-                  checkusage     = False )
+    p.set_defaults( type_qt        = "qt5macports",
+                    type_ruby      = "sys",
+                    type_python    = "sys",
+                    no_qt_binding  = False,
+                    make_option    = "-j4",
+                    debug_build    = False,
+                    check_command  = False,
+                    deploy_full    = False,
+                    deploy_partial = False,
+                    deploy_verbose = "1",
+                    checkusage     = False )
 
-  opt, args = p.parse_args()
-  if (opt.checkusage):
-    print(Usage)
-    sys.exit(0)
+    opt, args = p.parse_args()
+    if (opt.checkusage):
+        print(Usage)
+        sys.exit(0)
 
-  # Determine the Qt type
-  candidates                = dict()
-  candidates['QT5MACPORTS'] = 'Qt5MacPorts'
-  candidates['QT5BREW']     = 'Qt5Brew'
-  candidates['QT5ANA3']     = 'Qt5Ana3'
-  try:
-    ModuleQt = candidates[ opt.type_qt.upper() ]
-  except KeyError:
-    ModuleQt = ''
-    pass
-  if ModuleQt == '':
-    print("")
-    print( "!!! Unknown Qt type <%s>. Case-insensitive candidates: %s" % \
-            (opt.type_qt, list(candidates.keys())), file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
-  elif ModuleQt == "Qt5MacPorts":
-    choiceQt5 = 'qt5MP'
-  elif ModuleQt == "Qt5Brew":
-    choiceQt5 = 'qt5Brew'
-  elif ModuleQt == "Qt5Ana3":
-    choiceQt5 = 'qt5Ana3'
+    # (A) Determine the Qt type
+    candidates                = dict()
+    candidates['QT5MACPORTS'] = 'Qt5MacPorts'
+    candidates['QT5BREW']     = 'Qt5Brew'
+    candidates['QT5ANA3']     = 'Qt5Ana3'
+    try:
+        ModuleQt = candidates[ opt.type_qt.upper() ]
+    except KeyError:
+        ModuleQt = ''
+        pass
+    if ModuleQt == '':
+        print("")
+        print( "!!! Unknown Qt type <%s>. Case-insensitive candidates: %s" % \
+                        (opt.type_qt, list(candidates.keys())), file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
+    elif ModuleQt == "Qt5MacPorts":
+        choiceQt5 = 'qt5MP'
+    elif ModuleQt == "Qt5Brew":
+        choiceQt5 = 'qt5Brew'
+    elif ModuleQt == "Qt5Ana3":
+        choiceQt5 = 'qt5Ana3'
 
-  # By default, OS-standard (-bundled) script languages (Ruby and Python) are used
-  NonOSStdLang = False
+    # By default, OS-standard (-bundled) script languages (Ruby and Python) are used
+    NonOSStdLang = False
 
-  # Determine the Ruby type
-  candidates         = dict()
-  candidates['NIL']  = 'nil'
-  candidates['SYS']  = 'Sys'
-  candidates['MP26'] = 'MP26'
-  candidates['HB27'] = 'HB27'
-  candidates['ANA3'] = 'Ana3'
-  try:
-    choiceRuby = candidates[ opt.type_ruby.upper() ]
-  except KeyError:
-    ModuleRuby = ''
-    pass
-  else:
-    ModuleRuby = ''
-    if choiceRuby == "nil":
-      ModuleRuby = 'nil'
-    elif choiceRuby == "Sys":
-      choiceRuby = "Sys"
-      if Platform == "Catalina":
-        ModuleRuby = 'RubyCatalina'
-      elif Platform == "Mojave":
-        ModuleRuby = 'RubyMojave'
-      elif Platform == "HighSierra":
-        ModuleRuby = 'RubyHighSierra'
-      elif Platform == "Sierra":
-        ModuleRuby = 'RubySierra'
-      elif Platform == "ElCapitan":
-        ModuleRuby = 'RubyElCapitan'
-    elif choiceRuby == "MP26":
-      ModuleRuby   = 'Ruby26MacPorts'
-      NonOSStdLang = True
-    elif choiceRuby == "HB27":
-      ModuleRuby   = 'Ruby27Brew'
-      NonOSStdLang = True
-    elif choiceRuby == "Ana3":
-      ModuleRuby   = 'RubyAnaconda3'
-      NonOSStdLang = True
-  if ModuleRuby == '':
-    print("")
-    print( "!!! Unknown Ruby type <%s>. Case-insensitive candidates: %s" % \
-            (opt.type_ruby, list(candidates.keys())), file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    # (B) Determine the Ruby type
+    candidates         = dict()
+    candidates['NIL']  = 'nil'
+    candidates['SYS']  = 'Sys'
+    candidates['MP27'] = 'MP27'
+    candidates['HB27'] = 'HB27'
+    candidates['ANA3'] = 'Ana3'
+    try:
+        choiceRuby = candidates[ opt.type_ruby.upper() ]
+    except KeyError:
+        ModuleRuby = ''
+        pass
+    else:
+        ModuleRuby = ''
+        if choiceRuby == "nil":
+            ModuleRuby = 'nil'
+        elif choiceRuby == "Sys":
+            choiceRuby = "Sys"
+            if Platform == "BigSur":
+                ModuleRuby = 'RubyBigSur'
+            elif Platform == "Catalina":
+                ModuleRuby = 'RubyCatalina'
+            elif Platform == "Mojave":
+                ModuleRuby = 'RubyMojave'
+            elif Platform == "HighSierra":
+                ModuleRuby = 'RubyHighSierra'
+            elif Platform == "Sierra":
+                ModuleRuby = 'RubySierra'
+            elif Platform == "ElCapitan":
+                ModuleRuby = 'RubyElCapitan'
+        elif choiceRuby == "MP27":
+            ModuleRuby   = 'Ruby27MacPorts'
+            NonOSStdLang = True
+        elif choiceRuby == "HB27":
+            ModuleRuby   = 'Ruby27Brew'
+            NonOSStdLang = True
+        elif choiceRuby == "Ana3":
+            ModuleRuby   = 'RubyAnaconda3'
+            NonOSStdLang = True
+    if ModuleRuby == '':
+        print("")
+        print( "!!! Unknown Ruby type <%s>. Case-insensitive candidates: %s" % \
+                        (opt.type_ruby, list(candidates.keys())), file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  # Determine the Python type
-  candidates         = dict()
-  candidates['NIL']  = 'nil'
-  candidates['SYS']  = 'Sys'
-  candidates['MP38'] = 'MP38'
-  candidates['HB38'] = 'HB38'
-  candidates['ANA3'] = 'Ana3'
-  try:
-    choicePython = candidates[ opt.type_python.upper() ]
-  except KeyError:
-    ModulePython = ''
-    pass
-  else:
-    ModulePython = ''
-    if choicePython ==  "nil":
-      ModulePython = 'nil'
-    elif choicePython == "Sys":
-      if Platform == "Catalina":
-        ModulePython = 'PythonCatalina'
-      elif Platform == "Mojave":
-        ModulePython = 'PythonMojave'
-      elif Platform == "HighSierra":
-        ModulePython = 'PythonHighSierra'
-      elif Platform == "Sierra":
-        ModulePython = 'PythonSierra'
-      elif Platform == "ElCapitan":
-        ModulePython = 'PythonElCapitan'
-    elif choicePython == "MP38":
-      ModulePython = 'Python38MacPorts'
-      NonOSStdLang = True
-    elif choicePython == "HB38":
-      ModulePython = 'Python38Brew'
-      NonOSStdLang = True
-    elif choicePython == "Ana3":
-      ModulePython = 'PythonAnaconda3'
-      NonOSStdLang = True
-  if ModulePython == '':
-    print("")
-    print( "!!! Unknown Python type <%s>. Case-insensitive candidates: %s" % \
-            (opt.type_python, list(candidates.keys())), file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    # (C) Determine the Python type
+    candidates           = dict()
+    candidates['NIL']    = 'nil'
+    candidates['SYS']    = 'Sys'
+    candidates['MP38']   = 'MP38'
+    candidates['HB38']   = 'HB38'
+    candidates['ANA3']   = 'Ana3'
+    candidates['HBAUTO'] = 'HBAuto'
+    try:
+        choicePython = candidates[ opt.type_python.upper() ]
+    except KeyError:
+        ModulePython = ''
+        pass
+    else:
+        ModulePython = ''
+        if choicePython ==  "nil":
+            ModulePython = 'nil'
+        elif choicePython == "Sys":
+            if Platform == "BigSur":
+                ModulePython = 'PythonBigSur'
+            elif Platform == "Catalina":
+                ModulePython = 'PythonCatalina'
+            elif Platform == "Mojave":
+                ModulePython = 'PythonMojave'
+            elif Platform == "HighSierra":
+                ModulePython = 'PythonHighSierra'
+            elif Platform == "Sierra":
+                ModulePython = 'PythonSierra'
+            elif Platform == "ElCapitan":
+                ModulePython = 'PythonElCapitan'
+        elif choicePython == "MP38":
+            ModulePython = 'Python38MacPorts'
+            NonOSStdLang = True
+        elif choicePython == "HB38":
+            ModulePython = 'Python38Brew'
+            NonOSStdLang = True
+        elif choicePython == "Ana3":
+            ModulePython = 'PythonAnaconda3'
+            NonOSStdLang = True
+        elif choicePython == "HBAuto":
+            ModulePython = 'PythonAutoBrew'
+            NonOSStdLang = True
+    if ModulePython == '':
+        print("")
+        print( "!!! Unknown Python type <%s>. Case-insensitive candidates: %s" % \
+                        (opt.type_python, list(candidates.keys())), file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  # Set of modules chosen
-  ModuleSet = ( choiceQt5, choiceRuby, choicePython )
+    # (D) Set of modules chosen
+    ModuleSet = ( choiceQt5, choiceRuby, choicePython )
 
-  NoQtBindings = opt.no_qt_binding
-  MakeOptions  = opt.make_option
-  DebugMode    = opt.debug_build
-  CheckComOnly = opt.check_command
-  DeploymentF  = opt.deploy_full
-  DeploymentP  = opt.deploy_partial
+    NoQtBindings = opt.no_qt_binding
+    MakeOptions  = opt.make_option
+    DebugMode    = opt.debug_build
+    CheckComOnly = opt.check_command
+    DeploymentF  = opt.deploy_full
+    DeploymentP  = opt.deploy_partial
 
-  if DeploymentF and DeploymentP:
-    print("")
-    print( "!!! Choose either [-y|--deploy] or [-Y|--DEPLOY]", file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    if DeploymentF and DeploymentP:
+        print("")
+        print( "!!! Choose either [-y|--deploy] or [-Y|--DEPLOY]", file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  DeployVerbose = int(opt.deploy_verbose)
-  if not DeployVerbose in [0, 1, 2, 3]:
-    print("")
-    print( "!!! Unsupported verbose level passed to `macdeployqt` tool", file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    DeployVerbose = int(opt.deploy_verbose)
+    if not DeployVerbose in [0, 1, 2, 3]:
+        print("")
+        print( "!!! Unsupported verbose level passed to `macdeployqt` tool", file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  if not DeploymentF and not DeploymentP:
-    target  = "%s %s %s" % (Platform, Release, Machine)
-    modules = "Qt=%s, Ruby=%s, Python=%s" % (ModuleQt, ModuleRuby, ModulePython)
-    message = "### You are going to build KLayout\n    for  <%s>\n    with <%s>...\n"
-    print("")
-    print( message % (target, modules) )
-  else:
-    message = "### You are going to make "
-    if DeploymentP:
-      PackagePrefix = "LW-"
-      message      += "a llightweight (LW-) package excluding Qt5, Ruby, and Python..."
-    elif DeploymentF:
-      if (ModuleRuby in RubySys) and (ModulePython in PythonSys):
-        PackagePrefix = "ST-"
-        message      += "a standard (ST-) package including Qt5 and using OS-bundled Ruby and Python..."
-      elif ModulePython == 'Python38Brew':
-        PackagePrefix = "HW-"
-        message      += "a heavyweight (HW-) package including Qt5 and Python3.8 from Homebrew..."
-      else:
-        PackagePrefix = "EX-"
-        message      += "a package with exceptional (EX-) combinations of different modules..."
-    print( "" )
-    print( message )
-    print( "" )
-    if CheckComOnly:
-      sys.exit(0)
+    if not DeploymentF and not DeploymentP:
+        target  = "%s %s %s" % (Platform, Release, Machine)
+        modules = "Qt=%s, Ruby=%s, Python=%s" % (ModuleQt, ModuleRuby, ModulePython)
+        message = "### You are going to build KLayout\n    for  <%s>\n    with <%s>...\n"
+        print("")
+        print( message % (target, modules) )
+    else:
+        message = "### You are going to make "
+        if DeploymentP:
+            PackagePrefix = "LW-"
+            message      += "a lightweight (LW-) package excluding Qt5, Ruby, and Python..."
+        elif DeploymentF:
+            if (ModuleRuby in RubySys) and (ModulePython in PythonSys):
+                PackagePrefix = "ST-"
+                message      += "a standard (ST-) package including Qt5 and using OS-bundled Ruby and Python..."
+            elif ModulePython == 'Python38Brew' or ModulePython == 'PythonAutoBrew':
+                PackagePrefix = "HW-"
+                message      += "a heavyweight (HW-) package including Qt5 and Python3.8~ from Homebrew..."
+            else:
+                PackagePrefix = "EX-"
+                message      += "a package with exceptional (EX-) combinations of different modules..."
+        print( "" )
+        print( message )
+        print( "" )
+        if CheckComOnly:
+            sys.exit(0)
+
+    #-----------------------------------------------------
+    # [3] Update the configuration to return
+    #-----------------------------------------------------
+    config['Usage']         = Usage
+    config['Platform']      = Platform
+    config['ModuleQt']      = ModuleQt
+    config['ModuleRuby']    = ModuleRuby
+    config['ModulePython']  = ModulePython
+    config['NonOSStdLang']  = NonOSStdLang
+    config['NoQtBindings']  = NoQtBindings
+    config['MakeOptions']   = MakeOptions
+    config['DebugMode']     = DebugMode
+    config['CheckComOnly']  = CheckComOnly
+    config['DeploymentF']   = DeploymentF
+    config['DeploymentP']   = DeploymentP
+    config['PackagePrefix'] = PackagePrefix
+    config['DeployVerbose'] = DeployVerbose
+    config['ModuleSet']     = ModuleSet         #
+    return config
 
 #------------------------------------------------------------------------------
 ## To run the main Bash script "build.sh" with appropriate options
 #
-# @return 0 on success; non-zero on failure
+# @param[in] config     dictionary containing the build configuration
+
+# @return a dictionary containing the build parameters
 #------------------------------------------------------------------------------
-def RunMainBuildBash():
-  global ProjectDir
-  global Platform
-  global BuildBash
-  global ModuleQt
-  global ModuleRuby
-  global ModulePython
-  global ModuleSet
-  global NoQtBindings
-  global MakeOptions
-  global DebugMode
-  global CheckComOnly
-  global DeploymentF
-  global DeploymentP
-  global PackagePrefix
-  global MacPkgDir          # relative path to package directory
-  global MacBinDir          # relative path to binary directory
-  global MacBuildDir        # relative path to build directory
-  global MacBuildDirQAT     # relative path to build directory for QATest
-  global MacBuildLog        # relative path to build log file
-  global AbsMacPkgDir       # absolute path to package directory
-  global AbsMacBinDir       # absolute path to binary directory
-  global AbsMacBuildDir     # absolute path to build directory
-  global AbsMacBuildDirQAT  # absolute path to build directory for QATest
-  global AbsMacBuildLog     # absolute path to build log file
+def Get_Build_Parameters(config):
+    #-----------------------------------------------------
+    # [1] Retrieve the configuration
+    #-----------------------------------------------------
+    ProjectDir    = config['ProjectDir']
+    Platform      = config['Platform']
+    BuildBash     = config['BuildBash']
+    ModuleQt      = config['ModuleQt']
+    ModuleRuby    = config['ModuleRuby']
+    ModulePython  = config['ModulePython']
+    ModuleSet     = config['ModuleSet']
+    NoQtBindings  = config['NoQtBindings']
+    MakeOptions   = config['MakeOptions']
+    DebugMode     = config['DebugMode']
+    CheckComOnly  = config['CheckComOnly']
+    DeploymentF   = config['DeploymentF']
+    DeploymentP   = config['DeploymentP']
+    PackagePrefix = config['PackagePrefix']
 
-  #-----------------------------------------------------
-  # [1] Set parameters passed to the main Bash script
-  #-----------------------------------------------------
-  parameters = ""
+    #-----------------------------------------------------
+    # [2] Set parameters passed to the main Bash script
+    #-----------------------------------------------------
+    parameters = dict()
+    parameters['build_cmd']      = BuildBash
+    parameters['check_cmd_only'] = CheckComOnly
 
-  # (A) debug or release
-  if DebugMode:
-    mode        = "debug"
-    parameters += "  -debug"
-  else:
-    mode        = "release"
-    parameters += "  -release"
-
-  # (B) Modules
-  (qt, ruby, python) = ModuleSet  # ( 'qt5MP', 'Sys', 'Sys' )
-  ruby_python = "R%sP%s" % ( ruby.lower(), python.lower() )
-
-  # (C) Target directories and files
-  MacPkgDir         = "./%s%s.pkg.macos-%s-%s-%s"      % (PackagePrefix, qt, Platform, mode, ruby_python)
-  MacBinDir         = "./%s.bin.macos-%s-%s-%s"        % (               qt, Platform, mode, ruby_python)
-  MacBuildDir       = "./%s.build.macos-%s-%s-%s"      % (               qt, Platform, mode, ruby_python)
-  MacBuildLog       = "./%s.build.macos-%s-%s-%s.log"  % (               qt, Platform, mode, ruby_python)
-  AbsMacPkgDir      = "%s/%s%s.pkg.macos-%s-%s-%s"     % (ProjectDir, PackagePrefix, qt, Platform, mode, ruby_python)
-  AbsMacBinDir      = "%s/%s.bin.macos-%s-%s-%s"       % (ProjectDir,                qt, Platform, mode, ruby_python)
-  AbsMacBuildDir    = "%s/%s.build.macos-%s-%s-%s"     % (ProjectDir,                qt, Platform, mode, ruby_python)
-  AbsMacBuildLog    = "%s/%s.build.macos-%s-%s-%s.log" % (ProjectDir,                qt, Platform, mode, ruby_python)
-  MacBuildDirQAT    = MacBuildDir    + ".macQAT"
-  AbsMacBuildDirQAT = AbsMacBuildDir + ".macQAT"
-
-  # (D) Qt5
-  if ModuleQt == 'Qt5MacPorts':
-    parameters    += " \\\n  -qt5"
-    parameters    += " \\\n  -qmake  %s" % Qt5MacPorts['qmake']
-    parameters    += " \\\n  -bin    %s" % MacBinDir
-    parameters    += " \\\n  -build  %s" % MacBuildDir
-  elif ModuleQt == 'Qt5Brew':
-    parameters    += " \\\n  -qt5"
-    parameters    += " \\\n  -qmake  %s" % Qt5Brew['qmake']
-    parameters    += " \\\n  -bin    %s" % MacBinDir
-    parameters    += " \\\n  -build  %s" % MacBuildDir
-  elif ModuleQt == 'Qt5Ana3':
-    parameters    += " \\\n  -qt5"
-    parameters    += " \\\n  -qmake  %s" % Qt5Ana3['qmake']
-    parameters    += " \\\n  -bin    %s" % MacBinDir
-    parameters    += " \\\n  -build  %s" % MacBuildDir
-  parameters += " \\\n  -rpath    %s" % "@executable_path/../Frameworks"
-
-  # (E) want Qt bindings with Ruby scripts?
-  if NoQtBindings:
-    parameters += " \\\n  -without-qtbinding"
-  else:
-    parameters += " \\\n  -with-qtbinding"
-
-  # (F) options to `make` tool
-  if not MakeOptions == "":
-    parameters += " \\\n  -option %s" % MakeOptions
-
-  # (G) about Ruby
-  if ModuleRuby == "nil":
-    parameters += " \\\n  -noruby"
-  else:
-    parameters += " \\\n  -ruby   %s" % RubyDictionary[ModuleRuby]['exe']
-    parameters += " \\\n  -rbinc  %s" % RubyDictionary[ModuleRuby]['inc']
-    parameters += " \\\n  -rblib  %s" % RubyDictionary[ModuleRuby]['lib']
-
-  # (H) about Python
-  if ModulePython == "nil":
-    parameters += " \\\n  -nopython"
-  else:
-    parameters += " \\\n  -python %s" % PythonDictionary[ModulePython]['exe']
-    parameters += " \\\n  -pyinc  %s" % PythonDictionary[ModulePython]['inc']
-    parameters += " \\\n  -pylib  %s" % PythonDictionary[ModulePython]['lib']
-
-  #-----------------------------------------------------
-  # [2] Make the consolidated command line
-  #-----------------------------------------------------
-  command  = "time"
-  command += " \\\n  %s" % BuildBash
-  command += parameters
-  command += "  2>&1 | tee %s" % MacBuildLog
-  if CheckComOnly:
-    print(command)
-    sys.exit(0)
-
-  #-----------------------------------------------------
-  # [3] Invoke the main Bash script; takes time:-)
-  #-----------------------------------------------------
-  if DeploymentF:
-    return 0
-  elif DeploymentP:
-    return 0
-  else:
-    myscript = "build4mac.py"
-    if subprocess.call( command, shell=True ) != 0:
-      print( "", file=sys.stderr )
-      print( "-------------------------------------------------------------", file=sys.stderr )
-      print( "!!! <%s>: failed to build KLayout" % myscript, file=sys.stderr )
-      print( "-------------------------------------------------------------", file=sys.stderr )
-      print( "", file=sys.stderr )
-      return 1
+    # (A) debug or release
+    parameters['debug_mode'] = DebugMode  # True if debug, False if release
+    if parameters["debug_mode"]:
+        mode = "debug"
     else:
-      print( "", file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "### <%s>: successfully built KLayout" % myscript, file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "", file=sys.stderr )
+        mode = "release"
 
-      #------------------------------------------------------------------------
-      # [4] Prepare "*.macQAT/" directory for the QATest.
-      #     Binaries under "*.macQAT/" such as *.dylib will be touched later.
-      #------------------------------------------------------------------------
-      print( "### Preparing <%s>" % MacBuildDirQAT )
-      if os.path.isdir( MacBuildDirQAT ):
+    # (B) Modules
+    (qt, ruby, python) = ModuleSet  # ( 'qt5MP', 'Sys', 'Sys' )
+    ruby_python = "R%sP%s" % ( ruby.lower(), python.lower() )
+
+    # (C) Target directories and files
+    MacPkgDir             = "%s%s.pkg.macos-%s-%s-%s"     % (PackagePrefix, qt, Platform, mode, ruby_python)
+    MacBinDir             = "%s.bin.macos-%s-%s-%s"       % (               qt, Platform, mode, ruby_python)
+    MacBuildDir           = "%s.build.macos-%s-%s-%s"     % (               qt, Platform, mode, ruby_python)
+    MacBuildLog           = "%s.build.macos-%s-%s-%s.log" % (               qt, Platform, mode, ruby_python)
+    MacBuildDirQAT        = MacBuildDir + ".macQAT"
+    parameters['logfile'] = MacBuildLog
+
+    # (D) Qt5
+    if ModuleQt == 'Qt5MacPorts':
+        parameters['qmake']       = Qt5MacPorts['qmake']
+        parameters['deploy_tool'] = Qt5MacPorts['deploy']
+    elif ModuleQt == 'Qt5Brew':
+        parameters['qmake']       = Qt5Brew['qmake']
+        parameters['deploy_tool'] = Qt5Brew['deploy']
+    elif ModuleQt == 'Qt5Ana3':
+        parameters['qmake']       = Qt5Ana3['qmake']
+        parameters['deploy_tool'] = Qt5Ana3['deploy']
+
+    parameters['bin']   = MacBinDir
+    parameters['build'] = MacBuildDir
+    parameters['rpath'] = "@executable_path/../Frameworks"
+
+    # (E) want Qt bindings with Ruby scripts?
+    parameters['no_qt_bindings'] = NoQtBindings
+
+    # (F) options to `make` tool
+    if not MakeOptions == "":
+        parameters['make_options'] = MakeOptions
+
+    # (G) about Ruby
+    if ModuleRuby != "nil":
+        parameters['ruby']  = RubyDictionary[ModuleRuby]['exe']
+        parameters['rbinc'] = RubyDictionary[ModuleRuby]['inc']
+        parameters['rblib'] = RubyDictionary[ModuleRuby]['lib']
+        if 'inc2' in RubyDictionary[ModuleRuby]:
+            parameters['rbinc2'] = RubyDictionary[ModuleRuby]['inc2']
+
+    # (H) about Python
+    if ModulePython != "nil":
+        parameters['python'] = PythonDictionary[ModulePython]['exe']
+        parameters['pyinc']  = PythonDictionary[ModulePython]['inc']
+        parameters['pylib']  = PythonDictionary[ModulePython]['lib']
+
+    config['MacPkgDir']      = MacPkgDir        # relative path to package directory
+    config['MacBinDir']      = MacBinDir        # relative path to binary directory
+    config['MacBuildDir']    = MacBuildDir      # relative path to build directory
+    config['MacBuildDirQAT'] = MacBuildDirQAT   # relative path to build directory for QATest
+    config['MacBuildLog']    = MacBuildLog      # relative path to build log file
+
+    # (I) Extra parameteres needed for deployment
+    parameters['project_dir'] = ProjectDir
+    return parameters
+
+#------------------------------------------------------------------------------
+## To run the main Bash script "build.sh" with appropriate options
+#
+# @param[in] parameters     dictionary containing the build parameters
+#
+# @return 0 on success; non-zero (1), otherwise
+#------------------------------------------------------------------------------
+def Run_Build_Command(parameters):
+    #-----------------------------------------------------
+    # [1] Set parameters passed to the main Bash script
+    #-----------------------------------------------------
+    cmd_args = ""
+
+    # (A) debug or release
+    if parameters["debug_mode"]:
+        mode      = "debug"
+        cmd_args += "  -debug"
+    else:
+        mode      = "release"
+        cmd_args += "  -release"
+
+    # (C) Target directories and files
+    MacBuildDirQAT = parameters['build'] + ".macQAT"
+
+    # (D) Qt5
+    cmd_args += " \\\n  -qt5"
+    cmd_args += " \\\n  -qmake %s" % parameters['qmake']
+    cmd_args += " \\\n  -bin   %s" % parameters['bin']
+    cmd_args += " \\\n  -build %s" % parameters['build']
+    cmd_args += " \\\n  -rpath %s" % parameters['rpath']
+
+    # (E) want Qt bindings with Ruby scripts?
+    if parameters['no_qt_bindings']:
+        cmd_args += " \\\n  -without-qtbinding"
+    else:
+        cmd_args += " \\\n  -with-qtbinding"
+
+    # (F) options to `make` tool
+    if 'make_options' in parameters:
+        cmd_args += " \\\n  -option %s" % parameters['make_options']
+
+    # (G) about Ruby
+    if 'ruby' in parameters:
+        cmd_args += " \\\n  -ruby   %s" % parameters['ruby']
+        cmd_args += " \\\n  -rbinc  %s" % parameters['rbinc']
+        cmd_args += " \\\n  -rblib  %s" % parameters['rblib']
+        if 'rbinc2' in parameters:
+            cmd_args += " \\\n  -rbinc2  %s" % parameters['rbinc2']
+    else:
+        cmd_args += " \\\n  -noruby"
+
+    # (H) about Python
+    if 'python' in parameters:
+        cmd_args += " \\\n  -python %s" % parameters['python']
+        cmd_args += " \\\n  -pyinc  %s" % parameters['pyinc']
+        cmd_args += " \\\n  -pylib  %s" % parameters['pylib']
+    else:
+        cmd_args += " \\\n  -nopython"
+
+    #-----------------------------------------------------
+    # [2] Make the consolidated command line
+    #-----------------------------------------------------
+    command  = "time"
+    command += " \\\n  %s" % parameters['build_cmd']
+    command += cmd_args
+    command += "  2>&1 | tee %s; \\\n" % parameters['logfile']
+    command += "test ${PIPESTATUS[0]} -eq 0"  # tee always exits with 0
+
+    if parameters['check_cmd_only']:
+        print(command)
+        sys.exit(0)
+
+    #-----------------------------------------------------
+    # [3] Invoke the main Bash script; takes time:-)
+    #-----------------------------------------------------
+    myscript = os.path.basename(__file__)
+    ret = subprocess.call( command, shell=True )
+    if ret != 0:
+        print( "", file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "!!! <%s>: failed to build KLayout" % myscript, file=sys.stderr )
+        print( "-------------------------------------------------------------", file=sys.stderr )
+        print( "", file=sys.stderr )
+        return 1
+
+    print( "", file=sys.stderr )
+    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+    print( "### <%s>: successfully built KLayout" % myscript, file=sys.stderr )
+    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+    print( "", file=sys.stderr )
+
+    #------------------------------------------------------------------------
+    # [4] Prepare "*.macQAT/" directory for the QATest.
+    #     Binaries under "*.macQAT/" such as *.dylib will be touched later.
+    #------------------------------------------------------------------------
+    print( "### Preparing <%s>" % MacBuildDirQAT )
+    if os.path.isdir( MacBuildDirQAT ):
         shutil.rmtree( MacBuildDirQAT )
 
-      os.chdir( MacBuildDir )
-      tarFile = "../macQATest.tar"
-      tarCmdC = "tar cf %s ." % tarFile
-      if subprocess.call( tarCmdC, shell=True ) != 0:
+    os.chdir( parameters['build'] )
+    tarFile = "../macQATest.tar"
+    tarCmdC = "tar cf %s ." % tarFile
+    if subprocess.call( tarCmdC, shell=True ) != 0:
         print( "", file=sys.stderr )
         print( "-------------------------------------------------------------", file=sys.stderr )
         print( "!!! <%s>: failed to create <%s>" % (myscript, tarFile), file=sys.stderr )
@@ -578,11 +680,11 @@ def RunMainBuildBash():
         print( "", file=sys.stderr )
         return 1
 
-      os.chdir( "../" )
-      os.mkdir( MacBuildDirQAT )
-      os.chdir( MacBuildDirQAT )
-      tarCmdX = "tar xf %s" % tarFile
-      if subprocess.call( tarCmdX, shell=True ) != 0:
+    os.chdir( "../" )
+    os.mkdir( MacBuildDirQAT )
+    os.chdir( MacBuildDirQAT )
+    tarCmdX = "tar xf %s" % tarFile
+    if subprocess.call( tarCmdX, shell=True ) != 0:
         print( "", file=sys.stderr )
         print( "-------------------------------------------------------------", file=sys.stderr )
         print( "!!! <%s>: failed to unpack <%s>" % (myscript, tarFile), file=sys.stderr )
@@ -590,15 +692,15 @@ def RunMainBuildBash():
         print( "", file=sys.stderr )
         return 1
 
-      os.remove( tarFile )
-      os.chdir( "../" )
-      shutil.copy2( "macbuild/macQAT.sh", MacBuildDirQAT )
-      shutil.copy2( "macbuild/macQAT.py", MacBuildDirQAT )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "### <%s>: prepared the initial *.macQAT/" % myscript, file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "", file=sys.stderr )
-      return 0
+    os.remove( tarFile )
+    os.chdir( "../" )
+    shutil.copy2( "macbuild/macQAT.sh", MacBuildDirQAT )
+    shutil.copy2( "macbuild/macQAT.py", MacBuildDirQAT )
+    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+    print( "### <%s>: prepared the initial *.macQAT/" % myscript, file=sys.stderr )
+    print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+    print( "", file=sys.stderr )
+    return 0
 
 #------------------------------------------------------------------------------
 ## For making a bundle (klayout.app), deploy built binaries and libraries
@@ -606,530 +708,541 @@ def RunMainBuildBash():
 #
 # Reference: "Deploying an Application on Mac OS X" of Qt Assistant.
 #
+# @param[in] config     the build configuration
+# @param[in] parameters the build parameters
+#
 # @return 0 on success; non-zero on failure
 #------------------------------------------------------------------------------
-def DeployBinariesForBundle():
-  global ProjectDir
-  global ModuleQt
-  global NonOSStdLang
-  global DeploymentF
-  global DeploymentP
-  global MacPkgDir
-  global MacBinDir
-  global MacBuildDir
-  global MacBuildDirQAT
-  global MacBuildLog
-  global AbsMacPkgDir
-  global AbsMacBinDir
-  global AbsMacBuildDir
-  global AbsMacBuildDirQAT
-  global AbsMacBuildLog
-  global Version
-  global DeployVerbose
+def Deploy_Binaries_For_Bundle(config, parameters):
+    #-----------------------------------------------------
+    # [0] Retrieve the configuration and build parameters
+    #-----------------------------------------------------
+    NonOSStdLang   = config['NonOSStdLang']
+    DeploymentF    = config['DeploymentF']
+    DeploymentP    = config['DeploymentP']
+    MacPkgDir      = config['MacPkgDir']
+    Version        = config['Version']
+    DeployVerbose  = config['DeployVerbose']
+    ModuleRuby     = config['ModuleRuby']
+    ModulePython   = config['ModulePython']
 
-  print("")
-  print( "##### Started deploying libraries and executables for <klayout.app> #####" )
-  print( " [1] Checking the status of working directory ..." )
-  #-------------------------------------------------------------
-  # [1] Check the status of working directory
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  if not DeploymentF and not DeploymentP:
-    return 1
-  if DeploymentF and NonOSStdLang:
-    print( "     WARNING!!! You chose <-y|--deploy> while using non-OS-standard script language.", file=sys.stderr )
-    print( "         Consider using <-Y|--DEPLOY> instead", file=sys.stderr )
-    #return 1
-  if not os.path.isfile(MacBuildLog):
-    print( "!!! Build log file <%s> does not present !!!" % MacBuildLog, file=sys.stderr )
-    return 1
-  if not os.path.isdir(MacBuildDir):
-    print( "!!! Build directory <%s> does not present !!!" % MacBuildDir, file=sys.stderr )
-    return 1
-  if not os.path.isdir(MacBinDir):
-    print( "!!! Binary directory <%s> does not present !!!" % MacBinDir, file=sys.stderr )
-    return 1
+    ProjectDir     = parameters['project_dir']
+    MacBinDir      = parameters['bin']
+    MacBuildDir    = parameters['build']
+    MacBuildLog    = parameters['logfile']
+
+    AbsMacPkgDir   = "%s/%s" % (ProjectDir, MacPkgDir)
+    AbsMacBinDir   = "%s/%s" % (ProjectDir, MacBinDir)
+    AbsMacBuildDir = "%s/%s" % (ProjectDir, MacBuildDir)
+    AbsMacBuildLog = "%s/%s" % (ProjectDir, MacBuildLog)
 
 
-  print( " [2] Creating a new empty directory <%s> for deployment ..." % MacPkgDir )
-  #-------------------------------------------------------------
-  # [2] Create a new empty directory for deploying binaries
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  if os.path.isfile(MacPkgDir):
-    os.remove(MacPkgDir)
-  if os.path.isdir(MacPkgDir):
-    shutil.rmtree(MacPkgDir)
-  os.mkdir(MacPkgDir)
-
-
-  print( " [3] Creating the standard directory structure for 'klayout.app' bundle ..." )
-  #-----------------------------------------------------------------
-  # [3] Create the directory skeleton for "klayout.app" bundle
-  #     and command line buddy tools such as "strm2cif".
-  #     They are stored in the directory structure below.
-  #
-  #    klayout.app/+
-  #                +-- Contents/+
-  #                             +-- Info.plist
-  #                             +-- PkgInfo
-  #                             +-- Resources/+
-  #                             |             +-- 'klayout.icns'
-  #                             +-- Frameworks/+
-  #                             |              +-- '*.framework'
-  #                             |              +-- '*.dylib'
-  #                             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
-  #                             +-- MacOS/+
-  #                             |         +-- 'klayout'
-  #                             |         +-- db_plugins/
-  #                             |         +-- lay_plugins/
-  #                             +-- Buddy/+
-  #                                       +-- 'strm2cif'
-  #                                       +-- 'strm2dxf'
-  #                                       :
-  #                                       +-- 'strmxor'
-  #-----------------------------------------------------------------
-  targetDir0 = "%s/klayout.app/Contents" % AbsMacPkgDir
-  targetDirR = targetDir0 + "/Resources"
-  targetDirF = targetDir0 + "/Frameworks"
-  targetDirM = targetDir0 + "/MacOS"
-  targetDirB = targetDir0 + "/Buddy"
-  os.makedirs(targetDirR)
-  os.makedirs(targetDirF)
-  os.makedirs(targetDirM)
-  os.makedirs(targetDirB)
-
-
-  print( " [4] Copying KLayout's dynamic link libraries to 'Frameworks' ..." )
-  #-------------------------------------------------------------------------------
-  # [4] Copy KLayout's dynamic link libraries to "Frameworks/" and create
-  #     the library dependency dictionary.
-  #     <<< Do this job in "Frameworks/" >>>
-  #
-  # Note:
-  #     KLayout's dynamic link library is built as below:
-  #       (1) libklayout_lay.0.26.1.dylib
-  #       (2) libklayout_lay.0.26.dylib -> libklayout_lay.0.26.1.dylib
-  #       (3) libklayout_lay.0.dylib -> libklayout_lay.0.26.1.dylib
-  #       (4) libklayout_lay.dylib -> libklayout_lay.0.26.1.dylib
-  #     where,
-  #       (1) is an ordinary file with full version number 'major.minor.teeny'
-  #           between "library_name."='libklayout_lay.' and '.dylib'
-  #       (2) is a symbolic link with 'major.minor' version number
-  #       (3) is a symbolic link with 'major' version number
-  #       (4) is a symbolic link without version number number
-  #
-  #     The dynamic linker tries to find a library name in style (3) as shown
-  #     in the example below.
-  #
-  # Example:
-  #   MacBookPro2(1)$ otool -L klayout
-  #   klayout:
-  #       :
-  #       :
-  #     libklayout_tl.0.dylib (compatibility version 0.26.0, current version 0.26.1)
-  #     libklayout_gsi.0.dylib (compatibility version 0.26.0, current version 0.26.1)
-  #     libklayout_db.0.dylib (compatibility version 0.26.0, current version 0.26.1)
-  #       :
-  #-------------------------------------------------------------------------------
-  os.chdir( targetDirF )
-  dynamicLinkLibs = glob.glob( os.path.join( AbsMacBinDir, "*.dylib" ) )
-  depDicOrdinary  = {} # inter-library dependency dictionary
-  pathDic = {} # paths to insert for each library
-  for item in dynamicLinkLibs:
-    if os.path.isfile(item) and not os.path.islink(item):
-      #-------------------------------------------------------------------
-      # (A) Copy an ordinary *.dylib file here by changing the name
-      #     to style (3) and set its mode to 0755 (sanity check).
-      #-------------------------------------------------------------------
-      fullName = os.path.basename(item).split('.')
-      # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
-      nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
-      shutil.copy2( item, nameStyle3 )
-      os.chmod( nameStyle3, 0o0755 )
-      #-------------------------------------------------------------------
-      # (B) Then get inter-library dependencies
-      #     Note that will pull all dependencies and sort them out later
-      #     dropping those which don't have a path entry
-      #-------------------------------------------------------------------
-      otoolCm   = "otool -L %s | grep dylib" % nameStyle3
-      otoolOut  = os.popen( otoolCm ).read()
-      dependDic = DecomposeLibraryDependency(otoolOut)
-      depDicOrdinary.update(dependDic)
-      #-------------------------------------------------------------------
-      # (C) This library goes into Frameworks, hence record it's path there
-      #-------------------------------------------------------------------
-      pathDic[nameStyle3] = "@executable_path/../Frameworks/" + nameStyle3
-
-  os.chdir(ProjectDir)
-  #-------------------------------------------------------------------
-  # Copy the contents of the plugin directories to a place next to
-  # the application binary
-  #-------------------------------------------------------------------
-  for piDir in [ "db_plugins", "lay_plugins" ]:
-    os.makedirs( os.path.join( targetDirM, piDir ))
-    dynamicLinkLibs = glob.glob( os.path.join( MacBinDir, piDir, "*.dylib" ) )
-    for item in dynamicLinkLibs:
-      if os.path.isfile(item) and not os.path.islink(item):
-        #-------------------------------------------------------------------
-        # (A) Copy an ordinary *.dylib file here by changing the name
-        #     to style (3) and set its mode to 0755 (sanity check).
-        #-------------------------------------------------------------------
-        fullName = os.path.basename(item).split('.')
-        # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
-        nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
-        destPath = os.path.join( targetDirM, piDir, nameStyle3 )
-        shutil.copy2( item, destPath )
-        os.chmod( destPath, 0o0755 )
-        #-------------------------------------------------------------------
-        # (B) Then get inter-library dependencies
-        #     Note that will pull all dependencies and sort them out later
-        #     dropping those which don't have a path entry
-        #-------------------------------------------------------------------
-        otoolCm   = "otool -L %s | grep 'dylib'" % destPath
-        otoolOut  = os.popen( otoolCm ).read()
-        dependDic = DecomposeLibraryDependency(otoolOut)
-        depDicOrdinary.update(dependDic)
-        #-------------------------------------------------------------------
-        # (C) This library goes into the plugin dir
-        #-------------------------------------------------------------------
-        pathDic[nameStyle3] = "@executable_path/" + piDir + "/" + nameStyle3
-
-  '''
-  PrintLibraryDependencyDictionary( depDicOrdinary, pathDic, "Style (3)" )
-  exit()
-  '''
-
-  #----------------------------------------------------------------------------------
-  # (D) Make a symbolic link
-  #        'db_plugins' --slink--> ../MacOS/db_plugins/
-  #     under Frameworks/, which is required for the command line Buddy tools.
-  #
-  #     Ref. https://github.com/KLayout/klayout/issues/460#issuecomment-571803458
-  #
-  #             :
-  #             +-- Frameworks/+
-  #             |              +-- '*.framework'
-  #             |              +-- '*.dylib'
-  #             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
-  #             +-- MacOS/+
-  #             |         +-- 'klayout'
-  #             |         +-- db_plugins/
-  #             |         +-- lay_plugins/
-  #             :
-  #----------------------------------------------------------------------------------
-  os.chdir( targetDirF )
-  os.symlink( "../MacOS/db_plugins/", "./db_plugins" )
-
-
-  print( " [5] Setting and changing the identification names among KLayout's libraries ..." )
-  #-------------------------------------------------------------
-  # [5] Set the identification names for KLayout's libraries
-  #     and make the library aware of the locations of libraries
-  #     on which it depends; that is, inter-library dependency
-  #-------------------------------------------------------------
-  ret = SetChangeIdentificationNameOfDyLib( depDicOrdinary, pathDic )
-  if not ret == 0:
-    msg = "!!! Failed to set and change to new identification names !!!"
-    print(msg)
-    return 1
-
-
-  print( " [6] Copying built executables and resource files ..." )
-  #-------------------------------------------------------------
-  # [6] Copy some known files in source directories to
-  #     relevant target directories
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  sourceDir0 = "%s/klayout.app/Contents" % MacBinDir
-  sourceDir1 = sourceDir0 + "/MacOS"
-  sourceDir2 = "%s/macbuild/Resources" % ProjectDir
-  sourceDir3 = "%s" % MacBinDir
-
-  tmpfileM = ProjectDir + "/macbuild/Resources/Info.plist.template"
-  keydicM  = { 'exe': 'klayout', 'icon': 'klayout.icns', 'bname': 'klayout', 'ver': Version }
-  plistM   = GenerateInfoPlist( keydicM, tmpfileM )
-  file     = open( targetDir0 + "/Info.plist", "w" )
-  file.write(plistM)
-  file.close()
-
-  shutil.copy2( sourceDir0 + "/PkgInfo",      targetDir0 ) # this file is not mandatory
-  shutil.copy2( sourceDir1 + "/klayout",      targetDirM )
-  shutil.copy2( sourceDir2 + "/klayout.icns", targetDirR )
-
-
-  os.chmod( targetDir0 + "/PkgInfo",      0o0644 )
-  os.chmod( targetDir0 + "/Info.plist",   0o0644 )
-  os.chmod( targetDirM + "/klayout",      0o0755 )
-  os.chmod( targetDirR + "/klayout.icns", 0o0644 )
-
-  buddies = glob.glob( sourceDir3 + "/strm*" )
-  for item in buddies:
-    shutil.copy2( item, targetDirB )
-    buddy = os.path.basename(item)
-    os.chmod( targetDirB + "/" + buddy, 0o0755 )
-
-
-  print( " [7] Setting and changing the identification names of KLayout's libraries in each executable ..." )
-  #-------------------------------------------------------------
-  # [7] Set and change the library identification name(s) of
-  #     different executables
-  #-------------------------------------------------------------
-  os.chdir(ProjectDir)
-  os.chdir(MacPkgDir)
-  klayoutexec = "klayout.app/Contents/MacOS/klayout"
-  ret = SetChangeLibIdentificationName( klayoutexec, "../Frameworks" )
-  if not ret == 0:
+    print("")
+    print( "##### Started deploying libraries and executables for <klayout.app> #####" )
+    print( " [1] Checking the status of working directory ..." )
+    #-------------------------------------------------------------
+    # [1] Check the status of working directory
+    #-------------------------------------------------------------
     os.chdir(ProjectDir)
-    msg = "!!! Failed to set/change library identification name for <%s> !!!"
-    print( msg % klayoutexec, file=sys.stderr )
-    return 1
+    if not DeploymentF and not DeploymentP:
+        return 1
+    if DeploymentF and NonOSStdLang:
+        print( "     WARNING!!! You chose <-y|--deploy> while using non-OS-standard script language.", file=sys.stderr )
+        print( "         Consider using <-Y|--DEPLOY> instead", file=sys.stderr )
+        #return 1
+    if not os.path.isfile(MacBuildLog):
+        print( "!!! Build log file <%s> is not present !!!" % MacBuildLog, file=sys.stderr )
+        return 1
+    if not os.path.isdir(MacBuildDir):
+        print( "!!! Build directory <%s> is not present !!!" % MacBuildDir, file=sys.stderr )
+        return 1
+    if not os.path.isdir(MacBinDir):
+        print( "!!! Binary directory <%s> is not present !!!" % MacBinDir, file=sys.stderr )
+        return 1
 
-  buddies     = glob.glob( "klayout.app/Contents/Buddy/strm*" )
-  macdepQtOpt = ""
-  for buddy in buddies:
-    macdepQtOpt += " -executable=%s" % buddy
-    ret = SetChangeLibIdentificationName( buddy, "../Frameworks" )
+
+    print( " [2] Creating a new empty directory <%s> for deployment ..." % MacPkgDir )
+    #-------------------------------------------------------------
+    # [2] Create a new empty directory for deploying binaries
+    #-------------------------------------------------------------
+    os.chdir(ProjectDir)
+    if os.path.isfile(MacPkgDir):
+        os.remove(MacPkgDir)
+    if os.path.isdir(MacPkgDir):
+        shutil.rmtree(MacPkgDir)
+    os.mkdir(MacPkgDir)
+
+
+    print( " [3] Creating the standard directory structure for 'klayout.app' bundle ..." )
+    #-----------------------------------------------------------------
+    # [3] Create the directory skeleton for "klayout.app" bundle
+    #     and command line buddy tools such as "strm2cif".
+    #     They are stored in the directory structure below.
+    #
+    #    klayout.app/+
+    #                +-- Contents/+
+    #                             +-- Info.plist
+    #                             +-- PkgInfo
+    #                             +-- Resources/+
+    #                             |             +-- 'klayout.icns'
+    #                             +-- Frameworks/+
+    #                             |              +-- '*.framework'
+    #                             |              +-- '*.dylib'
+    #                             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
+    #                             +-- MacOS/+
+    #                             |         +-- 'klayout'
+    #                             |         +-- db_plugins/
+    #                             |         +-- lay_plugins/
+    #                             +-- Buddy/+
+    #                                       +-- 'strm2cif'
+    #                                       +-- 'strm2dxf'
+    #                                       :
+    #                                       +-- 'strmxor'
+    #-----------------------------------------------------------------
+    targetDir0 = "%s/klayout.app/Contents" % AbsMacPkgDir
+    targetDirR = targetDir0 + "/Resources"
+    targetDirF = targetDir0 + "/Frameworks"
+    targetDirM = targetDir0 + "/MacOS"
+    targetDirB = targetDir0 + "/Buddy"
+    os.makedirs(targetDirR)
+    os.makedirs(targetDirF)
+    os.makedirs(targetDirM)
+    os.makedirs(targetDirB)
+
+
+    print( " [4] Copying KLayout's dynamic link libraries to 'Frameworks' ..." )
+    #-------------------------------------------------------------------------------
+    # [4] Copy KLayout's dynamic link libraries to "Frameworks/" and create
+    #     the library dependency dictionary.
+    #     <<< Do this job in "Frameworks/" >>>
+    #
+    # Note:
+    #     KLayout's dynamic link library is built as below:
+    #       (1) libklayout_lay.0.26.1.dylib
+    #       (2) libklayout_lay.0.26.dylib -> libklayout_lay.0.26.1.dylib
+    #       (3) libklayout_lay.0.dylib -> libklayout_lay.0.26.1.dylib
+    #       (4) libklayout_lay.dylib -> libklayout_lay.0.26.1.dylib
+    #     where,
+    #       (1) is an ordinary file with full version number 'major.minor.teeny'
+    #           between "library_name."='libklayout_lay.' and '.dylib'
+    #       (2) is a symbolic link with 'major.minor' version number
+    #       (3) is a symbolic link with 'major' version number
+    #       (4) is a symbolic link without version number number
+    #
+    #     The dynamic linker tries to find a library name in style (3) as shown
+    #     in the example below.
+    #
+    # Example:
+    #   MacBookPro2(1)$ otool -L klayout
+    #   klayout:
+    #       :
+    #       :
+    #     libklayout_tl.0.dylib (compatibility version 0.26.0, current version 0.26.1)
+    #     libklayout_gsi.0.dylib (compatibility version 0.26.0, current version 0.26.1)
+    #     libklayout_db.0.dylib (compatibility version 0.26.0, current version 0.26.1)
+    #       :
+    #-------------------------------------------------------------------------------
+    os.chdir( targetDirF )
+    dynamicLinkLibs = glob.glob( os.path.join( AbsMacBinDir, "*.dylib" ) )
+    depDicOrdinary  = {} # inter-library dependency dictionary
+    pathDic = {} # paths to insert for each library
+    for item in dynamicLinkLibs:
+        if os.path.isfile(item) and not os.path.islink(item):
+            #-------------------------------------------------------------------
+            # (A) Copy an ordinary *.dylib file here by changing the name
+            #     to style (3) and set its mode to 0755 (sanity check).
+            #-------------------------------------------------------------------
+            fullName = os.path.basename(item).split('.')
+            # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
+            nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
+            shutil.copy2( item, nameStyle3 )
+            os.chmod( nameStyle3, 0o0755 )
+            #-------------------------------------------------------------------
+            # (B) Then get inter-library dependencies
+            #     Note that will pull all dependencies and sort them out later
+            #     dropping those which don't have a path entry
+            #-------------------------------------------------------------------
+            otoolCm   = "otool -L %s | grep dylib" % nameStyle3
+            otoolOut  = os.popen( otoolCm ).read()
+            dependDic = DecomposeLibraryDependency(otoolOut)
+            depDicOrdinary.update(dependDic)
+            #-------------------------------------------------------------------
+            # (C) This library goes into Frameworks, hence record it's path there
+            #-------------------------------------------------------------------
+            pathDic[nameStyle3] = "@executable_path/../Frameworks/" + nameStyle3
+
+    os.chdir(ProjectDir)
+    #-------------------------------------------------------------------
+    # Copy the contents of the plugin directories to a place next to
+    # the application binary
+    #-------------------------------------------------------------------
+    for piDir in [ "db_plugins", "lay_plugins" ]:
+        os.makedirs( os.path.join( targetDirM, piDir ))
+        dynamicLinkLibs = glob.glob( os.path.join( MacBinDir, piDir, "*.dylib" ) )
+        for item in dynamicLinkLibs:
+            if os.path.isfile(item) and not os.path.islink(item):
+                #-------------------------------------------------------------------
+                # (A) Copy an ordinary *.dylib file here by changing the name
+                #     to style (3) and set its mode to 0755 (sanity check).
+                #-------------------------------------------------------------------
+                fullName = os.path.basename(item).split('.')
+                # e.g. [ 'libklayout_lay', '0', '26', '1', 'dylib' ]
+                nameStyle3 = fullName[0] + "." + fullName[1] + ".dylib"
+                destPath = os.path.join( targetDirM, piDir, nameStyle3 )
+                shutil.copy2( item, destPath )
+                os.chmod( destPath, 0o0755 )
+                #-------------------------------------------------------------------
+                # (B) Then get inter-library dependencies
+                #     Note that will pull all dependencies and sort them out later
+                #     dropping those which don't have a path entry
+                #-------------------------------------------------------------------
+                otoolCm   = "otool -L %s | grep 'dylib'" % destPath
+                otoolOut  = os.popen( otoolCm ).read()
+                dependDic = DecomposeLibraryDependency(otoolOut)
+                depDicOrdinary.update(dependDic)
+                #-------------------------------------------------------------------
+                # (C) This library goes into the plugin dir
+                #-------------------------------------------------------------------
+                pathDic[nameStyle3] = "@executable_path/" + piDir + "/" + nameStyle3
+
+    '''
+    PrintLibraryDependencyDictionary( depDicOrdinary, pathDic, "Style (3)" )
+    exit()
+    '''
+
+    #----------------------------------------------------------------------------------
+    # (D) Make a symbolic link
+    #        'db_plugins' --slink--> ../MacOS/db_plugins/
+    #     under Frameworks/, which is required for the command line Buddy tools.
+    #
+    #     Ref. https://github.com/KLayout/klayout/issues/460#issuecomment-571803458
+    #
+    #             :
+    #             +-- Frameworks/+
+    #             |              +-- '*.framework'
+    #             |              +-- '*.dylib'
+    #             |              +-- 'db_plugins' --slink--> ../MacOS/db_plugins/
+    #             +-- MacOS/+
+    #             |         +-- 'klayout'
+    #             |         +-- db_plugins/
+    #             |         +-- lay_plugins/
+    #             :
+    #----------------------------------------------------------------------------------
+    os.chdir( targetDirF )
+    os.symlink( "../MacOS/db_plugins/", "./db_plugins" )
+
+
+    print( " [5] Setting and changing the identification names among KLayout's libraries ..." )
+    #-------------------------------------------------------------
+    # [5] Set the identification names for KLayout's libraries
+    #     and make the library aware of the locations of libraries
+    #     on which it depends; that is, inter-library dependency
+    #-------------------------------------------------------------
+    ret = SetChangeIdentificationNameOfDyLib( depDicOrdinary, pathDic )
     if not ret == 0:
-      os.chdir(ProjectDir)
-      msg = "!!! Failed to set/change library identification name for <%s> !!!"
-      print( msg % buddy, file=sys.stderr )
-      return 1
+        msg = "!!! Failed to set and change to new identification names !!!"
+        print(msg)
+        return 1
 
-  if DeploymentF:
-    print( " [8] Finally, deploying Qt's Frameworks ..." )
+
+    print( " [6] Copying built executables and resource files ..." )
     #-------------------------------------------------------------
-    # [8] Deploy Qt Frameworks
+    # [6] Copy some known files in source directories to
+    #     relevant target directories
     #-------------------------------------------------------------
-    verbose = " -verbose=%d" % DeployVerbose
-    if ModuleQt == 'Qt5MacPorts':
-      deploytool = Qt5MacPorts['deploy']
-      app_bundle = "klayout.app"
-      options    = macdepQtOpt + verbose
-    elif ModuleQt == 'Qt5Brew':
-      deploytool = Qt5Brew['deploy']
-      app_bundle = "klayout.app"
-      options    = macdepQtOpt + verbose
-    elif ModuleQt == 'Qt5Ana3':
-      deploytool = Qt5Ana3['deploy']
-      app_bundle = "klayout.app"
-      options    = macdepQtOpt + verbose
+    os.chdir(ProjectDir)
+    sourceDir0 = "%s/klayout.app/Contents" % MacBinDir
+    sourceDir1 = sourceDir0 + "/MacOS"
+    sourceDir2 = "%s/macbuild/Resources" % ProjectDir
+    sourceDir3 = "%s" % MacBinDir
 
-    # Without the following, the plugin cocoa would not be found properly.
-    shutil.copy2( sourceDir2 + "/qt.conf", targetDirM )
-    os.chmod( targetDirM + "/qt.conf",      0o0644 )
+    tmpfileM = ProjectDir + "/macbuild/Resources/Info.plist.template"
+    keydicM  = { 'exe': 'klayout', 'icon': 'klayout.icns', 'bname': 'klayout', 'ver': Version }
+    plistM   = GenerateInfoPlist( keydicM, tmpfileM )
+    file     = open( targetDir0 + "/Info.plist", "w" )
+    file.write(plistM)
+    file.close()
 
+    shutil.copy2( sourceDir0 + "/PkgInfo",      targetDir0 ) # this file is not mandatory
+    shutil.copy2( sourceDir1 + "/klayout",      targetDirM )
+    shutil.copy2( sourceDir2 + "/klayout.icns", targetDirR )
+
+
+    os.chmod( targetDir0 + "/PkgInfo",      0o0644 )
+    os.chmod( targetDir0 + "/Info.plist",   0o0644 )
+    os.chmod( targetDirM + "/klayout",      0o0755 )
+    os.chmod( targetDirR + "/klayout.icns", 0o0644 )
+
+    buddies = glob.glob( sourceDir3 + "/strm*" )
+    for item in buddies:
+        shutil.copy2( item, targetDirB )
+        buddy = os.path.basename(item)
+        os.chmod( targetDirB + "/" + buddy, 0o0755 )
+
+
+    print( " [7] Setting and changing the identification names of KLayout's libraries in each executable ..." )
+    #-------------------------------------------------------------
+    # [7] Set and change the library identification name(s) of
+    #     different executables
+    #-------------------------------------------------------------
     os.chdir(ProjectDir)
     os.chdir(MacPkgDir)
-    command = "%s %s %s" % ( deploytool, app_bundle, options )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to deploy applications on OSX/macOS !!!"
-      print( msg, file=sys.stderr )
-      print("")
-      os.chdir(ProjectDir)
-      return 1
+    klayoutexec = "klayout.app/Contents/MacOS/klayout"
+    ret = SetChangeLibIdentificationName( klayoutexec, "../Frameworks" )
+    if not ret == 0:
+        os.chdir(ProjectDir)
+        msg = "!!! Failed to set/change library identification name for <%s> !!!"
+        print( msg % klayoutexec, file=sys.stderr )
+        return 1
 
-    #-----------------------------------------------------------------------------------------------
-    # [9] Special deployment of Python3.8 from Homebrew
-    #     To use Python3.8 from Homebrew on Catalina...
-    #       in "/usr/local/opt/python/lib/"
-    #             Python.framework -> ../Frameworks/Python.framework/ <=== this symbolic was needed
-    #             pkgconfig/
-    #-----------------------------------------------------------------------------------------------
-    deploymentPython38HB = (ModulePython == 'Python38Brew')
-    if deploymentPython38HB and NonOSStdLang:
-      from build4mac_util import WalkFrameworkPaths, PerformChanges
+    buddies     = glob.glob( "klayout.app/Contents/Buddy/strm*" )
+    macdepQtOpt = ""
+    for buddy in buddies:
+        macdepQtOpt += " -executable=%s" % buddy
+        ret = SetChangeLibIdentificationName( buddy, "../Frameworks" )
+        if not ret == 0:
+            os.chdir(ProjectDir)
+            msg = "!!! Failed to set/change library identification name for <%s> !!!"
+            print( msg % buddy, file=sys.stderr )
+            return 1
 
-      pythonHBVer         = "3.8" # 'pinned' to this version as of KLayout version 0.26.7 (2020-09-13)
-      bundlePath          = AbsMacPkgDir + '/klayout.app'
-      bundleExecPathAbs   = '%s/Contents/MacOS/' % bundlePath
-      pythonFrameworkPath = '%s/Contents/Frameworks/Python.framework' % bundlePath
-      testTarget          = '%s/Versions/%s/lib/python%s/test' % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
-      resourceTarget1     = '%s/Versions/%s/Resources' % (pythonFrameworkPath, pythonHBVer)
-      resourceTarget2     = '%s/Resources' % pythonFrameworkPath
-      binTarget           = '%s/Versions/%s/bin' % (pythonFrameworkPath, pythonHBVer)
-      sitepackagesTarget  = '%s/Versions/%s/lib/python%s/site-packages' % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
-      sitepackagesSource  = '%s/Versions/%s/lib/python%s/site-packages' % (HBPython38FrameworkPath, pythonHBVer, pythonHBVer)
+    if DeploymentF:
+        print( " [8] Finally, deploying Qt's Frameworks ..." )
+        #-------------------------------------------------------------
+        # [8] Deploy Qt Frameworks
+        #-------------------------------------------------------------
+        verbose = " -verbose=%d" % DeployVerbose
+        app_bundle = "klayout.app"
+        options = macdepQtOpt + verbose
+        deploytool = parameters['deploy_tool']
 
-      print( "" )
-      print( " [9] Optional deployment of Python from %s ..." % HBPython38FrameworkPath )
-      print( "  [9.1] Copying Python Framework" )
+        # Without the following, the plugin cocoa would not be found properly.
+        shutil.copy2( sourceDir2 + "/qt.conf", targetDirM )
+        os.chmod( targetDirM + "/qt.conf",      0o0644 )
 
-      cmd01 = "rm -rf %s" % pythonFrameworkPath
-      cmd02 = "rsync -a --safe-links %s/ %s" % (HBPython38FrameworkPath, pythonFrameworkPath)
-
-      cmd03 = "rm -rf %s" % testTarget
-      cmd04 = "rm -rf %s" % resourceTarget1
-      cmd05 = "unlink %s" % resourceTarget2
-      cmd06 = "rm -rf %s" % binTarget
-
-      cmd07 = "mkdir %s" % sitepackagesTarget
-      cmd08 = "cp -RL %s/{pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
-
-      shell_commands = list()
-      shell_commands.append(cmd01)
-      shell_commands.append(cmd02)
-      shell_commands.append(cmd03)
-      shell_commands.append(cmd04)
-      shell_commands.append(cmd05)
-      shell_commands.append(cmd06)
-      shell_commands.append(cmd07)
-      shell_commands.append(cmd08)
-
-      for command in shell_commands:
+        os.chdir(ProjectDir)
+        os.chdir(MacPkgDir)
+        command = "%s %s %s" % ( deploytool, app_bundle, options )
         if subprocess.call( command, shell=True ) != 0:
-          msg = "command failed: %s"
-          print( msg % command, file=sys.stderr )
-          sys.exit(1)
+            msg = "!!! Failed to deploy applications on OSX/macOS !!!"
+            print( msg, file=sys.stderr )
+            print("")
+            os.chdir(ProjectDir)
+            return 1
 
-      shutil.copy2( sourceDir2 + "/start-console.py", targetDirM )
-      shutil.copy2( sourceDir2 + "/klayout_console",  targetDirM )
-      os.chmod( targetDirM + "/start-console.py", 0o0755 )
-      os.chmod( targetDirM + "/klayout_console",  0o0755 )
+        #-----------------------------------------------------------------------------------------------
+        # [9] Special deployment of Python3.8 or newer from Homebrew
+        #     To use Python3.8 from Homebrew on Catalina...
+        #       in "/usr/local/opt/python@3.8/lib/"
+        #             Python.framework -> ../Frameworks/Python.framework/ <=== this symbolic was needed
+        #             pkgconfig/
+        #-----------------------------------------------------------------------------------------------
+        deploymentPython38HB   = (ModulePython == 'Python38Brew')
+        deploymentPythonAutoHB = (ModulePython == 'PythonAutoBrew')
+        if (deploymentPython38HB or deploymentPythonAutoHB) and NonOSStdLang:
+            from build4mac_util import WalkFrameworkPaths, PerformChanges
 
-      print("  [9.2] Relinking dylib dependencies inside Python.framework" )
-      print("   [9.2.1] Patching Python Framework" )
-      depdict = WalkFrameworkPaths( pythonFrameworkPath )
-      appPythonFrameworkPath = '@executable_path/../Frameworks/Python.framework/'
-      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+            if deploymentPython38HB:
+                HBPythonFrameworkPath = HBPython38FrameworkPath
+                pythonHBVer           = "3.8" # 'pinned' to this version as of KLayout version 0.26.7 (2020-09-13)
+            elif deploymentPythonAutoHB:
+                HBPythonFrameworkPath = HBPythonAutoFrameworkPath
+                pythonHBVer           = HBPythonAutoVersion
 
-      print("   [9.2.2] Patching /usr/local/opt/ libs")
-      usrLocalPath = '/usr/local/opt/'
-      appUsrLocalPath = '@executable_path/../Frameworks/'
-      replacePairs = [(usrLocalPath, appUsrLocalPath, True)]
-      depdict = WalkFrameworkPaths(pythonFrameworkPath, search_path_filter=r'\t+/usr/local/(opt|Cellar)')
-      PerformChanges(depdict, replacePairs, bundleExecPathAbs)
+            bundlePath          = AbsMacPkgDir + '/klayout.app'
+            bundleExecPathAbs   = '%s/Contents/MacOS/' % bundlePath
+            pythonFrameworkPath = '%s/Contents/Frameworks/Python.framework' % bundlePath
+            testTarget          = '%s/Versions/%s/lib/python%s/test' % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
+            resourceTarget1     = '%s/Versions/%s/Resources' % (pythonFrameworkPath, pythonHBVer)
+            resourceTarget2     = '%s/Resources' % pythonFrameworkPath
+            binTarget           = '%s/Versions/%s/bin' % (pythonFrameworkPath, pythonHBVer)
+            sitepackagesTarget  = '%s/Versions/%s/lib/python%s/site-packages' % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
+            sitepackagesSource  = '%s/Versions/%s/lib/python%s/site-packages' % (HBPythonFrameworkPath, pythonHBVer, pythonHBVer)
 
-      print("   [9.2.3] Patching openssl@1.1, gdbm, readline, sqlite, xz")
-      usrLocalPath = '/usr/local/opt'
-      appUsrLocalPath = '@executable_path/../Frameworks/'
-      replacePairs = [(usrLocalPath, appUsrLocalPath, True)]
-      replacePairs.extend([(openssl_version, '@executable_path/../Frameworks/openssl@1.1', True)
-        for openssl_version in glob.glob('/usr/local/Cellar/openssl@1.1/*')])
-      depdict = WalkFrameworkPaths([pythonFrameworkPath + '/../openssl@1.1',
-                                    pythonFrameworkPath + '/../gdbm',
-                                    pythonFrameworkPath + '/../readline',
-                                    pythonFrameworkPath + '/../sqlite',
-                                    pythonFrameworkPath + '/../xz'], search_path_filter=r'\t+/usr/local/(opt|Cellar)')
+            print( "" )
+            print( " [9] Optional deployment of Python from %s ..." % HBPythonFrameworkPath )
+            print( "  [9.1] Copying Python Framework" )
 
-      PerformChanges(depdict, replacePairs, bundleExecPathAbs)
+            cmd01 = "rm -rf %s" % pythonFrameworkPath
+            cmd02 = "rsync -a --safe-links %s/ %s" % (HBPythonFrameworkPath, pythonFrameworkPath)
 
-      print("  [9.3] Relinking dylib dependencies for klayout")
-      klayoutPath = bundleExecPathAbs
-      depdict = WalkFrameworkPaths(klayoutPath, filter_regex=r'klayout$')
-      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+            cmd03 = "rm -rf %s" % testTarget
+            cmd04 = "rm -rf %s" % resourceTarget1
+            cmd05 = "unlink %s" % resourceTarget2
+            cmd06 = "rm -rf %s" % binTarget
 
-      libKlayoutPath = bundleExecPathAbs + '../Frameworks'
-      depdict = WalkFrameworkPaths(libKlayoutPath, filter_regex=r'libklayout')
-      PerformChanges(depdict, [(HBPython38FrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+            cmd07 = "mkdir %s" % sitepackagesTarget
+            cmd08 = "cp -RL %s/{pip*,pkg_resources,setuptools*,wheel*} %s" % (sitepackagesSource, sitepackagesTarget)
 
-      print("  [9.4] Patching site.py, pip/, and distutils/")
-      site_module = "%s/Versions/%s/lib/python%s/site.py" % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
-      with open(site_module, 'r') as site:
-        buf = site.readlines()
-      with open(site_module, 'w') as site:
-        import re
-        for line in buf:
-          # This will fool pip into thinking it's inside a virtual environment
-          # and install new packages to the correct site-packages
-          if re.match("^PREFIXES", line) is not None:
-            line = line + "sys.real_prefix = sys.prefix\n"
-          # do not allow installation in the user folder.
-          if re.match("^ENABLE_USER_SITE", line) is not None:
-            line = "ENABLE_USER_SITE = False\n"
-          site.write(line)
+            shell_commands = list()
+            shell_commands.append(cmd01)
+            shell_commands.append(cmd02)
+            shell_commands.append(cmd03)
+            shell_commands.append(cmd04)
+            shell_commands.append(cmd05)
+            shell_commands.append(cmd06)
+            shell_commands.append(cmd07)
+            shell_commands.append(cmd08)
 
-      #----------------------------------------------------------------------------------
-      # Typical usage of 'pip' after installation of the DMG package
-      #
-      # $ /Applications/klayout.app/Contents/MacOS/start-console.py
-      # Warning: Populating font family aliases took 195 ms. Replace uses of missing font\
-      # family "Monospace" with one that exists to avoid this cost.
-      # Python 3.7.8 (default, Jul  4 2020, 10:17:17)
-      # [Clang 11.0.3 (clang-1103.0.32.62)] on darwin
-      # Type "help", "copyright", "credits" or "license" for more information.
-      # (KLayout Python Console)
-      # >>> import pip
-      # >>> pip.main( ['install', 'numpy'] )
-      # >>> pip.main( ['install', 'scipy'] )
-      # >>> pip.main( ['install', 'pandas'] )
-      # >>> pip.main( ['install', 'matplotlib'] )
-      #----------------------------------------------------------------------------------
-      pip_module = "%s/Versions/%s/lib/python%s/site-packages/pip/__init__.py" % \
-                   (pythonFrameworkPath, pythonHBVer, pythonHBVer)
-      with open(pip_module, 'r') as pip:
-        buf = pip.readlines()
-      with open(pip_module, 'w') as pip:
-        import re
-        for line in buf:
-          # this will reject user's configuration of pip, forcing the isolated mode
-          line = re.sub("return isolated$", "return isolated or True", line)
-          pip.write(line)
+            for command in shell_commands:
+                if subprocess.call( command, shell=True ) != 0:
+                    msg = "command failed: %s"
+                    print( msg % command, file=sys.stderr )
+                    sys.exit(1)
 
-      distutilsconfig = "%s/Versions/%s/lib/python%s/distutils/distutils.cfg" % \
-                        (pythonFrameworkPath, pythonHBVer, pythonHBVer)
-      with open(distutilsconfig, 'r') as file:
-        buf = file.readlines()
-      with open(distutilsconfig, 'w') as file:
-        import re
-        for line in buf:
-          # This will cause all packages to be installed to sys.prefix
-          if re.match('prefix=', line) is not None:
-            continue
-          file.write(line)
+            shutil.copy2( sourceDir2 + "/start-console.py", targetDirM )
+            shutil.copy2( sourceDir2 + "/klayout_console",  targetDirM )
+            os.chmod( targetDirM + "/start-console.py", 0o0755 )
+            os.chmod( targetDirM + "/klayout_console",  0o0755 )
 
-    #-------------------------------------------------------------
-    # [10] Special deployment of Ruby2.7 from Homebrew?
-    #-------------------------------------------------------------
-    deploymentRuby26HB = (ModuleRuby == 'Ruby27Brew')
-    if deploymentRuby26HB and NonOSStdLang:
+            print("  [9.2] Relinking dylib dependencies inside Python.framework" )
+            print("   [9.2.1] Patching Python Framework" )
+            depdict = WalkFrameworkPaths( pythonFrameworkPath )
+            appPythonFrameworkPath = '@executable_path/../Frameworks/Python.framework/'
+            PerformChanges(depdict, [(HBPythonFrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
 
-      print( "" )
-      print( " [10] You have reached optional deployment of Ruby from %s ..." % HBRuby27Path )
-      print( "   [!!!] Sorry, the deployed package will not work properly since deployment of" )
-      print( "         Ruby2.7 from Homebrew is not yet supported." )
-      print( "         Since you have Homebrew development environment, there two options:" )
-      print( "           (1) Retry to make a package with '-Y|--DEPLOY' option." )
-      print( "               This will not deploy any of Qt5, Python, and Ruby from Homebrew." )
-      print( "               Instead, the package will directly use those Frameworks and libraries" )
-      print( "               in your Homebrew environment." )
-      print( "           (2) Rebuild KLayout with '-r|--ruby <nil|Sys>' option depending on your preference." )
-      print( "" )
+            print("   [9.2.2] Patching /usr/local/opt/ libs")
+            usrLocalPath = '/usr/local/opt/'
+            appUsrLocalPath = '@executable_path/../Frameworks/'
+            replacePairs = [(usrLocalPath, appUsrLocalPath, True)]
+            depdict = WalkFrameworkPaths(pythonFrameworkPath, search_path_filter=r'\t+/usr/local/(opt|Cellar)')
+            PerformChanges(depdict, replacePairs, bundleExecPathAbs)
 
-  else:
-    print( " [8] Skipped deploying Qt's Frameworks and optional Python/Ruby Frameworks..." )
-  print( "##### Finished deploying libraries and executables for <klayout.app> #####" )
-  print("")
-  os.chdir(ProjectDir)
-  return 0
+            print("   [9.2.3] Patching openssl@1.1, gdbm, readline, sqlite, xz")
+            usrLocalPath = '/usr/local/opt'
+            appUsrLocalPath = '@executable_path/../Frameworks/'
+            replacePairs = [(usrLocalPath, appUsrLocalPath, True)]
+            replacePairs.extend([(openssl_version, '@executable_path/../Frameworks/openssl@1.1', True)
+                for openssl_version in glob.glob('/usr/local/Cellar/openssl@1.1/*')])
+            depdict = WalkFrameworkPaths([pythonFrameworkPath + '/../openssl@1.1',
+                                                                        pythonFrameworkPath + '/../gdbm',
+                                                                        pythonFrameworkPath + '/../readline',
+                                                                        pythonFrameworkPath + '/../sqlite',
+                                                                        pythonFrameworkPath + '/../xz'], search_path_filter=r'\t+/usr/local/(opt|Cellar)')
+
+            PerformChanges(depdict, replacePairs, bundleExecPathAbs)
+
+            print("  [9.3] Relinking dylib dependencies for klayout")
+            klayoutPath = bundleExecPathAbs
+            depdict = WalkFrameworkPaths(klayoutPath, filter_regex=r'klayout$')
+            PerformChanges(depdict, [(HBPythonFrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+
+            libKlayoutPath = bundleExecPathAbs + '../Frameworks'
+            depdict = WalkFrameworkPaths(libKlayoutPath, filter_regex=r'libklayout')
+            PerformChanges(depdict, [(HBPythonFrameworkPath, appPythonFrameworkPath, False)], bundleExecPathAbs)
+
+            print("  [9.4] Patching site.py, pip/, and distutils/")
+            site_module = "%s/Versions/%s/lib/python%s/site.py" % (pythonFrameworkPath, pythonHBVer, pythonHBVer)
+            with open(site_module, 'r') as site:
+                buf = site.readlines()
+            with open(site_module, 'w') as site:
+                import re
+                for line in buf:
+                    # This will fool pip into thinking it's inside a virtual environment
+                    # and install new packages to the correct site-packages
+                    if re.match("^PREFIXES", line) is not None:
+                        line = line + "sys.real_prefix = sys.prefix\n"
+                    # do not allow installation in the user folder.
+                    if re.match("^ENABLE_USER_SITE", line) is not None:
+                        line = "ENABLE_USER_SITE = False\n"
+                    site.write(line)
+
+            #----------------------------------------------------------------------------------
+            # Typical usage of 'pip' after installation of the DMG package
+            #
+            # $ /Applications/klayout.app/Contents/MacOS/start-console.py
+            # Warning: Populating font family aliases took 195 ms. Replace uses of missing font\
+            # family "Monospace" with one that exists to avoid this cost.
+            # Python 3.7.8 (default, Jul  4 2020, 10:17:17)
+            # [Clang 11.0.3 (clang-1103.0.32.62)] on darwin
+            # Type "help", "copyright", "credits" or "license" for more information.
+            # (KLayout Python Console)
+            # >>> import pip
+            # >>> pip.main( ['install', 'numpy'] )
+            # >>> pip.main( ['install', 'scipy'] )
+            # >>> pip.main( ['install', 'pandas'] )
+            # >>> pip.main( ['install', 'matplotlib'] )
+            #----------------------------------------------------------------------------------
+            pip_module = "%s/Versions/%s/lib/python%s/site-packages/pip/__init__.py" % \
+                                     (pythonFrameworkPath, pythonHBVer, pythonHBVer)
+            with open(pip_module, 'r') as pip:
+                buf = pip.readlines()
+            with open(pip_module, 'w') as pip:
+                import re
+                for line in buf:
+                    # this will reject user's configuration of pip, forcing the isolated mode
+                    line = re.sub("return isolated$", "return isolated or True", line)
+                    pip.write(line)
+
+            distutilsconfig = "%s/Versions/%s/lib/python%s/distutils/distutils.cfg" % \
+                                                (pythonFrameworkPath, pythonHBVer, pythonHBVer)
+            with open(distutilsconfig, 'r') as file:
+                buf = file.readlines()
+            with open(distutilsconfig, 'w') as file:
+                import re
+                for line in buf:
+                    # This will cause all packages to be installed to sys.prefix
+                    if re.match('prefix=', line) is not None:
+                        continue
+                    file.write(line)
+
+        #-------------------------------------------------------------
+        # [10] Special deployment of Ruby2.7 from Homebrew?
+        #-------------------------------------------------------------
+        deploymentRuby27HB = (ModuleRuby == 'Ruby27Brew')
+        if deploymentRuby27HB and NonOSStdLang:
+
+            print( "" )
+            print( " [10] You have reached optional deployment of Ruby from %s ..." % HBRuby27Path )
+            print( "   [!!!] Sorry, the deployed package will not work properly since deployment of" )
+            print( "         Ruby2.7 from Homebrew is not yet supported." )
+            print( "         Since you have Homebrew development environment, there two options:" )
+            print( "           (1) Retry to make a package with '-Y|--DEPLOY' option." )
+            print( "               This will not deploy any of Qt5, Python, and Ruby from Homebrew." )
+            print( "               Instead, the package will directly use those Frameworks and libraries" )
+            print( "               in your Homebrew environment." )
+            print( "           (2) Rebuild KLayout with '-r|--ruby <nil|Sys>' option depending on your preference." )
+            print( "" )
+
+    else:
+        print( " [8] Skipped deploying Qt's Frameworks and optional Python/Ruby Frameworks..." )
+    print( "##### Finished deploying libraries and executables for <klayout.app> #####" )
+    print("")
+    os.chdir(ProjectDir)
+    return 0
 
 #------------------------------------------------------------------------------
 ## The main function
 #------------------------------------------------------------------------------
-def main():
-  SetGlobals()
-  ParseCommandLineArguments()
+def Main():
+    pp = pprint.PrettyPrinter( indent=4, width=140 )
+    config = Get_Default_Config()
+    Parse_CLI_Args(config)
 
-  #----------------------------------------------------------
-  # [The main build stage]
-  #----------------------------------------------------------
-  ret = RunMainBuildBash()
-  if not DeploymentF and not DeploymentP:
-    if not ret == 0:
-      sys.exit(1)
-  else:
     #----------------------------------------------------------
-    # [The deployment stage]
-    #   Deployment of dynamic link libraries, executables and
-    #   resources to make the main "klayout.app" bundle
+    # [The main build stage]
     #----------------------------------------------------------
-    ret = DeployBinariesForBundle()
-    if not ret == 0:
-      sys.exit(1)
+    parameters = Get_Build_Parameters(config)
+    pp.pprint(parameters)
+
+    if not config['DeploymentF'] and not config['DeploymentP']:
+        ret = Run_Build_Command(parameters)
+        pp.pprint(config)
+        if not ret == 0:
+            sys.exit(1)
+    else:
+        #----------------------------------------------------------
+        # [The deployment stage]
+        #   Deployment of dynamic link libraries, executables and
+        #   resources to make the main "klayout.app" bundle
+        #----------------------------------------------------------
+        ret = Deploy_Binaries_For_Bundle(config, parameters)
+        if not ret == 0:
+            sys.exit(1)
 
 #===================================================================================
 if __name__ == "__main__":
-  main()
+    Main()
 
 #---------------
 # End of file
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index b87bb8a9d..ea3a84f22 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -11,7 +11,7 @@
 # This file is imported by 'build4mac.py' script.
 #===============================================================================
 import os
-MyHome = os.environ['HOME']
+import glob
 
 #-----------------------------------------------------
 # [0] Xcode's tools
@@ -54,8 +54,8 @@ Qt5Ana3 = { 'qmake' : '/Applications/anaconda3/bin/qmake',
 # [2] Ruby
 #-----------------------------------------------------
 RubyNil = [ 'nil' ]
-RubySys = [ 'RubyElCapitan', 'RubySierra', 'RubyHighSierra', 'RubyMojave', 'RubyCatalina' ]
-RubyExt = [ 'Ruby26MacPorts', 'Ruby27Brew', 'RubyAnaconda3' ]
+RubySys = [ 'RubyElCapitan', 'RubySierra', 'RubyHighSierra', 'RubyMojave', 'RubyCatalina', 'RubyBigSur' ]
+RubyExt = [ 'Ruby27MacPorts', 'Ruby27Brew', 'RubyAnaconda3' ]
 Rubies  = RubyNil + RubySys + RubyExt
 
 #-----------------------------------------------------
@@ -103,19 +103,43 @@ RubyMojave      = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/2
 # Bundled with Catalina (10.15)
 #   !!! Catalina does not allow to hack the "/System" directory; it's READ ONLY even for the super user!
 #       Hence, we need to refer to the Ruby header file in "Xcode.app" directly.
+#
+#   With the major release of "macOS Big Sur (11.0)" in November 2020, Xcode has been updated, too.
+#     (base) MacBookPro2{kazzz-s}(1)$ pwd
+#     /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/include/ruby-2.6.0
+#
+#     (base) MacBookPro2{kazzz-s}(2)$ ll
+#     total 4
+#     drwxr-xr-x  6 root wheel 192 11 15 20:57 .
+#     drwxr-xr-x  3 root wheel  96 10 20 05:33 ..
+#     drwxr-xr-x 23 root wheel 736 10 24 11:57 ruby
+#     -rw-r--r--  1 root wheel 868 10 19 19:32 ruby.h
+#     lrwxr-xr-x  1 root wheel  19 11 15 20:57 universal-darwin19 -> universal-darwin20/ <=== manually created this symbolic link
+#     drwxr-xr-x  6 root wheel 192 10 20 05:33 universal-darwin20
 # [Key Type Name] = 'Sys'
-CatalinaSDK = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk"
-RubyCatalina    = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/bin/ruby',
-                    'inc': '%s/System/Library/Frameworks/Ruby.framework/Headers' % CatalinaSDK,
-                    'lib': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.dylib'
+CatalinaSDK     = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
+RubyCatalina    = { 'exe':  '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/bin/ruby',
+                    'inc':  '%s/System/Library/Frameworks/Ruby.framework/Headers' % CatalinaSDK,
+                    'inc2': '%s/System/Library/Frameworks/Ruby.framework/Headers/ruby' % CatalinaSDK,
+                    'lib':  '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.dylib'
                   }
 
-# Ruby 2.6 from MacPorts (https://www.macports.org/) *+*+*+ EXPERIMENTAL *+*+*+
-#  install with 'sudo port install ruby26'
-# [Key Type Name] = 'MP26'
-Ruby26MacPorts  = { 'exe': '/opt/local/bin/ruby2.6',
-                    'inc': '/opt/local/include/ruby-2.6.0',
-                    'lib': '/opt/local/lib/libruby.2.6.dylib'
+# Bundled with Big Sur (11.0)
+# Refer to the "Catalina" section above
+# [Key Type Name] = 'Sys'
+BigSurSDK       = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
+RubyBigSur      = { 'exe':  '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/bin/ruby',
+                    'inc':  '%s/System/Library/Frameworks/Ruby.framework/Headers' % BigSurSDK,
+                    'inc2': '%s/System/Library/Frameworks/Ruby.framework/Headers/ruby' % BigSurSDK,
+                    'lib':  '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.dylib'
+                  }
+
+# Ruby 2.7 from MacPorts (https://www.macports.org/) *+*+*+ EXPERIMENTAL *+*+*+
+#  install with 'sudo port install ruby27'
+# [Key Type Name] = 'MP27'
+Ruby27MacPorts  = { 'exe': '/opt/local/bin/ruby2.7',
+                    'inc': '/opt/local/include/ruby-2.7.0',
+                    'lib': '/opt/local/lib/libruby.2.7.dylib'
                   }
 
 # Ruby 2.7 from Homebrew *+*+*+ EXPERIMENTAL *+*+*+
@@ -144,7 +168,8 @@ RubyDictionary  = { 'nil'           : None,
                     'RubyHighSierra': RubyHighSierra,
                     'RubyMojave'    : RubyMojave,
                     'RubyCatalina'  : RubyCatalina,
-                    'Ruby26MacPorts': Ruby26MacPorts,
+                    'RubyBigSur'    : RubyBigSur,
+                    'Ruby27MacPorts': Ruby27MacPorts,
                     'Ruby27Brew'    : Ruby27Brew,
                     'RubyAnaconda3' : RubyAnaconda3
                   }
@@ -153,8 +178,8 @@ RubyDictionary  = { 'nil'           : None,
 # [3] Python
 #-----------------------------------------------------
 PythonNil = [ 'nil' ]
-PythonSys = [ 'PythonElCapitan', 'PythonSierra', 'PythonHighSierra', 'PythonMojave', 'PythonCatalina' ]
-PythonExt = [ 'Python38MacPorts', 'Python38Brew', 'PythonAnaconda3' ]
+PythonSys = [ 'PythonElCapitan', 'PythonSierra', 'PythonHighSierra', 'PythonMojave', 'PythonCatalina', 'PythonBigSur' ]
+PythonExt = [ 'Python38MacPorts', 'Python38Brew', 'PythonAnaconda3', 'PythonAutoBrew' ]
 Pythons   = PythonNil + PythonSys + PythonExt
 
 #-----------------------------------------------------
@@ -197,13 +222,20 @@ PythonMojave    = { 'exe': '/System/Library/Frameworks/Python.framework/Versions
                     'lib': '/System/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib'
                   }
 
-# Bundled with Mojave (10.15)
+# Bundled with Catalina (10.15)
 # [Key Type Name] = 'Sys'
 PythonCatalina  = { 'exe': '/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python',
                     'inc': '/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7',
                     'lib': '/System/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib'
                   }
 
+# Bundled with Big Sur (11.0)
+# [Key Type Name] = 'Sys'
+PythonBigSur    = { 'exe': '/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python',
+                    'inc': '/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7',
+                    'lib': '/System/Library/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib'
+                  }
+
 # Python 3.8 from MacPorts (https://www.macports.org/) *+*+*+ EXPERIMENTAL *+*+*+
 #   install with 'sudo port install python38'
 # [Key Type Name] = 'MP38'
@@ -215,7 +247,7 @@ Python38MacPorts= { 'exe': '/opt/local/Library/Frameworks/Python.framework/Versi
 # Python 3.8 from Homebrew *+*+*+ EXPERIMENTAL *+*+*+
 #   install with 'brew install python'
 # [Key Type Name] = 'HB38'
-HBPython38FrameworkPath = '/usr/local/opt/python3/Frameworks/Python.framework'
+HBPython38FrameworkPath = '/usr/local/opt/python@3.8/Frameworks/Python.framework'
 Python38Brew    = { 'exe': '%s/Versions/3.8/bin/python3.8' % HBPython38FrameworkPath,
                     'inc': '%s/Versions/3.8/include/python3.8' % HBPython38FrameworkPath,
                     'lib': '%s/Versions/3.8/lib/libpython3.8.dylib' % HBPython38FrameworkPath
@@ -230,17 +262,42 @@ PythonAnaconda3 = { 'exe': '/Applications/anaconda3/bin/python3.8',
                     'lib': '/Applications/anaconda3/lib/libpython3.8.dylib'
                   }
 
+# Latest Python from Homebrew *+*+*+ EXPERIMENTAL *+*+*+
+#   install with 'brew install python'
+#   There can be multiple candidates such as: (python, python3, python@3, python@3.8, python@3.9)
+#   Hard to tell which is going to be available to the user. Picking the last one.
+# [Key Type Name] = 'HBAuto'
+HBPythonAutoFrameworkPath = ""
+HBPythonAutoVersion       = ""
+try:
+    HBPythonAutoFrameworkPath = glob.glob( "/usr/local/opt/python*/Frameworks/Python.framework" )[-1]
+    # expand 3* into HBPythonAutoVersion, there should be only one, but I am taking no chances.
+    HBAutoFrameworkVersionPath, HBPythonAutoVersion = os.path.split( glob.glob( "%s/Versions/3*" % HBPythonAutoFrameworkPath )[0] )
+    PythonAutoBrew  = { 'exe': '%s/%s/bin/python%s' % ( HBAutoFrameworkVersionPath, HBPythonAutoVersion, HBPythonAutoVersion ),
+                        'inc': '%s/%s/include/python%s' % ( HBAutoFrameworkVersionPath, HBPythonAutoVersion, HBPythonAutoVersion ),
+                        'lib': glob.glob( "%s/%s/lib/*.dylib" % ( HBAutoFrameworkVersionPath, HBPythonAutoVersion ) )[0]
+                      }
+except Exception as e:
+    _have_Homebrew_Python = False
+    print( "  WARNING!!! Since you don't have the Homebrew Python Frameworks, you cannot use the '-p HBAuto' option. " )
+    pass
+else:
+    _have_Homebrew_Python = True
+
 # Consolidated dictionary kit for Python
-PythonDictionary= { 'nil'             : None,
-                    'PythonElCapitan' : PythonElCapitan,
-                    'PythonSierra'    : PythonSierra,
-                    'PythonHighSierra': PythonHighSierra,
-                    'PythonMojave'    : PythonMojave,
-                    'PythonCatalina'  : PythonCatalina,
-                    'Python38MacPorts': Python38MacPorts,
-                    'Python38Brew'    : Python38Brew,
-                    'PythonAnaconda3' : PythonAnaconda3
-                  }
+PythonDictionary = { 'nil'             : None,
+                     'PythonElCapitan' : PythonElCapitan,
+                     'PythonSierra'    : PythonSierra,
+                     'PythonHighSierra': PythonHighSierra,
+                     'PythonMojave'    : PythonMojave,
+                     'PythonCatalina'  : PythonCatalina,
+                     'PythonBigSur'    : PythonBigSur,
+                     'Python38MacPorts': Python38MacPorts,
+                     'Python38Brew'    : Python38Brew,
+                     'PythonAnaconda3' : PythonAnaconda3
+                   }
+if _have_Homebrew_Python:
+    PythonDictionary['PythonAutoBrew'] = PythonAutoBrew
 
 #-----------------------------------------------------
 # [4] KLayout executables including buddy tools
diff --git a/macbuild/build4mac_util.py b/macbuild/build4mac_util.py
index 3c330f8fd..0c6d0d5cc 100755
--- a/macbuild/build4mac_util.py
+++ b/macbuild/build4mac_util.py
@@ -43,15 +43,15 @@ from build4mac_env  import *
 # @return a dictionary
 #----------------------------------------------------------------------------------------
 def DecomposeLibraryDependency( depstr ):
-  alllines   = depstr.split('\n')
-  numlines   = len(alllines)
-  dependent  = alllines[0].split(':')[0].strip()
-  supporters = []
-  for line in alllines[1:]:
-    supporter = line.strip().split(' ')[0].strip()
-    if not supporter == '':
-      supporters.append(supporter)
-  return { dependent: supporters }
+    alllines   = depstr.split('\n')
+    numlines   = len(alllines)
+    dependent  = alllines[0].split(':')[0].strip()
+    supporters = []
+    for line in alllines[1:]:
+        supporter = line.strip().split(' ')[0].strip()
+        if not supporter == '':
+            supporters.append(supporter)
+    return { dependent: supporters }
 
 #----------------------------------------------------------------------------------------
 ## To print the contents of a library dependency dictionary
@@ -61,17 +61,17 @@ def DecomposeLibraryDependency( depstr ):
 # @param[in] namedic dictionary name
 #----------------------------------------------------------------------------------------
 def PrintLibraryDependencyDictionary( depdic, pathdic, namedic ):
-  keys = depdic.keys()
-  print("")
-  print("##### Contents of <%s> #####:" % namedic )
-  for key in keys:
-    supporters = depdic[key]
-    keyName = os.path.basename(key)
-    print( " %s: (%s)" % (key, pathdic[keyName]) )
-    for item in supporters:
-      itemName = os.path.basename(item)
-      if itemName != keyName and (itemName in pathdic):
-        print( "    %s (%s)" % (item, pathdic[itemName]) )
+    keys = depdic.keys()
+    print("")
+    print("##### Contents of <%s> #####:" % namedic )
+    for key in keys:
+        supporters = depdic[key]
+        keyName = os.path.basename(key)
+        print( " %s: (%s)" % (key, pathdic[keyName]) )
+        for item in supporters:
+            itemName = os.path.basename(item)
+            if itemName != keyName and (itemName in pathdic):
+                print( "    %s (%s)" % (item, pathdic[itemName]) )
 
 #----------------------------------------------------------------------------------------
 ## To set and change identification name of KLayout's dylib
@@ -81,39 +81,39 @@ def PrintLibraryDependencyDictionary( depdic, pathdic, namedic ):
 # @return 0 on success; non-zero on failure
 #----------------------------------------------------------------------------------------
 def SetChangeIdentificationNameOfDyLib( libdic, pathDic ):
-  cmdNameId     = XcodeToolChain['nameID']
-  cmdNameChg    = XcodeToolChain['nameCH']
-  dependentLibs = libdic.keys()
+    cmdNameId     = XcodeToolChain['nameID']
+    cmdNameChg    = XcodeToolChain['nameCH']
+    dependentLibs = libdic.keys()
 
-  for lib in dependentLibs:
-    #-----------------------------------------------------------
-    # [1] Set the identification name of each dependent library
-    #-----------------------------------------------------------
-    nameOld = "%s" % lib
-    libName = os.path.basename(lib)
-    nameNew = pathDic[libName]
-    command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to set the new identification name to <%s> !!!"
-      print( msg % lib, file=sys.stderr )
-      return 1
-
-    #-------------------------------------------------------------------------
-    # [2] Make the library aware of the new identifications of all supporters
-    #-------------------------------------------------------------------------
-    supporters = libdic[lib]
-    for sup in supporters:
-      supName = os.path.basename(sup)
-      if libName != supName and (supName in pathDic):
-        nameOld = "%s" % sup
-        nameNew = pathDic[supName]
-        command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, lib )
+    for lib in dependentLibs:
+        #-----------------------------------------------------------
+        # [1] Set the identification name of each dependent library
+        #-----------------------------------------------------------
+        nameOld = "%s" % lib
+        libName = os.path.basename(lib)
+        nameNew = pathDic[libName]
+        command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
         if subprocess.call( command, shell=True ) != 0:
-          msg = "!!! Failed to make the library aware of the new identification name <%s> of supporter <%s> !!!"
-          print( msg % (nameNew, sup), file=sys.stderr )
-          return 1
-  # for-lib
-  return 0
+            msg = "!!! Failed to set the new identification name to <%s> !!!"
+            print( msg % lib, file=sys.stderr )
+            return 1
+
+        #-------------------------------------------------------------------------
+        # [2] Make the library aware of the new identifications of all supporters
+        #-------------------------------------------------------------------------
+        supporters = libdic[lib]
+        for sup in supporters:
+            supName = os.path.basename(sup)
+            if libName != supName and (supName in pathDic):
+                nameOld = "%s" % sup
+                nameNew = pathDic[supName]
+                command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, lib )
+                if subprocess.call( command, shell=True ) != 0:
+                    msg = "!!! Failed to make the library aware of the new identification name <%s> of supporter <%s> !!!"
+                    print( msg % (nameNew, sup), file=sys.stderr )
+                    return 1
+    # for-lib
+    return 0
 
 #----------------------------------------------------------------------------------------
 ## To set the identification names of KLayout's libraries to an executable
@@ -148,38 +148,38 @@ def SetChangeIdentificationNameOfDyLib( libdic, pathDic ):
 # @return 0 on success; non-zero on failure
 #----------------------------------------------------------------------------------------
 def SetChangeLibIdentificationName( executable, relativedir ):
-  cmdNameId  = XcodeToolChain['nameID']
-  cmdNameChg = XcodeToolChain['nameCH']
-  otoolCm    = "otool -L %s | grep libklayout" % executable
-  otoolOut   = os.popen( otoolCm ).read()
-  exedepdic  = DecomposeLibraryDependency( executable + ":\n" + otoolOut )
-  keys       = exedepdic.keys()
-  deplibs    = exedepdic[ list(keys)[0] ]
+    cmdNameId  = XcodeToolChain['nameID']
+    cmdNameChg = XcodeToolChain['nameCH']
+    otoolCm    = "otool -L %s | grep libklayout" % executable
+    otoolOut   = os.popen( otoolCm ).read()
+    exedepdic  = DecomposeLibraryDependency( executable + ":\n" + otoolOut )
+    keys       = exedepdic.keys()
+    deplibs    = exedepdic[ list(keys)[0] ]
 
-  for lib in deplibs:
-    #-----------------------------------------------------------
-    # [1] Set the identification names for the library
-    #-----------------------------------------------------------
-    nameOld = "klayout.app/Contents/Frameworks/%s" % lib
-    nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
-    command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to set the new identification name to <%s> !!!"
-      print( msg % lib, file=sys.stderr )
-      return 1
+    for lib in deplibs:
+        #-----------------------------------------------------------
+        # [1] Set the identification names for the library
+        #-----------------------------------------------------------
+        nameOld = "klayout.app/Contents/Frameworks/%s" % lib
+        nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
+        command = "%s %s %s" % ( cmdNameId, nameNew, nameOld )
+        if subprocess.call( command, shell=True ) != 0:
+            msg = "!!! Failed to set the new identification name to <%s> !!!"
+            print( msg % lib, file=sys.stderr )
+            return 1
 
-    #-----------------------------------------------------------
-    # [2] Make the application aware of the new identification
-    #-----------------------------------------------------------
-    nameOld = "%s" % lib
-    nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
-    command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, executable )
-    if subprocess.call( command, shell=True ) != 0:
-      msg = "!!! Failed to make the application aware of the new identification name <%s> !!!"
-      print( msg % nameNew, file=sys.stderr )
-      return 1
-  # for-lib
-  return 0
+        #-----------------------------------------------------------
+        # [2] Make the application aware of the new identification
+        #-----------------------------------------------------------
+        nameOld = "%s" % lib
+        nameNew = "@executable_path/%s/%s"  % ( relativedir, lib )
+        command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, executable )
+        if subprocess.call( command, shell=True ) != 0:
+            msg = "!!! Failed to make the application aware of the new identification name <%s> !!!"
+            print( msg % nameNew, file=sys.stderr )
+            return 1
+    # for-lib
+    return 0
 
 #----------------------------------------------------------------------------------------
 ## To make a library dependency dictionary by recursively walk down the lib hierarchy
@@ -191,23 +191,23 @@ def SetChangeLibIdentificationName( executable, relativedir ):
 # @return a dictionary
 #----------------------------------------------------------------------------------------
 def WalkLibDependencyTree( dylibPath, depth=0, filter_regex=r'\t+/usr/local/opt' ):
-  otoolCm   = 'otool -L %s | grep -E "%s"' % (dylibPath, filter_regex)
-  otoolOut  = os.popen( otoolCm ).read()
-  exedepdic = DecomposeLibraryDependency( dylibPath + ":\n" + otoolOut )
-  keys      = exedepdic.keys()
-  deplibs   = exedepdic[ list(keys)[0] ]
+    otoolCm   = 'otool -L %s | grep -E "%s"' % (dylibPath, filter_regex)
+    otoolOut  = os.popen( otoolCm ).read()
+    exedepdic = DecomposeLibraryDependency( dylibPath + ":\n" + otoolOut )
+    keys      = exedepdic.keys()
+    deplibs   = exedepdic[ list(keys)[0] ]
 
-  if depth < 5:
-    if len(deplibs) > 0:
-      for idx, lib in enumerate(deplibs):
-        lib = str(lib)
-        if lib != list(keys)[0]:
-          deplibs[idx] = WalkLibDependencyTree(lib, depth+1, filter_regex)
-    if depth == 0:
-      return deplibs
-    return exedepdic
-  else:
-    raise RuntimeError( "Exceeded maximum recursion depth." )
+    if depth < 5:
+        if len(deplibs) > 0:
+            for idx, lib in enumerate(deplibs):
+                lib = str(lib)
+                if lib != list(keys)[0]:
+                    deplibs[idx] = WalkLibDependencyTree(lib, depth+1, filter_regex)
+        if depth == 0:
+            return deplibs
+        return exedepdic
+    else:
+        raise RuntimeError( "Exceeded maximum recursion depth." )
 
 #----------------------------------------------------------------------------------------
 ## To make a library dependency dictionary by recursively walk down the Framework
@@ -219,27 +219,27 @@ def WalkLibDependencyTree( dylibPath, depth=0, filter_regex=r'\t+/usr/local/opt'
 # @return a dictionary
 #----------------------------------------------------------------------------------------
 def WalkFrameworkPaths( frameworkPaths, filter_regex=r'\.(so|dylib)$',
-                                        search_path_filter=r'\t+/usr/local/opt' ):
+                                                                                search_path_filter=r'\t+/usr/local/opt' ):
 
-  if isinstance(frameworkPaths, str):
-    frameworkPathsIter = [frameworkPaths]
-  else:
-    frameworkPathsIter = frameworkPaths
+    if isinstance(frameworkPaths, str):
+        frameworkPathsIter = [frameworkPaths]
+    else:
+        frameworkPathsIter = frameworkPaths
 
-  dependency_dict = dict()
+    dependency_dict = dict()
 
-  for frameworkPath in frameworkPathsIter:
-    # print("Calling:", 'find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex))
-    find_grep_results = os.popen('find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex)).read().split('\n')
-    framework_files = filter(lambda x: x != '',
-                          map(lambda x: x.strip(),
-                                find_grep_results))
+    for frameworkPath in frameworkPathsIter:
+        # print("Calling:", 'find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex))
+        find_grep_results = os.popen('find %s -type f | grep -E "%s"' % (frameworkPath, filter_regex)).read().split('\n')
+        framework_files = filter(lambda x: x != '',
+                                                    map(lambda x: x.strip(),
+                                                                find_grep_results))
 
-    dependency_dict[frameworkPath] = list()
-    for idx, file in enumerate(framework_files):
-      dict_file = {file: WalkLibDependencyTree(file, filter_regex=search_path_filter)}
-      dependency_dict[frameworkPath].append(dict_file)
-  return dependency_dict
+        dependency_dict[frameworkPath] = list()
+        for idx, file in enumerate(framework_files):
+            dict_file = {file: WalkLibDependencyTree(file, filter_regex=search_path_filter)}
+            dependency_dict[frameworkPath].append(dict_file)
+    return dependency_dict
 
 #----------------------------------------------------------------------------------------
 ## To make a list of changed libraries
@@ -250,32 +250,32 @@ def WalkFrameworkPaths( frameworkPaths, filter_regex=r'\.(so|dylib)$',
 # @return a list
 #----------------------------------------------------------------------------------------
 def WalkDictTree( dependencyDict, visited_files ):
-  libNameChanges = list()
-  for lib, dependencies in dependencyDict.items():
-    if lib in visited_files:
-      continue
+    libNameChanges = list()
+    for lib, dependencies in dependencyDict.items():
+        if lib in visited_files:
+            continue
 
-    dependency_list = list()
-    if isinstance(dependencies, list):
-      for deplib in dependencies:
-        if isinstance(deplib, str):
-          dependency_list.append(deplib)
-          if deplib not in visited_files:
-            visited_files.append(deplib)
-        elif isinstance(deplib, dict):
-          dependency_list.append(next(iter(deplib)))
-          libNameChanges.extend(WalkDictTree(deplib, visited_files))
+        dependency_list = list()
+        if isinstance(dependencies, list):
+            for deplib in dependencies:
+                if isinstance(deplib, str):
+                    dependency_list.append(deplib)
+                    if deplib not in visited_files:
+                        visited_files.append(deplib)
+                elif isinstance(deplib, dict):
+                    dependency_list.append(next(iter(deplib)))
+                    libNameChanges.extend(WalkDictTree(deplib, visited_files))
+                else:
+                    #raise RuntimeError("Unexpected value: %s" % deplib)
+                    pass
         else:
-          #raise RuntimeError("Unexpected value: %s" % deplib)
-          pass
-    else:
-      raise RuntimeError("Unexpected value: %s" % dependencies)
-    if len(dependency_list) > 0:
-      libNameChanges.append((lib, dependency_list))
-    else:
-      libNameChanges.append((lib, ))
-    visited_files.append(lib)
-  return libNameChanges
+            raise RuntimeError("Unexpected value: %s" % dependencies)
+        if len(dependency_list) > 0:
+            libNameChanges.append((lib, dependency_list))
+        else:
+            libNameChanges.append((lib, ))
+        visited_files.append(lib)
+    return libNameChanges
 
 #----------------------------------------------------------------------------------------
 ## To find the Framework name from a library name
@@ -286,10 +286,10 @@ def WalkDictTree( dependencyDict, visited_files ):
 # @return the path to a Framework
 #----------------------------------------------------------------------------------------
 def FindFramework( path, root_path ):
-  relPath = os.path.relpath(path, root_path)
-  frmPath = os.path.join(root_path, relPath.split(os.sep)[0])
-  #print( "###", frmPath, path, root_path )
-  return frmPath
+    relPath = os.path.relpath(path, root_path)
+    frmPath = os.path.join(root_path, relPath.split(os.sep)[0])
+    #print( "###", frmPath, path, root_path )
+    return frmPath
 
 #----------------------------------------------------------------------------------------
 ## To resolve an executable path
@@ -300,9 +300,9 @@ def FindFramework( path, root_path ):
 # @return the resolved path
 #----------------------------------------------------------------------------------------
 def ResolveExecutablePath( path, executable_path ):
-  """ Transforms @executable_path into executable_path"""
-  p = path.replace("@executable_path", "/%s/" % executable_path)
-  return p
+    """ Transforms @executable_path into executable_path"""
+    p = path.replace("@executable_path", "/%s/" % executable_path)
+    return p
 
 #----------------------------------------------------------------------------------------
 ## To detect the changed library names
@@ -315,12 +315,12 @@ def ResolveExecutablePath( path, executable_path ):
 #         * ('lib.dylib',)
 #----------------------------------------------------------------------------------------
 def DetectChanges(frameworkDependencyDict):
-  visited_files = list()
-  libNameChanges = list()
-  for framework, libraries in frameworkDependencyDict.items():
-    for libraryDict in libraries:
-      libNameChanges.extend(WalkDictTree(libraryDict, visited_files))
-  return libNameChanges
+    visited_files = list()
+    libNameChanges = list()
+    for framework, libraries in frameworkDependencyDict.items():
+        for libraryDict in libraries:
+            libNameChanges.extend(WalkDictTree(libraryDict, visited_files))
+    return libNameChanges
 
 #----------------------------------------------------------------------------------------
 ## To perform the required changes
@@ -332,79 +332,79 @@ def DetectChanges(frameworkDependencyDict):
 # @return 0 on success; > 0 on failure
 #----------------------------------------------------------------------------------------
 def PerformChanges( frameworkDependencyDict, replaceFromToPairs=None, executable_path="/tmp/klayout" ):
-  libNameChanges = DetectChanges(frameworkDependencyDict)
-  #print(libNameChanges)
-  cmdNameId  = XcodeToolChain['nameID']
-  cmdNameChg = XcodeToolChain['nameCH']
+    libNameChanges = DetectChanges(frameworkDependencyDict)
+    #print(libNameChanges)
+    cmdNameId  = XcodeToolChain['nameID']
+    cmdNameChg = XcodeToolChain['nameCH']
 
-  if replaceFromToPairs is None:
-    return 0
-  else:
-    for libNameChange in libNameChanges:
-      libNameChangeIterator = iter(libNameChange)
-      lib = next(libNameChangeIterator)
-      try:
-        dependencies = next(libNameChangeIterator)
-      except StopIteration:
-        dependencies = list()
-      for replaceFrom, replaceTo, libdir in replaceFromToPairs:
-        fileName = ResolveExecutablePath(lib.replace(replaceFrom, replaceTo), executable_path)
-        if fileName.startswith('/usr'):
-          # print(f'skipping fileName: {fileName}')
-          continue
+    if replaceFromToPairs is None:
+        return 0
+    else:
+        for libNameChange in libNameChanges:
+            libNameChangeIterator = iter(libNameChange)
+            lib = next(libNameChangeIterator)
+            try:
+                dependencies = next(libNameChangeIterator)
+            except StopIteration:
+                dependencies = list()
+            for replaceFrom, replaceTo, libdir in replaceFromToPairs:
+                fileName = ResolveExecutablePath(lib.replace(replaceFrom, replaceTo), executable_path)
+                if fileName.startswith('/usr'):
+                    # print(f'skipping fileName: {fileName}')
+                    continue
 
-        if lib.find(replaceFrom) >= 0:
-          if libdir:
-            frameworkPath = FindFramework(lib, replaceFrom)
-          else:
-            frameworkPath = lib
-          destFrameworkPath = frameworkPath.replace(replaceFrom, replaceTo)
-          destFrameworkPath = ResolveExecutablePath(destFrameworkPath, executable_path)
+                if lib.find(replaceFrom) >= 0:
+                    if libdir:
+                        frameworkPath = FindFramework(lib, replaceFrom)
+                    else:
+                        frameworkPath = lib
+                    destFrameworkPath = frameworkPath.replace(replaceFrom, replaceTo)
+                    destFrameworkPath = ResolveExecutablePath(destFrameworkPath, executable_path)
 
-          if not os.path.exists(fileName):
-            print( "     NOT FOUND:", lib.replace(replaceFrom, replaceTo) )
-            print( "       COPYING:", frameworkPath, " -> ", destFrameworkPath )
-            shutil.copytree(frameworkPath, destFrameworkPath)
+                    if not os.path.exists(fileName):
+                        print( "     NOT FOUND:", lib.replace(replaceFrom, replaceTo) )
+                        print( "       COPYING:", frameworkPath, " -> ", destFrameworkPath )
+                        shutil.copytree(frameworkPath, destFrameworkPath)
 
-          nameId = lib.replace(replaceFrom, replaceTo)
-          command = "%s %s %s" % ( cmdNameId, nameId, fileName )
-          if not os.access(fileName, os.W_OK):
-            command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
-          # print("\t%s" % command)
-          if subprocess.call( command, shell=True ) != 0:
-            msg = "!!! Failed to set the new identification name to <%s> !!!"
-            print( msg % fileName, file=sys.stderr )
-            return 1
+                    nameId = lib.replace(replaceFrom, replaceTo)
+                    command = "%s %s %s" % ( cmdNameId, nameId, fileName )
+                    if not os.access(fileName, os.W_OK):
+                        command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
+                    # print("\t%s" % command)
+                    if subprocess.call( command, shell=True ) != 0:
+                        msg = "!!! Failed to set the new identification name to <%s> !!!"
+                        print( msg % fileName, file=sys.stderr )
+                        return 1
 
-        for dependency in dependencies:
-          if dependency.find(replaceFrom) >= 0:
-            print( "       IN:", fileName )
-            print( "         RENAMING:", dependency, " -> ", dependency.replace(replaceFrom, replaceTo) )
+                for dependency in dependencies:
+                    if dependency.find(replaceFrom) >= 0:
+                        print( "       IN:", fileName )
+                        print( "         RENAMING:", dependency, " -> ", dependency.replace(replaceFrom, replaceTo) )
 
-            # Try changing id first
-            nameId = dependency.replace(replaceFrom, replaceTo)
-            command = "%s %s %s" % ( cmdNameId, nameId, fileName)
-            if not os.access(str(fileName), os.W_OK):
-              command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
-              # print("\t%s" % command)
-            if subprocess.call( command, shell=True ) != 0:
-              msg = "!!! Failed to set the new identification name to <%s> !!!"
-              print( msg % fileName, file=sys.stderr )
-              return 1
+                        # Try changing id first
+                        nameId = dependency.replace(replaceFrom, replaceTo)
+                        command = "%s %s %s" % ( cmdNameId, nameId, fileName)
+                        if not os.access(str(fileName), os.W_OK):
+                            command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
+                            # print("\t%s" % command)
+                        if subprocess.call( command, shell=True ) != 0:
+                            msg = "!!! Failed to set the new identification name to <%s> !!!"
+                            print( msg % fileName, file=sys.stderr )
+                            return 1
 
-            # Rename dependencies
-            nameOld = dependency
-            nameNew = dependency.replace(replaceFrom, replaceTo)
-            command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, str(fileName) )
-            if not os.access(str(fileName), os.W_OK):
-              command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
+                        # Rename dependencies
+                        nameOld = dependency
+                        nameNew = dependency.replace(replaceFrom, replaceTo)
+                        command = "%s %s %s %s" % ( cmdNameChg, nameOld, nameNew, str(fileName) )
+                        if not os.access(str(fileName), os.W_OK):
+                            command = "chmod u+w %s; %s; chmod u-w %s" % (fileName, command, fileName)
 
-            # print("\t%s" % command)
-            if subprocess.call( command, shell=True ) != 0:
-              msg = "!!! Failed to set the new identification name to <%s> !!!"
-              print( msg % fileName, file=sys.stderr )
-              return 1
-    return 0
+                        # print("\t%s" % command)
+                        if subprocess.call( command, shell=True ) != 0:
+                            msg = "!!! Failed to set the new identification name to <%s> !!!"
+                            print( msg % fileName, file=sys.stderr )
+                            return 1
+        return 0
 
 #----------------------------------------------------------------------------------------
 ## To get KLayout's version from a file; most likely from 'version.sh'
@@ -414,25 +414,25 @@ def PerformChanges( frameworkDependencyDict, replaceFromToPairs=None, executable
 # @return version string
 #----------------------------------------------------------------------------------------
 def GetKLayoutVersionFrom( verfile='version.h' ):
-  version = "?.?.?"
-  try:
-    fd = open( verfile, "r" )
-    contents = fd.readlines()
-    fd.close()
-  except Exception as e:
-    return version
+    version = "?.?.?"
+    try:
+        fd = open( verfile, "r" )
+        contents = fd.readlines()
+        fd.close()
+    except Exception as e:
+        return version
 
-  verReg = re.compile( u'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
-  for line in contents:
-    m = verReg.match(line)
-    if m:
-      # print(m.group(0)) # KLAYOUT_VERSION="0.26.1"
-      # print(m.group(1)) # KLAYOUT_VERSION="
-      # print(m.group(2)) # 0.26.1
-      # print(m.group(3)) # "
-      version = m.group(2)
-      return version
-  return version
+    verReg = re.compile( u'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
+    for line in contents:
+        m = verReg.match(line)
+        if m:
+            # print(m.group(0)) # KLAYOUT_VERSION="0.26.1"
+            # print(m.group(1)) # KLAYOUT_VERSION="
+            # print(m.group(2)) # 0.26.1
+            # print(m.group(3)) # "
+            version = m.group(2)
+            return version
+    return version
 
 #----------------------------------------------------------------------------------------
 ## To generate the contents of "Info.plist" file from a template
@@ -443,24 +443,24 @@ def GetKLayoutVersionFrom( verfile='version.h' ):
 # @return generated strings
 #----------------------------------------------------------------------------------------
 def GenerateInfoPlist( keydic, templfile ):
-  val_exe   = keydic['exe']
-  val_icon  = keydic['icon']
-  val_bname = keydic['bname']
-  val_ver   = keydic['ver']
+    val_exe   = keydic['exe']
+    val_icon  = keydic['icon']
+    val_bname = keydic['bname']
+    val_ver   = keydic['ver']
 
-  try:
-    fd = open( templfile, "r" )
-    template = fd.read()
-    fd.close()
-  except Exception as e:
-    return "???"
+    try:
+        fd = open( templfile, "r" )
+        template = fd.read()
+        fd.close()
+    except Exception as e:
+        return "???"
 
-  t = string.Template(template)
-  s = t.substitute( EXECUTABLE = val_exe,
-                    ICONFILE   = val_icon,
-                    BUNDLENAME = val_bname,
-                    VERSION    = val_ver)
-  return s
+    t = string.Template(template)
+    s = t.substitute( EXECUTABLE = val_exe,
+                                        ICONFILE   = val_icon,
+                                        BUNDLENAME = val_bname,
+                                        VERSION    = val_ver)
+    return s
 
 #----------------
 # End of File
diff --git a/macbuild/macQAT.py b/macbuild/macQAT.py
index 907330f1c..73e45b956 100755
--- a/macbuild/macQAT.py
+++ b/macbuild/macQAT.py
@@ -16,8 +16,6 @@ import os
 import datetime
 from   time import sleep
 import six
-import shutil
-import glob
 import platform
 import optparse
 import subprocess
@@ -27,55 +25,55 @@ import subprocess
 #
 #-------------------------------------------------------------------------------
 def SetGlobals():
-  global ProjectDir         # project directory where "ut_runner" exists
-  global RunnerUsage        # True to print the usage of 'ut_runner'
-  global Run                # True to run this script
-  global ContinueOnError    # True to continue after an error
-  global TestsExcluded      # list of tests to exclude
-  global Arguments          # other arguments
-  global GitSHA1            # Git's short SHA1 value of the HEAD
-  global TimeStamp          # time stamp
-  global WorkDir            # work directory name
-  global LogFile            # log file name
-  global Usage              # string on usage
-  # auxiliary variables on platform
-  global System             # 6-tuple from platform.uname()
-  global Node               # - do -
-  global Release            # - do -
-  global Version            # - do -
-  global Machine            # - do -
-  global Processor          # - do -
-  global Bit                # machine bit-size
+    global ProjectDir         # project directory where "ut_runner" exists
+    global RunnerUsage        # True to print the usage of 'ut_runner'
+    global Run                # True to run this script
+    global ContinueOnError    # True to continue after an error
+    global TestsExcluded      # list of tests to exclude
+    global Arguments          # other arguments
+    global GitSHA1            # Git's short SHA1 value of the HEAD
+    global TimeStamp          # time stamp
+    global WorkDir            # work directory name
+    global LogFile            # log file name
+    global Usage              # string on usage
+    # auxiliary variables on platform
+    global System             # 6-tuple from platform.uname()
+    global Node               # - do -
+    global Release            # - do -
+    global Version            # - do -
+    global Machine            # - do -
+    global Processor          # - do -
+    global Bit                # machine bit-size
 
-  Usage  = "\n"
-  Usage += "----------------------------------------------------------------------------------------\n"
-  Usage += "<< Usage of 'macQAT.py' >>\n"
-  Usage += "       for running 'ut_runner' after building KLayout.\n"
-  Usage += "\n"
-  Usage += "$ [python] ./macQAT.py \n"
-  Usage += "   option & argument      : descriptions                            | default value\n"
-  Usage += "   -----------------------------------------------------------------+---------------\n"
-  Usage += "   [-u|--usage]           : print usage of 'ut_runner'and exit      | disabled \n"
-  Usage += "                                                                    | \n"
-  Usage += "   <-r|--run>             : run this script                         | disabled \n"
-  Usage += "   [-s|--stop]            : stop on error                           | disabled \n"
-  Usage += "   [-x|--exclude <tests>] : exclude test(s) such as 'pymod,pya'     | '' \n"
-  Usage += "   [-a|--args <string>]   : arguments other than '-x' and '-c'      | '' \n"
-  Usage += "   [-?|--?]               : print this usage and exit               | disabled \n"
-  Usage += "--------------------------------------------------------------------+-------------------\n"
+    Usage  = "\n"
+    Usage += "----------------------------------------------------------------------------------------\n"
+    Usage += "<< Usage of 'macQAT.py' >>\n"
+    Usage += "       for running 'ut_runner' after building KLayout.\n"
+    Usage += "\n"
+    Usage += "$ [python] ./macQAT.py \n"
+    Usage += "   option & argument      : descriptions                            | default value\n"
+    Usage += "   -----------------------------------------------------------------+---------------\n"
+    Usage += "   [-u|--usage]           : print usage of 'ut_runner'and exit      | disabled \n"
+    Usage += "                                                                    | \n"
+    Usage += "   <-r|--run>             : run this script                         | disabled \n"
+    Usage += "   [-s|--stop]            : stop on error                           | disabled \n"
+    Usage += "   [-x|--exclude <tests>] : exclude test(s) such as 'pymod,pya'     | '' \n"
+    Usage += "   [-a|--args <string>]   : arguments other than '-x' and '-c'      | '' \n"
+    Usage += "   [-?|--?]               : print this usage and exit               | disabled \n"
+    Usage += "--------------------------------------------------------------------+-------------------\n"
 
-  ProjectDir      = os.getcwd()
-  RunnerUsage     = False
-  Run             = False
-  ContinueOnError = True
-  TestsExcluded   = list()
-  Arguments       = ""
-  GitSHA1         = GetGitShortSHA1()
-  TimeStamp       = GetTimeStamp()
-  WorkDir         = "QATest_%s_%s__%s" % (GitSHA1, TimeStamp, os.path.basename(ProjectDir) )
-  LogFile         = WorkDir + ".log"
+    ProjectDir      = os.getcwd()
+    RunnerUsage     = False
+    Run             = False
+    ContinueOnError = True
+    TestsExcluded   = list()
+    Arguments       = ""
+    GitSHA1         = GetGitShortSHA1()
+    TimeStamp       = GetTimeStamp()
+    WorkDir         = "QATest_%s_%s__%s" % (GitSHA1, TimeStamp, os.path.basename(ProjectDir) )
+    LogFile         = WorkDir + ".log"
 
-  (System, Node, Release, Version, Machine, Processor) = platform.uname()
+    (System, Node, Release, Version, Machine, Processor) = platform.uname()
 
 #-------------------------------------------------------------------------------
 ## Get git's short SHA1 value of the HEAD
@@ -83,9 +81,9 @@ def SetGlobals():
 # @return SHA1 value string
 #-------------------------------------------------------------------------------
 def GetGitShortSHA1():
-  command = "git rev-parse --short HEAD 2>/dev/null"
-  sha1val = os.popen( command ).read().strip()
-  return sha1val
+    command = "git rev-parse --short HEAD 2>/dev/null"
+    sha1val = os.popen( command ).read().strip()
+    return sha1val
 
 #-------------------------------------------------------------------------------
 ## Get the time stamp
@@ -93,108 +91,108 @@ def GetGitShortSHA1():
 # @return time stamp string
 #-------------------------------------------------------------------------------
 def GetTimeStamp():
-  ts = datetime.datetime.today()
-  return "%04d_%02d%02d_%02d%02d" % (ts.year, ts.month, ts.day, ts.hour, ts.minute)
+    ts = datetime.datetime.today()
+    return "%04d_%02d%02d_%02d%02d" % (ts.year, ts.month, ts.day, ts.hour, ts.minute)
 
 #-------------------------------------------------------------------------------
 ## To parse the command line arguments
 #
 #-------------------------------------------------------------------------------
 def ParseCommandLineArguments():
-  global Usage
-  global RunnerUsage
-  global Run
-  global ContinueOnError
-  global TestsExcluded
-  global Arguments
+    global Usage
+    global RunnerUsage
+    global Run
+    global ContinueOnError
+    global TestsExcluded
+    global Arguments
 
-  p = optparse.OptionParser( usage=Usage )
-  p.add_option( '-u', '--usage',
-                action='store_true',
-                dest='runner_usage',
-                default=False,
-                help="print usage of 'ut_runner' and exit (false)" )
+    p = optparse.OptionParser( usage=Usage )
+    p.add_option( '-u', '--usage',
+                    action='store_true',
+                    dest='runner_usage',
+                    default=False,
+                    help="print usage of 'ut_runner' and exit (false)" )
 
-  p.add_option( '-r', '--run',
-                action='store_true',
-                dest='runme',
-                default=False,
-                help='run this script (false)' )
+    p.add_option( '-r', '--run',
+                    action='store_true',
+                    dest='runme',
+                    default=False,
+                    help='run this script (false)' )
 
-  p.add_option( '-s', '--stop',
-                action='store_true',
-                dest='stop_on_error',
-                default=False,
-                help='stop on error (false)' )
+    p.add_option( '-s', '--stop',
+                    action='store_true',
+                    dest='stop_on_error',
+                    default=False,
+                    help='stop on error (false)' )
 
-  p.add_option( '-x', '--exclude',
-                dest='exclude_tests',
-                help="exclude test(s) such as 'pymod,pya' ('')" )
+    p.add_option( '-x', '--exclude',
+                    dest='exclude_tests',
+                    help="exclude test(s) such as 'pymod,pya' ('')" )
 
-  p.add_option( '-a', '--args',
-                dest='arguments',
-                help="arguments other than '-x' and '-c' ('')" )
+    p.add_option( '-a', '--args',
+                    dest='arguments',
+                    help="arguments other than '-x' and '-c' ('')" )
 
-  p.add_option( '-?', '--??',
-                action='store_true',
-                dest='checkusage',
-                default=False,
-                help='check usage (false)' )
+    p.add_option( '-?', '--??',
+                    action='store_true',
+                    dest='checkusage',
+                    default=False,
+                    help='check usage (false)' )
 
-  p.set_defaults( runner_usage  = False,
-                  runme         = False,
-                  stop_on_error = False,
-                  exclude_tests = "",
-                  arguments     = "",
-                  checkusage    = False )
+    p.set_defaults( runner_usage  = False,
+                    runme         = False,
+                    stop_on_error = False,
+                    exclude_tests = "",
+                    arguments     = "",
+                    checkusage    = False )
 
-  opt, args = p.parse_args()
-  if opt.checkusage:
-    print(Usage)
-    quit()
+    opt, args = p.parse_args()
+    if opt.checkusage:
+        print(Usage)
+        quit()
 
-  RunnerUsage     = opt.runner_usage
-  Run             = opt.runme
-  ContinueOnError = not opt.stop_on_error
-  if not opt.exclude_tests == "":
-    TestsExcluded = [ item.strip() for item in opt.exclude_tests.split(',') ]
-  else:
-    TestsExcluded = []
-  Arguments = opt.arguments
+    RunnerUsage     = opt.runner_usage
+    Run             = opt.runme
+    ContinueOnError = not opt.stop_on_error
+    if not opt.exclude_tests == "":
+        TestsExcluded = [ item.strip() for item in opt.exclude_tests.split(',') ]
+    else:
+        TestsExcluded = []
+    Arguments = opt.arguments
 
 #-------------------------------------------------------------------------------
 ## Hide/Show the private directory
 #
 #-------------------------------------------------------------------------------
 def HidePrivateDir():
-  if os.path.isdir( "../private" ):
-    os.rename( "../private", "../private.stash"  )
+    if os.path.isdir( "../private" ):
+        os.rename( "../private", "../private.stash"  )
 
 def ShowPrivateDir():
-  if os.path.isdir( "../private.stash" ):
-    os.rename( "../private.stash", "../private"  )
+    if os.path.isdir( "../private.stash" ):
+        os.rename( "../private.stash", "../private"  )
 
 #-------------------------------------------------------------------------------
 ## Export environment variables for "ut_runner"
 #
 #-------------------------------------------------------------------------------
 def ExportEnvVariables():
-  global ProjectDir
-  global WorkDir
-  global MyEnviron  # my environment variables; can be independently used later
+    global ProjectDir
+    global WorkDir
+    global MyEnviron  # my environment variables; can be independently used later
 
-  # In older versions of subprocess module, 'env=None' argument is not provided
-  MyEnviron = os.environ.copy()
-  MyEnviron[ 'TESTSRC' ] = ".."
-  MyEnviron[ 'TESTTMP' ] = WorkDir
-  if System == "Darwin":
-    MyEnviron[ 'DYLD_LIBRARY_PATH' ] = "%s:%s/db_plugins" % (ProjectDir, ProjectDir)
-    for env in [ 'TESTSRC', 'TESTTMP', 'DYLD_LIBRARY_PATH' ]:
-      os.environ[env] = MyEnviron[env]
-  else:
-    MyEnviron[ 'LD_LIBRARY_PATH' ] = "%s:%s/db_plugins" % (ProjectDir, ProjectDir)
-    for env in [ 'TESTSRC', 'TESTTMP', 'LD_LIBRARY_PATH' ]:
-      os.environ[env] = MyEnviron[env]
+    # In older versions of subprocess module, 'env=None' argument is not provided
+    MyEnviron = os.environ.copy()
+    MyEnviron[ 'TESTSRC' ] = ".."
+    MyEnviron[ 'TESTTMP' ] = WorkDir
+    if System == "Darwin":
+        MyEnviron[ 'DYLD_LIBRARY_PATH' ] = "%s:%s/db_plugins" % (ProjectDir, ProjectDir)
+        for env in [ 'TESTSRC', 'TESTTMP', 'DYLD_LIBRARY_PATH' ]:
+            os.environ[env] = MyEnviron[env]
+    else:
+        MyEnviron[ 'LD_LIBRARY_PATH' ] = "%s:%s/db_plugins" % (ProjectDir, ProjectDir)
+        for env in [ 'TESTSRC', 'TESTTMP', 'LD_LIBRARY_PATH' ]:
+            os.environ[env] = MyEnviron[env]
 
 #-------------------------------------------------------------------------------
 ## Run the tester
@@ -203,75 +201,77 @@ def ExportEnvVariables():
 # @param[in] logfile  log file name
 #-------------------------------------------------------------------------------
 def RunTester( command, logfile="" ):
-  if six.PY3:
-    proc = subprocess.Popen( command.split(), stdout=subprocess.PIPE,   \
-                                              stderr=subprocess.STDOUT, \
-                                              universal_newlines=True )
-  else:
-    proc = subprocess.Popen( command.split(), stdout=subprocess.PIPE,   \
-                                              stderr=subprocess.STDOUT )
+    if six.PY3:
+        proc = subprocess.Popen( command.split(),
+                                    stdout=subprocess.PIPE,   \
+                                    stderr=subprocess.STDOUT, \
+                                    universal_newlines=True )
+    else:
+        proc = subprocess.Popen( command.split(),
+                                    stdout=subprocess.PIPE,   \
+                                    stderr=subprocess.STDOUT )
 
-  if not logfile == "":
-    with proc.stdout, open( logfile, 'w' ) as file:
-      for line in proc.stdout:
-        sys.stdout.write(line)
-        file.write(line)
-    proc.wait()
-  else:
-    with proc.stdout:
-      for line in proc.stdout:
-        sys.stdout.write(line)
-    proc.wait()
+    if not logfile == "":
+        with proc.stdout, open( logfile, 'w' ) as file:
+            for line in proc.stdout:
+                sys.stdout.write(line)
+                file.write(line)
+        proc.wait()
+    else:
+        with proc.stdout:
+            for line in proc.stdout:
+                sys.stdout.write(line)
+        proc.wait()
 
 #-------------------------------------------------------------------------------
 # Main function
 #-------------------------------------------------------------------------------
 def Main():
-  #-------------------------------------------------------
-  # [1] Initialize
-  #-------------------------------------------------------
-  SetGlobals()
-  ParseCommandLineArguments()
-  ExportEnvVariables()
+    #-------------------------------------------------------
+    # [1] Initialize
+    #-------------------------------------------------------
+    SetGlobals()
+    ParseCommandLineArguments()
+    ExportEnvVariables()
 
-  #-------------------------------------------------------
-  # [2] Print the runner's usage
-  #-------------------------------------------------------
-  if RunnerUsage:
-    command = './ut_runner --help-all'
-    RunTester( command )
-    quit()
+    #-------------------------------------------------------
+    # [2] Print the runner's usage
+    #-------------------------------------------------------
+    if RunnerUsage:
+        command = './ut_runner --help-all'
+        RunTester( command )
+        quit()
 
-  #-------------------------------------------------------
-  # [3] Run the unit tester
-  #-------------------------------------------------------
-  if not Run:
-    print( "! pass <-r|--run> option to run" )
-    print(Usage)
-    quit()
+    #-------------------------------------------------------
+    # [3] Run the unit tester
+    #-------------------------------------------------------
+    if not Run:
+        print( "! pass <-r|--run> option to run" )
+        print(Usage)
+        quit()
 
-  command = './ut_runner'
-  if ContinueOnError:
-    command += " -c"
-  for item in TestsExcluded:
-    command += ' -x %s' % item
-  if not Arguments == "":
-    command += " %s" % Arguments
+    command = './ut_runner'
+    if ContinueOnError:
+        command += " -c"
+    for item in TestsExcluded:
+        command += ' -x %s' % item
+    if not Arguments == "":
+        command += " %s" % Arguments
 
-  print( "" )
-  print( "### Dumping the log to <%s>" % LogFile )
-  print( "------------------------------------------------------------" )
-  print( "  Git SHA1   = %s" % GitSHA1 )
-  print( "  Time stamp = %s" % TimeStamp )
-  print( "------------------------------------------------------------" )
-  sleep( 1.0 )
-  HidePrivateDir()
-  RunTester( command, logfile=LogFile )
-  ShowPrivateDir()
+    print( "" )
+    print( "### Dumping the log to <%s>" % LogFile )
+    print( "------------------------------------------------------------" )
+    print( "  Git SHA1   = %s" % GitSHA1 )
+    print( "  Time stamp = %s" % TimeStamp )
+    print( "------------------------------------------------------------" )
+    sleep( 1.0 )
+    HidePrivateDir()
+    RunTester( command, logfile=LogFile )
+    ShowPrivateDir()
 
 #===================================================================================
 if __name__ == "__main__":
-  Main()
+    Main()
 
 #---------------
 # End of file
diff --git a/macbuild/macQAT.sh b/macbuild/macQAT.sh
index 36ac52e3e..8668cf91d 100755
--- a/macbuild/macQAT.sh
+++ b/macbuild/macQAT.sh
@@ -14,23 +14,23 @@
 # Functions
 #----------------------------------------------------------------
 function GetPresentDir() {
-  path=$1
-  array=( `echo $path | tr -s '/' ' '`)
-  last_index=`expr ${#array[@]} - 1`
-  echo ${array[${last_index}]}
-  return 0
+    path=$1
+    array=( `echo $path | tr -s '/' ' '`)
+    last_index=`expr ${#array[@]} - 1`
+    echo ${array[${last_index}]}
+    return 0
 }
 
 function HidePrivateDir() {
-  if [ -d "../private" ]; then
-    ret=$(/bin/mv ../private  ../private.stash)
-  fi
+    if [ -d "../private" ]; then
+        ret=$(/bin/mv ../private  ../private.stash)
+    fi
 }
 
 function ShowPrivateDir() {
-  if [ -d "../private.stash" ]; then
-    ret=$(/bin/mv ../private.stash  ../private)
-  fi
+    if [ -d "../private.stash" ]; then
+        ret=$(/bin/mv ../private.stash  ../private)
+    fi
 }
 
 #----------------------------------------------------------------
@@ -52,17 +52,28 @@ export DYLD_LIBRARY_PATH=$(pwd):$(pwd)/db_plugins
 # Environment variables for "ut_runner"
 #----------------------------------------------------------------
 if [ $# -eq 1 ]; then
-  if [ "$1" == "-h" ]; then
-    ./ut_runner -h
-    exit 0
-  fi
-  if [ "$1" == "-r" ]; then
-    echo "### Dumping the log to" $logfile "..."
-    HidePrivateDir
-    ./ut_runner -x pymod -c  2>&1 | tee $logfile
-    ShowPrivateDir
-    exit 0
-  else
+    if [ "$1" == "-h" ]; then
+        ./ut_runner -h
+        exit 0
+    fi
+    if [ "$1" == "-r" ]; then
+        echo "### Dumping the log to" $logfile "..."
+        HidePrivateDir
+        ./ut_runner -x pymod -c  2>&1 | tee $logfile
+        ShowPrivateDir
+        exit 0
+    else
+        echo ""
+        echo " Git SHA1   = ${gitSHA1}"
+        echo " Time stamp = ${timestamp}"
+        echo " Log file   = ${logfile}"
+        echo " Usage:"
+        echo "  ./QATest.sh -h: to get the help of 'ut_runner'"
+        echo "  ./QATest.sh -r: to run the tests with '-c' option: continues after an error"
+        echo ""
+        exit 0
+    fi
+else
     echo ""
     echo " Git SHA1   = ${gitSHA1}"
     echo " Time stamp = ${timestamp}"
@@ -72,17 +83,6 @@ if [ $# -eq 1 ]; then
     echo "  ./QATest.sh -r: to run the tests with '-c' option: continues after an error"
     echo ""
     exit 0
-  fi
-else
-  echo ""
-  echo " Git SHA1   = ${gitSHA1}"
-  echo " Time stamp = ${timestamp}"
-  echo " Log file   = ${logfile}"
-  echo " Usage:"
-  echo "  ./QATest.sh -h: to get the help of 'ut_runner'"
-  echo "  ./QATest.sh -r: to run the tests with '-c' option: continues after an error"
-  echo ""
-  exit 0
 fi
 
 #--------------
diff --git a/macbuild/makeDMG4mac.py b/macbuild/makeDMG4mac.py
index 04998cb33..d50ea43ed 100755
--- a/macbuild/makeDMG4mac.py
+++ b/macbuild/makeDMG4mac.py
@@ -23,6 +23,7 @@ import platform
 import optparse
 import subprocess
 import hashlib
+import string
 
 #-------------------------------------------------------------------------------
 ## To import global dictionaries of different modules and utility functions
@@ -35,143 +36,150 @@ from build4mac_util import *
 ## To set global variables including present directory and platform info.
 #-------------------------------------------------------------------------------
 def SetGlobals():
-  global ProjectDir         # project directory where "build.sh" exists
-  global Usage              # string on usage
-  global LatestOS           # the latest generic OS name
-  global GenOSName          # generic OS name
-  global Platform           # platform
-  global PkgDir             # the package directory where "klayout.app" exists
-  global OpClean            # 'clean' operation
-  global OpMake             # 'make' operation
-  global DefaultBundleName  # the default bundle name 'klayout.app'
-  global BundleName         # application bundle name in the DMG
-  global DMGSerialNum       # the DMG serial number
-  global PackagePrefix      # the package prefix: 'ST-', 'LW-', 'HW-', or 'EX-'
-  global QtIdentification   # Qt identification
-  global RubyPythonID       # Ruby- and Python-identification
-  global KLVersion          # KLayout's version
-  global OccupiedDS         # approx. occupied disc space
-  global BackgroundPNG      # the background PNG image file
-  global VolumeIcons        # the volume icon file
-  global AppleScriptDMG     # the AppleScript for KLayout DMG
-  global WorkDMG            # work DMG file created under ProjectDir/
-  global VolumeDMG          # the volume name of DMG
-  global TargetDMG          # the name of target DMG file
-  global RootApplications   # reserved directory name for applications
-  global LatestOSMacPorts   # True if 'LatestOS with MacPorts'
-  global LatestOSHomebrew   # True if 'LatestOS with Homebrew'
-  global LatestOSAnaconda3  # True if 'LatestOS with Anaconda3'
-  global DicLightWeight     # dictionary for LW-* packages
-  global Item3AppleScript   # ITEM_3 in the Apple script
-  # auxiliary variables on platform
-  global System             # 6-tuple from platform.uname()
-  global Node               # - do -
-  global Release            # - do -
-  global Version            # - do -
-  global Machine            # - do -
-  global Processor          # - do -
-  global Bit                # machine bit-size
+    global ProjectDir         # project directory where "build.sh" exists
+    global Usage              # string on usage
+    global LatestOS           # the latest generic OS name
+    global GenOSName          # generic OS name
+    global Platform           # platform
+    global PkgDir             # the package directory where "klayout.app" exists
+    global UnsafePkg          # flags whether to proceed to making "invalid" dmg
+    global OpClean            # 'clean' operation
+    global OpMake             # 'make' operation
+    global DefaultBundleName  # the default bundle name 'klayout.app'
+    global BundleName         # application bundle name in the DMG
+    global DMGSerialNum       # the DMG serial number
+    global PackagePrefix      # the package prefix: 'ST-', 'LW-', 'HW-', or 'EX-'
+    global QtIdentification   # Qt identification
+    global RubyPythonID       # Ruby- and Python-identification
+    global KLVersion          # KLayout's version
+    global OccupiedDS         # approx. occupied disc space
+    global BackgroundPNG      # the background PNG image file
+    global VolumeIcons        # the volume icon file
+    global AppleScriptDMG     # the AppleScript for KLayout DMG
+    global WorkDMG            # work DMG file created under ProjectDir/
+    global VolumeDMG          # the volume name of DMG
+    global TargetDMG          # the name of target DMG file
+    global RootApplications   # reserved directory name for applications
+    global LatestOSMacPorts   # True if 'LatestOS with MacPorts'
+    global LatestOSHomebrew   # True if 'LatestOS with Homebrew'
+    global LatestOSAnaconda3  # True if 'LatestOS with Anaconda3'
+    global DicLightWeight     # dictionary for LW-* packages
+    global Item3AppleScript   # ITEM_3 in the Apple script
+    # auxiliary variables on platform
+    global System             # 6-tuple from platform.uname()
+    global Node               # - do -
+    global Release            # - do -
+    global Version            # - do -
+    global Machine            # - do -
+    global Processor          # - do -
+    global Bit                # machine bit-size
 
-  Usage  = "\n"
-  Usage += "--------------------------------------------------------------------------------------------------------\n"
-  Usage += "<< Usage of 'makeDMG4mac.py' >>\n"
-  Usage += "       for making a DMG file of KLayout 0.26.1 or later on different Apple Mac OSX platforms.\n"
-  Usage += "\n"
-  Usage += "$ [python] ./makeDMG4mac.py \n"
-  Usage += "   option & argument    : descriptions                                               | default value\n"
-  Usage += "   ----------------------------------------------------------------------------------+---------------\n"
-  Usage += "   <-p|--pkg <dir>>     : package directory created by `build4mac.py` with [-y|-Y]   | `` \n"
-  Usage += "                        : like 'ST-qt5MP.pkg.macos-Catalina-release-RsysPsys'        | \n"
-  Usage += "   <-c|--clean>         : clean the work directory                                   | disabled \n"
-  Usage += "   <-m|--make>          : make a compressed DMG file                                 | disabled \n"
-  Usage += "                        :   <-c|--clean> and <-m|--make> are mutually exclusive      | \n"
-  Usage += "   [-b|--bundle <name>] : forcibly use this bundle name in the DMG                   | '' \n"
-  Usage += "   [-s|--serial <num>]  : DMG serial number                                          | 1 \n"
-  Usage += "   [-?|--?]             : print this usage and exit                                  | disabled \n"
-  Usage += "-------------------------------------------------------------------------------------+------------------\n"
+    Usage  = "\n"
+    Usage += "--------------------------------------------------------------------------------------------------------\n"
+    Usage += "<< Usage of 'makeDMG4mac.py' >>\n"
+    Usage += "       for making a DMG file of KLayout 0.26.1 or later on different Apple Mac OSX platforms.\n"
+    Usage += "\n"
+    Usage += "$ [python] ./makeDMG4mac.py \n"
+    Usage += "   option & argument    : descriptions                                               | default value\n"
+    Usage += "   ----------------------------------------------------------------------------------+---------------\n"
+    Usage += "   <-p|--pkg <dir>>     : package directory created by `build4mac.py` with [-y|-Y]   | `` \n"
+    Usage += "                        : like 'ST-qt5MP.pkg.macos-Catalina-release-RsysPsys'        | \n"
+    Usage += "   <-c|--clean>         : clean the work directory                                   | disabled \n"
+    Usage += "   <-m|--make>          : make a compressed DMG file                                 | disabled \n"
+    Usage += "                        :   <-c|--clean> and <-m|--make> are mutually exclusive      | \n"
+    Usage += "   [-b|--bundle <name>] : forcibly use this bundle name in the DMG                   | '' \n"
+    Usage += "   [-s|--serial <num>]  : DMG serial number                                          | 1 \n"
+    Usage += "   <-u|--unsafe>        : Ignores a few checks (use with caution)                    | disabled \n"
+    Usage += "   <-t|--targetdmg>     : Specify output .dmg filename                               | chosen by script \n"
+    Usage += "   [-?|--?]             : print this usage and exit                                  | disabled \n"
+    Usage += "-------------------------------------------------------------------------------------+------------------\n"
 
-  ProjectDir = os.getcwd()
-  (System, Node, Release, Version, Machine, Processor) = platform.uname()
+    ProjectDir = os.getcwd()
+    (System, Node, Release, Version, Machine, Processor) = platform.uname()
 
-  if not System == "Darwin":
-    print("")
-    print( "!!! Sorry. Your system <%s> looks like non-Mac" % System, file=sys.stderr )
-    print(Usage)
-    quit()
+    if not System == "Darwin":
+        print("")
+        print( "!!! Sorry. Your system <%s> looks like non-Mac" % System, file=sys.stderr )
+        print(Usage)
+        quit()
 
-  release = int( Release.split(".")[0] ) # take the first of ['19', '0', '0']
-  LatestOS = ""
-  if   release == 19:
-    GenOSName = "macOS"
-    Platform  = "Catalina"
-    LatestOS  = Platform
-  elif release == 18:
-    GenOSName = "macOS"
-    Platform  = "Mojave"
-  elif release == 17:
-    GenOSName = "macOS"
-    Platform  = "HighSierra"
-  elif release == 16:
-    Platform  = "Sierra"
-    GenOSName = "macOS"
-  elif release == 15:
-    GenOSName = "MacOSX"
-    Platform  = "ElCapitan"
-  else:
-    Platform = ""
-    print("")
-    print( "!!! Sorry. Unsupported major OS release <%d>" % release, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    release = int( Release.split(".")[0] ) # take the first of ['19', '0', '0']
+    LatestOS = ""
+    if release == 20:
+        GenOSName = "macOS"
+        Platform  = "BigSur"
+    elif release == 19:
+        GenOSName = "macOS"
+        Platform  = "Catalina"
+        LatestOS  = Platform
+    elif release == 18:
+        GenOSName = "macOS"
+        Platform  = "Mojave"
+    elif release == 17:
+        GenOSName = "macOS"
+        Platform  = "HighSierra"
+    elif release == 16:
+        Platform  = "Sierra"
+        GenOSName = "macOS"
+    elif release == 15:
+        GenOSName = "MacOSX"
+        Platform  = "ElCapitan"
+    else:
+        Platform = ""
+        print("")
+        print( "!!! Sorry. Unsupported major OS release <%d>" % release, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  if not Machine == "x86_64":
-    print("")
-    print( "!!! Sorry. Only x86_64 architecture machine is supported but found <%s>" % Machine, file=sys.stderr )
-    print(Usage)
-    sys.exit(1)
+    if not Machine == "x86_64":
+        print("")
+        print( "!!! Sorry. Only x86_64 architecture machine is supported but found <%s>" % Machine, file=sys.stderr )
+        print(Usage)
+        sys.exit(1)
 
-  PkgDir            = ""
-  OpClean           = False
-  OpMake            = False
-  DefaultBundleName = "klayout.app"
-  BundleName        = ""
-  DMGSerialNum      = 1
-  PackagePrefix     = ""
-  QtIdentification  = ""
-  RubyPythonID      = ""
-  KLVersion         = GetKLayoutVersionFrom( "./version.sh" )
-  OccupiedDS        = -1
-  BackgroundPNG     = "KLayoutDMG-Back.png"
-  VolumeIcons       = "KLayoutHDD.icns"
-  AppleScriptDMG    = "macbuild/Resources/KLayoutDMG.applescript"
-  WorkDMG           = "work-KLayout.dmg"
-  VolumeDMG         = "KLayout"
-  TargetDMG         = ""
-  RootApplications  = "/Applications"
-  LatestOSMacPorts  = False
-  LatestOSHomebrew  = False
-  LatestOSAnaconda3 = False
-  DicLightWeight    = dict()
-  Item3AppleScript  = ""
-  # Populate DicLightWeight
-  DicLightWeight[ "ports" ] = dict()
-  DicLightWeight[ "brew" ]  = dict()
-  DicLightWeight[ "ana3" ]  = dict()
+    PkgDir            = ""
+    UnsafePkg         = False
+    OpClean           = False
+    OpMake            = False
+    DefaultBundleName = "klayout.app"
+    BundleName        = ""
+    DMGSerialNum      = 1
+    PackagePrefix     = ""
+    QtIdentification  = ""
+    RubyPythonID      = ""
+    KLVersion         = GetKLayoutVersionFrom( "./version.sh" )
+    OccupiedDS        = -1
+    BackgroundPNG     = "KLayoutDMG-Back.png"
+    VolumeIcons       = "KLayoutHDD.icns"
+    AppleScriptDMG    = "macbuild/Resources/KLayoutDMG.applescript"
+    WorkDMG           = "work-KLayout.dmg"
+    VolumeDMG         = "KLayout"
+    TargetDMG         = ""
+    RootApplications  = "/Applications"
+    LatestOSMacPorts  = False
+    LatestOSHomebrew  = False
+    LatestOSAnaconda3 = False
+    DicLightWeight    = dict()
+    Item3AppleScript  = ""
+    # Populate DicLightWeight
+    DicLightWeight[ "ports" ] = dict()
+    DicLightWeight[ "brew" ]  = dict()
+    DicLightWeight[ "ana3" ]  = dict()
 
-  DicLightWeight[ "ports" ]["zip"]   = "macbuild/Resources/script-bundle-P.zip"
-  DicLightWeight[ "ports" ]["src"]   = "script-bundle-P"
-  DicLightWeight[ "ports" ]["des"]   = "MacPortsUser-ReadMeFirst"
-  DicLightWeight[ "ports" ]["item3"] = 'set position of item "MacPortsUser-ReadMeFirst" to {700, 400}'
+    DicLightWeight[ "ports" ]["zip"]   = "macbuild/Resources/script-bundle-P.zip"
+    DicLightWeight[ "ports" ]["src"]   = "script-bundle-P"
+    DicLightWeight[ "ports" ]["des"]   = "MacPortsUser-ReadMeFirst"
+    DicLightWeight[ "ports" ]["item3"] = 'set position of item "MacPortsUser-ReadMeFirst" to {700, 400}'
 
-  DicLightWeight[ "brew" ]["zip"]    = "macbuild/Resources/script-bundle-B.zip"
-  DicLightWeight[ "brew" ]["src"]    = "script-bundle-B"
-  DicLightWeight[ "brew" ]["des"]    = "HomebrewUser-ReadMeFirst"
-  DicLightWeight[ "brew" ]["item3"]  = 'set position of item "HomebrewUser-ReadMeFirst" to {700, 400}'
+    DicLightWeight[ "brew" ]["zip"]    = "macbuild/Resources/script-bundle-B.zip"
+    DicLightWeight[ "brew" ]["src"]    = "script-bundle-B"
+    DicLightWeight[ "brew" ]["des"]    = "HomebrewUser-ReadMeFirst"
+    DicLightWeight[ "brew" ]["item3"]  = 'set position of item "HomebrewUser-ReadMeFirst" to {700, 400}'
 
-  DicLightWeight[ "ana3" ]["zip"]    = "macbuild/Resources/script-bundle-A.zip"
-  DicLightWeight[ "ana3" ]["src"]    = "script-bundle-A"
-  DicLightWeight[ "ana3" ]["des"]    = "Anaconda3User-ReadMeFirst"
-  DicLightWeight[ "ana3" ]["item3"]  = 'set position of item "Anaconda3User-ReadMeFirst" to {700, 400}'
+    DicLightWeight[ "ana3" ]["zip"]    = "macbuild/Resources/script-bundle-A.zip"
+    DicLightWeight[ "ana3" ]["src"]    = "script-bundle-A"
+    DicLightWeight[ "ana3" ]["des"]    = "Anaconda3User-ReadMeFirst"
+    DicLightWeight[ "ana3" ]["item3"]  = 'set position of item "Anaconda3User-ReadMeFirst" to {700, 400}'
 
 #------------------------------------------------------------------------------
 ## To check the contents of the package directory
@@ -179,8 +187,8 @@ def SetGlobals():
 # The package directory name should look like:
 #     * ST-qt5MP.pkg.macos-Catalina-release-RsysPsys      --- (1)
 #     * LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3
-#     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb26Phb38
-#     * LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp38
+#     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb38
+#     * LW-qt5MP.pkg.macos-Catalina-release-Rmp27Pmp38
 #
 # Generated DMG will be, for example,
 #     (1) ---> ST-klayout-0.26.1-macOS-Catalina-1-qt5MP-RsysPsys.dmg
@@ -189,235 +197,257 @@ def SetGlobals():
 #         on failure, -1
 #------------------------------------------------------------------------------
 def CheckPkgDirectory():
-  global Platform
-  global OpClean
-  global OpMake
-  global DefaultBundleName
-  global BundleName
-  global PackagePrefix
-  global QtIdentification
-  global RubyPythonID
-  global LatestOSMacPorts
-  global LatestOSHomebrew
-  global LatestOSAnaconda3
-  global DicLightWeight
-  global Item3AppleScript
+    global PkgDir
+    global UnsafePkg
+    global Platform
+    global OpClean
+    global OpMake
+    global DefaultBundleName
+    global BundleName
+    global PackagePrefix
+    global QtIdentification
+    global RubyPythonID
+    global LatestOSMacPorts
+    global LatestOSHomebrew
+    global LatestOSAnaconda3
+    global DicLightWeight
+    global Item3AppleScript
 
-  #-----------------------------------------------------------------------------
-  # [1] Check the contents of the package directory
-  #-----------------------------------------------------------------------------
-  if PkgDir == "":
-    print( "! Package directory is not specified", file=sys.stderr )
-    print(Usage)
-    return -1
+    #-----------------------------------------------------------------------------
+    # [1] Check the contents of the package directory
+    #-----------------------------------------------------------------------------
+    if PkgDir == "":
+        print( "! Package directory is not specified", file=sys.stderr )
+        print(Usage)
+        return -1
 
-  if not os.path.isdir(PkgDir):
-    print( "! Specified package directory <%s> does not exist" % PkgDir, file=sys.stderr )
-    print( "" )
-    return -1
+    if not os.path.isdir(PkgDir):
+        print( "! Specified package directory <%s> does not exist" % PkgDir, file=sys.stderr )
+        print( "" )
+        return -1
 
-  #-----------------------------------------------------------------------------
-  # [2] Identify (Qt, Ruby, Python) from PkgDir
-  #
-  #     * ST-qt5MP.pkg.macos-Catalina-release-RsysPsys
-  #     * LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3
-  #     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb38
-  #     * HW-qt5Brew.pkg.macos-Catalina-release-RsysPhb38
-  #     * EX-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp38
-  #-----------------------------------------------------------------------------
-  patQRP = u'(ST|LW|HW|EX)([-])(qt5[0-9A-Za-z]+)([.]pkg[.])([A-Za-z]+[-][A-Za-z]+[-]release[-])([0-9A-Za-z]+)'
-  regQRP = re.compile(patQRP)
-  if not regQRP.match(PkgDir):
-    print( "! Cannot identify (Qt, Ruby, Python) from the package directory name" )
-    print( "" )
-    return -1
-  else:
-    pkgdirComponents = regQRP.match(PkgDir).groups()
-    PackagePrefix    = pkgdirComponents[0]
-    QtIdentification = pkgdirComponents[2]
-    RubyPythonID     = pkgdirComponents[5]
+    #-----------------------------------------------------------------------------
+    # [2] Identify (Qt, Ruby, Python) from PkgDir
+    #
+    #     * ST-qt5MP.pkg.macos-Catalina-release-RsysPsys
+    #     * LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3
+    #     * LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb38
+    #     * HW-qt5Brew.pkg.macos-Catalina-release-RsysPhb38
+    #     * EX-qt5MP.pkg.macos-Catalina-release-Rmp27Pmp38
+    #-----------------------------------------------------------------------------
+    patQRP = u'(ST|LW|HW|EX)([-])(qt5[0-9A-Za-z]+)([.]pkg[.])([A-Za-z]+[-][A-Za-z]+[-]release[-])([0-9A-Za-z]+)'
+    regQRP = re.compile(patQRP)
+    if not regQRP.match(PkgDir):
+        print( "! Cannot identify (Qt, Ruby, Python) from the package directory name" )
+        if UnsafePkg:
+            print( "! Ignoring..." )
+        else:
+            print( "" )
+            return -1
+    else:
+        pkgdirComponents = regQRP.match(PkgDir).groups()
+        PackagePrefix    = pkgdirComponents[0]
+        QtIdentification = pkgdirComponents[2]
+        RubyPythonID     = pkgdirComponents[5]
 
-  #-----------------------------------------------------------------------------
-  # [3] Check if the "LatestOS" with MacPorts / Homebrew / Anaconda3
-  #-----------------------------------------------------------------------------
-  LatestOSMacPorts   = Platform == LatestOS
-  LatestOSMacPorts  &= PackagePrefix == "LW"
-  LatestOSMacPorts  &= QtIdentification == "qt5MP"
-  LatestOSMacPorts  &= RubyPythonID == "Rmp26Pmp38"
+        #-----------------------------------------------------------------------------
+        # [3] Check if the "LatestOS" with MacPorts / Homebrew / Anaconda3
+        #-----------------------------------------------------------------------------
+        LatestOSMacPorts   = Platform == LatestOS
+        LatestOSMacPorts  &= PackagePrefix == "LW"
+        LatestOSMacPorts  &= QtIdentification == "qt5MP"
+        LatestOSMacPorts  &= RubyPythonID == "Rmp27Pmp38"
 
-  LatestOSHomebrew   = Platform == LatestOS
-  LatestOSHomebrew  &= PackagePrefix == "LW"
-  LatestOSHomebrew  &= QtIdentification == "qt5Brew"
-  LatestOSHomebrew  &= RubyPythonID == "Rhb27Phb38"
+        LatestOSHomebrew   = Platform == LatestOS
+        LatestOSHomebrew  &= PackagePrefix == "LW"
+        LatestOSHomebrew  &= QtIdentification == "qt5Brew"
+        LatestOSHomebrew  &= RubyPythonID == "Rhb27Phb38" or RubyPythonID == "Rhb27Phbauto"
 
-  LatestOSAnaconda3  = Platform == LatestOS
-  LatestOSAnaconda3 &= PackagePrefix == "LW"
-  LatestOSAnaconda3 &= QtIdentification == "qt5Ana3"
-  LatestOSAnaconda3 &= RubyPythonID == "Rana3Pana3"
+        LatestOSAnaconda3  = Platform == LatestOS
+        LatestOSAnaconda3 &= PackagePrefix == "LW"
+        LatestOSAnaconda3 &= QtIdentification == "qt5Ana3"
+        LatestOSAnaconda3 &= RubyPythonID == "Rana3Pana3"
 
-  if LatestOSMacPorts:
-    mydic  = DicLightWeight["ports"]
-    srcDir = PkgDir + "/" + mydic["src"]
-    desDir = PkgDir + "/" + mydic["des"]
-    if OpMake:
-      with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
-        zip_ref.extractall(PkgDir)
-      os.rename( srcDir, desDir )
-    if OpClean:
-      if os.path.isdir(srcDir):
-        shutil.rmtree(srcDir)
-      if os.path.isdir(desDir):
-        shutil.rmtree(desDir)
-    Item3AppleScript = mydic["item3"]
+        if LatestOSMacPorts:
+            mydic  = DicLightWeight["ports"]
+            srcDir = PkgDir + "/" + mydic["src"]
+            desDir = PkgDir + "/" + mydic["des"]
+            if OpMake:
+                with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
+                    zip_ref.extractall(PkgDir)
+                os.rename( srcDir, desDir )
+            if OpClean:
+                if os.path.isdir(srcDir):
+                    shutil.rmtree(srcDir)
+                if os.path.isdir(desDir):
+                    shutil.rmtree(desDir)
+            Item3AppleScript = mydic["item3"]
 
-  if LatestOSHomebrew:
-    mydic  = DicLightWeight["brew"]
-    srcDir = PkgDir + "/" + mydic["src"]
-    desDir = PkgDir + "/" + mydic["des"]
-    if OpMake:
-      with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
-        zip_ref.extractall(PkgDir)
-      os.rename( srcDir, desDir )
-    if OpClean:
-      if os.path.isdir(srcDir):
-        shutil.rmtree(srcDir)
-      if os.path.isdir(desDir):
-        shutil.rmtree(desDir)
-    Item3AppleScript = mydic["item3"]
+        if LatestOSHomebrew:
+            mydic  = DicLightWeight["brew"]
+            srcDir = PkgDir + "/" + mydic["src"]
+            desDir = PkgDir + "/" + mydic["des"]
+            if OpMake:
+                with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
+                    zip_ref.extractall(PkgDir)
+                os.rename( srcDir, desDir )
+            if OpClean:
+                if os.path.isdir(srcDir):
+                    shutil.rmtree(srcDir)
+                if os.path.isdir(desDir):
+                    shutil.rmtree(desDir)
+            Item3AppleScript = mydic["item3"]
 
-  if LatestOSAnaconda3:
-    mydic  = DicLightWeight["ana3"]
-    srcDir = PkgDir + "/" + mydic["src"]
-    desDir = PkgDir + "/" + mydic["des"]
-    if OpMake:
-      with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
-        zip_ref.extractall(PkgDir)
-      os.rename( srcDir, desDir )
-    if OpClean:
-      if os.path.isdir(srcDir):
-        shutil.rmtree(srcDir)
-      if os.path.isdir(desDir):
-        shutil.rmtree(desDir)
-    Item3AppleScript = mydic["item3"]
+        if LatestOSAnaconda3:
+            mydic  = DicLightWeight["ana3"]
+            srcDir = PkgDir + "/" + mydic["src"]
+            desDir = PkgDir + "/" + mydic["des"]
+            if OpMake:
+                with zipfile.ZipFile( mydic["zip"], 'r' ) as zip_ref:
+                    zip_ref.extractall(PkgDir)
+                os.rename( srcDir, desDir )
+            if OpClean:
+                if os.path.isdir(srcDir):
+                    shutil.rmtree(srcDir)
+                if os.path.isdir(desDir):
+                    shutil.rmtree(desDir)
+            Item3AppleScript = mydic["item3"]
 
-  #------------------------------------------------------
-  # [4] Check the presence of the default bundle
-  #------------------------------------------------------
-  os.chdir(PkgDir)
-  if not os.path.isdir( DefaultBundleName ):
-    print( "! The package directory <%s> does not hold <%s> bundle" % (PkgDir, DefaultBundleName), file=sys.stderr )
-    print( "" )
+    #------------------------------------------------------
+    # [4] Check the presence of the default bundle
+    #------------------------------------------------------
+    os.chdir(PkgDir)
+    if not os.path.isdir( DefaultBundleName ):
+        print( "! The package directory <%s> does not hold <%s> bundle" % (PkgDir, DefaultBundleName), file=sys.stderr )
+        print( "" )
+        os.chdir(ProjectDir)
+        return -1
+
+    #------------------------------------------------------
+    # [5] Check the occupied disk space
+    #------------------------------------------------------
+    command = "\du -sm %s" % DefaultBundleName
+    sizeApp = int( os.popen(command).read().strip("\n").split("\t")[0] )
+
+    #------------------------------------------------------
+    # [6] Change the application bundle name if required
+    #------------------------------------------------------
+    if OpMake and BundleName != "" and BundleName != DefaultBundleName:
+        os.rename( DefaultBundleName, BundleName )
     os.chdir(ProjectDir)
-    return -1
-
-  #------------------------------------------------------
-  # [5] Check the occupied disk space
-  #------------------------------------------------------
-  command = "\du -sm %s" % DefaultBundleName
-  sizeApp = int( os.popen(command).read().strip("\n").split("\t")[0] )
-
-  #------------------------------------------------------
-  # [6] Change the application bundle name if required
-  #------------------------------------------------------
-  if OpMake and BundleName != "" and BundleName != DefaultBundleName:
-    os.rename( DefaultBundleName, BundleName )
-  os.chdir(ProjectDir)
-  return sizeApp
+    return sizeApp
 
 #------------------------------------------------------------------------------
 ## To get command line parameters
 #------------------------------------------------------------------------------
 def ParseCommandLineArguments():
-  global ProjectDir
-  global Usage
-  global GenOSName
-  global Platform
-  global PkgDir
-  global OpClean
-  global OpMake
-  global BundleName
-  global DMGSerialNum
-  global PackagePrefix
-  global QtIdentification
-  global RubyPythonID
-  global KLVersion
-  global OccupiedDS
-  global TargetDMG
+    global ProjectDir
+    global Usage
+    global GenOSName
+    global Platform
+    global PkgDir
+    global OpClean
+    global OpMake
+    global BundleName
+    global DMGSerialNum
+    global UnsafePkg
+    global PackagePrefix
+    global QtIdentification
+    global RubyPythonID
+    global KLVersion
+    global OccupiedDS
+    global TargetDMG
 
-  p = optparse.OptionParser( usage=Usage )
-  p.add_option( '-p', '--pkg',
-                dest='pkg_dir',
-                help="the pkg directory" )
+    p = optparse.OptionParser( usage=Usage )
+    p.add_option( '-p', '--pkg',
+                    dest='pkg_dir',
+                    help="the pkg directory" )
 
-  p.add_option( '-c', '--clean',
-                action='store_true',
-                dest='operation_clean',
-                default=False,
-                help="clean operation" )
+    p.add_option( '-c', '--clean',
+                    action='store_true',
+                    dest='operation_clean',
+                    default=False,
+                    help="clean operation" )
 
-  p.add_option( '-m', '--make',
-                action='store_true',
-                dest='operation_make',
-                default=False,
-                help="make operation" )
+    p.add_option( '-m', '--make',
+                    action='store_true',
+                    dest='operation_make',
+                    default=False,
+                    help="make operation" )
 
-  p.add_option( '-b', '--bundle',
-                dest='bundle_name',
-                help="forcibly use this bundle name in the DMG" )
+    p.add_option( '-b', '--bundle',
+                    dest='bundle_name',
+                    help="forcibly use this bundle name in the DMG" )
 
-  p.add_option( '-s', '--serial',
-                dest='dmg_serial',
-                help="DMG serial number" )
+    p.add_option( '-s', '--serial',
+                    dest='dmg_serial',
+                    help="DMG serial number" )
 
-  p.add_option( '-?', '--??',
-                action='store_true',
-                dest='checkusage',
-                default=False,
-                help='check usage' )
+    p.add_option( '-t', '--targetdmg',
+                    dest='target_dmg',
+                    help="output DMG filename" )
 
-  p.set_defaults( pkg_dir           = "",
-                  operation_clean   = False,
-                  operation_make    = False,
-                  bundle_name       = "",
-                  dmg_serial        = "1",
-                  checkusage        = False )
+    p.add_option( '-z', '--unsafe',
+                    action='store_true',
+                    dest='unsafe',
+                    default=False,
+                    help="If set, do not check whether pkg folder is empty" )
 
-  #-----------------------------------------------------------
-  # [1] Parse the command line options
-  #-----------------------------------------------------------
-  opt, args = p.parse_args()
-  if (opt.checkusage):
-    print(Usage)
-    quit()
+    p.add_option( '-?', '--??',
+                    action='store_true',
+                    dest='checkusage',
+                    default=False,
+                    help='check usage' )
 
-  PkgDir       = opt.pkg_dir
-  OpClean      = opt.operation_clean
-  OpMake       = opt.operation_make
-  DMGSerialNum = int(opt.dmg_serial)
+    p.set_defaults( pkg_dir         = "",
+                    operation_clean = False,
+                    operation_make  = False,
+                    bundle_name     = "",
+                    target_dmg      = "",
+                    dmg_serial      = "1",
+                    unsafe          = False,
+                    checkusage      = False )
 
-  if not opt.bundle_name == "":
-    base, ext  = os.path.splitext( os.path.basename(opt.bundle_name) )
-    BundleName = base + ".app"
-  else:
-    BundleName = DefaultBundleName
+    #-----------------------------------------------------------
+    # [1] Parse the command line options
+    #-----------------------------------------------------------
+    opt, args = p.parse_args()
+    if (opt.checkusage):
+        print(Usage)
+        quit()
 
-  if (OpClean and OpMake) or (not OpClean and not OpMake):
-    print( "! Specify <-c|--clean> OR <-m|--make>", file=sys.stderr )
-    print(Usage)
-    quit()
+    PkgDir       = opt.pkg_dir
+    OpClean      = opt.operation_clean
+    OpMake       = opt.operation_make
+    DMGSerialNum = int(opt.dmg_serial)
+    UnsafePkg    = opt.unsafe
 
-  #------------------------------------------------------------------------------------
-  # [2] Check the PKG directory to set QtIdentification, RubyPythonID, and BundleName
-  #------------------------------------------------------------------------------------
-  OccupiedDS = CheckPkgDirectory()
-  if not 0 < OccupiedDS:
-    print( "! Failed to check the PKG directory" )
-    print( "" )
-    quit()
-  else:
-    TargetDMG = "%s-klayout-%s-%s-%s-%d-%s-%s.dmg" \
-                % (PackagePrefix, KLVersion, GenOSName, Platform, DMGSerialNum, QtIdentification, RubyPythonID)
-  return
+    if not opt.bundle_name == "":
+        base, ext  = os.path.splitext( os.path.basename(opt.bundle_name) )
+        BundleName = base + ".app"
+    else:
+        BundleName = DefaultBundleName
+
+    if (OpClean and OpMake) or (not OpClean and not OpMake):
+        print( "! Specify <-c|--clean> OR <-m|--make>", file=sys.stderr )
+        print(Usage)
+        quit()
+
+    #------------------------------------------------------------------------------------
+    # [2] Check the PKG directory to set QtIdentification, RubyPythonID, and BundleName
+    #------------------------------------------------------------------------------------
+    OccupiedDS = CheckPkgDirectory()
+    if not 0 < OccupiedDS and not UnsafePkg:
+        print( "! Failed to check the PKG directory" )
+        print( "" )
+        quit()
+
+    if opt.target_dmg != "":
+        TargetDMG = opt.target_dmg
+    else:
+        TargetDMG = "%s-klayout-%s-%s-%s-%d-%s-%s.dmg" \
+                        % (PackagePrefix, KLVersion, GenOSName, Platform, DMGSerialNum, QtIdentification, RubyPythonID)
+    return
 
 #------------------------------------------------------------------------------
 ## Make the target DMG file
@@ -427,221 +457,221 @@ def ParseCommandLineArguments():
 # @return True on success; False on failure
 #------------------------------------------------------------------------------
 def MakeTargetDMGFile(msg=""):
-  #-----------------------------------------------------------------------
-  # The work DMG is mounted like:
-  #   /dev/disk6s1 248Mi 228Mi 20Mi 93% 58449 5027 92% /Volumes/KLayout
-  #-----------------------------------------------------------------------
-  global MountDir   # the mount directory: eg. /Volumes/KLayout
-  global FileSys    # the file system    : eg. /dev/disk6s1
+    #-----------------------------------------------------------------------
+    # The work DMG is mounted like:
+    #   /dev/disk6s1 248Mi 228Mi 20Mi 93% 58449 5027 92% /Volumes/KLayout
+    #-----------------------------------------------------------------------
+    global MountDir   # the mount directory: eg. /Volumes/KLayout
+    global FileSys    # the file system    : eg. /dev/disk6s1
 
-  #-------------------------------------------------------------
-  # [1] Print message
-  #-------------------------------------------------------------
-  if not msg == "":
-    print(msg)
+    #-------------------------------------------------------------
+    # [1] Print message
+    #-------------------------------------------------------------
+    if not msg == "":
+        print(msg)
 
-  #-------------------------------------------------------------
-  # [2] Do the following jobs (0) through (14) sequentially
-  #-------------------------------------------------------------
+    #-------------------------------------------------------------
+    # [2] Do the following jobs (0) through (14) sequentially
+    #-------------------------------------------------------------
 
-  #--------------------------------------------------------
-  # (0) Cleanup ProjectDir/
-  #--------------------------------------------------------
-  CleanUp()
+    #--------------------------------------------------------
+    # (0) Cleanup ProjectDir/
+    #--------------------------------------------------------
+    CleanUp()
 
-  #--------------------------------------------------------
-  # (1) Read the AppleScript template file and generate
-  #     the actual one to execute later
-  #--------------------------------------------------------
-  os.chdir(ProjectDir)
-  print( ">>> (1) Preparing AppleScript to execute later..." )
-  tempScr = "macbuild/Resources/template-KLayoutDMG.applescript"
-  try:
-    fd   = open( tempScr, "r" )
-    tmpl = fd.read()
-    fd.close()
-  except Exception as e:
-    print( "        ! Failed to read <%s>" % tempScr, file=sys.stderr )
-    return False
-  else:
-    t = string.Template(tmpl)
-    # Figures below were determined by experiments for best fit
-    applescript = t.safe_substitute(
-                      ORGX='50', ORGY='100',
-                      WIN_WIDTH='1000', WIN_HEIGHT='500',
-                      FULL_PATH_DS_STORE='/Volumes/%s/.DS_Store' % VolumeDMG,
-                      BACKGROUND_PNG_FILE=BackgroundPNG,
-                      ITEM_1='%s' % BundleName,  X1='900', Y1='165',
-                      ITEM_2='Applications',     X2='900', Y2='345',
-                      ITEM_3=Item3AppleScript,
-                      CHECK_BASH='[ -f " & dotDSStore & " ]; echo $?'
-                    )
-  try:
-    # print(applescript)
-    fd = open( AppleScriptDMG, "w" )
-    fd.write(applescript)
-    fd.close()
-  except Exception as e:
-    print( "! Failed to write <%s>" % AppleScriptDMG, file=sys.stderr )
-    return False
-  else:
-    print( "        saved <%s>" % AppleScriptDMG )
+    #--------------------------------------------------------
+    # (1) Read the AppleScript template file and generate
+    #     the actual one to execute later
+    #--------------------------------------------------------
+    os.chdir(ProjectDir)
+    print( ">>> (1) Preparing AppleScript to execute later..." )
+    tempScr = "macbuild/Resources/template-KLayoutDMG.applescript"
+    try:
+        fd   = open( tempScr, "r" )
+        tmpl = fd.read()
+        fd.close()
+    except Exception as e:
+        print( "        ! Failed to read <%s>" % tempScr, file=sys.stderr )
+        return False
+    else:
+        t = string.Template(tmpl)
+        # Figures below were determined by experiments for best fit
+        applescript = t.safe_substitute(
+                                            ORGX='50', ORGY='100',
+                                            WIN_WIDTH='1000', WIN_HEIGHT='500',
+                                            FULL_PATH_DS_STORE='/Volumes/%s/.DS_Store' % VolumeDMG,
+                                            BACKGROUND_PNG_FILE=BackgroundPNG,
+                                            ITEM_1='%s' % BundleName,  X1='900', Y1='165',
+                                            ITEM_2='Applications',     X2='900', Y2='345',
+                                            ITEM_3=Item3AppleScript,
+                                            CHECK_BASH='[ -f " & dotDSStore & " ]; echo $?'
+                                        )
+    try:
+        # print(applescript)
+        fd = open( AppleScriptDMG, "w" )
+        fd.write(applescript)
+        fd.close()
+    except Exception as e:
+        print( "! Failed to write <%s>" % AppleScriptDMG, file=sys.stderr )
+        return False
+    else:
+        print( "        saved <%s>" % AppleScriptDMG )
 
-  #----------------------------------------------------
-  # (2) Create a work disk image under ProjectDir/
-  #----------------------------------------------------
-  if os.path.exists(WorkDMG):
-    os.remove(WorkDMG)
-  dmgsize  = OccupiedDS + 20 # approx. occupied size plus 20[MB]
-  cmdline  = 'hdiutil create -srcfolder %s -volname %s -fs HFS+ -fsargs "-c c=64,a=16,e=16" '
-  cmdline += '-format UDRW -size %dm  %s'
-  command  = cmdline % (PkgDir, VolumeDMG, dmgsize, WorkDMG)
-  print( ">>> (2) Creating a work DMG file <%s> of <%d> [MB] with the volume name of <%s>..." % (WorkDMG, dmgsize, VolumeDMG) )
-  os.system(command)
-  MountDir = "/Volumes/%s" % VolumeDMG
+    #----------------------------------------------------
+    # (2) Create a work disk image under ProjectDir/
+    #----------------------------------------------------
+    if os.path.exists(WorkDMG):
+        os.remove(WorkDMG)
+    dmgsize  = OccupiedDS + 20 # approx. occupied size plus 20[MB]
+    cmdline  = 'hdiutil create -srcfolder %s -volname %s -fs HFS+ -fsargs "-c c=64,a=16,e=16" '
+    cmdline += '-format UDRW -size %dm  %s'
+    command  = cmdline % (PkgDir, VolumeDMG, dmgsize, WorkDMG)
+    print( ">>> (2) Creating a work DMG file <%s> of <%d> [MB] with the volume name of <%s>..." % (WorkDMG, dmgsize, VolumeDMG) )
+    os.system(command)
+    MountDir = "/Volumes/%s" % VolumeDMG
 
-  #--------------------------------------------------------
-  # (3) Check if the mount point 'MountDir' already exists.
-  #     If so, unmount it first.
-  #--------------------------------------------------------
-  command1 = "hdiutil info | grep %s | grep \"/dev/\" | awk '{print $1}'" % VolumeDMG
-  print ( ">>> (3) Checking if the mount point <%s> already exists..." % MountDir)
-  FileSys = os.popen(command1).read().strip('\n')
-  if os.path.isdir(MountDir) and not FileSys == "":
-    command2 = "hdiutil detach %s" % FileSys
+    #--------------------------------------------------------
+    # (3) Check if the mount point 'MountDir' already exists.
+    #     If so, unmount it first.
+    #--------------------------------------------------------
+    command1 = "hdiutil info | grep %s | grep \"/dev/\" | awk '{print $1}'" % VolumeDMG
+    print ( ">>> (3) Checking if the mount point <%s> already exists..." % MountDir)
+    FileSys = os.popen(command1).read().strip('\n')
+    if os.path.isdir(MountDir) and not FileSys == "":
+        command2 = "hdiutil detach %s" % FileSys
+        os.system(command2)
+        print( "        Mount directory <%s> was detached" % MountDir )
+    else:
+        print( "        Mount directory <%s> does not exist; nothing to do" % MountDir )
+
+    #--------------------------------------------------------
+    # (4) Mount the DMG
+    #--------------------------------------------------------
+    print( ">>> (4) Mounting <%s> to <%s>" % (WorkDMG, MountDir ) )
+    command1 = "hdiutil attach %s -readwrite -noverify -quiet -noautoopen" % WorkDMG
+    os.system(command1)
+
+    command2 = "hdiutil info | grep %s | grep \"/dev/\" | awk '{print $1}'" % VolumeDMG
+    FileSys  = os.popen(command2).read().strip('\n')
+    if FileSys == "":
+        print( "! Failed to identify the file system on which <%s> is mounted" % VolumeDMG )
+        return False
+    else:
+        print( "        File System = %s" % FileSys )
+
+    #--------------------------------------------------------
+    # (5) Copy the background image
+    #--------------------------------------------------------
+    print( ">>> (5) Copying the background image..." )
+    imageSrc  = "macbuild/Resources/%s" % BackgroundPNG
+    imageDest = "%s/.background" % MountDir
+    if not os.path.isdir(imageDest):
+        os.mkdir(imageDest)
+    command = "\cp -p %s %s/%s" % (imageSrc, imageDest, BackgroundPNG)
+    os.system(command)
+
+    #--------------------------------------------------------
+    # (6) Create a symbolic link to /Applications
+    #--------------------------------------------------------
+    print( ">>> (6) Creating a symbolic link to /Applications..." )
+    command = "\ln -s %s %s/%s" % (RootApplications, MountDir, RootApplications)
+    os.system(command)
+
+    #--------------------------------------------------------
+    # (7) Run the AppleScript
+    #--------------------------------------------------------
+    print( ">>> (7) Running the AppleScript..." )
+    command = "/usr/bin/osascript %s %s" % (AppleScriptDMG, VolumeDMG)
+    process = subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True )
+    output, error = process.communicate()
+    if not output == "":
+        print( "        STDOUT: %s" % output )
+    if not error == "":
+        print( "        STDERR: %s" % error )
+
+    #--------------------------------------------------------
+    # (8) Copy the custom volume icon
+    #--------------------------------------------------------
+    sleep(4)
+    print( ">>> (8) Copying the volume icon..." )
+    iconsSrc  = "macbuild/Resources/%s" % VolumeIcons
+    iconsDest = "%s/.VolumeIcon.icns" % MountDir
+    command1  = "\cp -p %s %s" % (iconsSrc, iconsDest)
+    command2  = "SetFile -c icnC %s" % iconsDest
+    os.system(command1)
+    sleep(2)
     os.system(command2)
-    print( "        Mount directory <%s> was detached" % MountDir )
-  else:
-    print( "        Mount directory <%s> does not exist; nothing to do" % MountDir )
+    sleep(2)
 
-  #--------------------------------------------------------
-  # (4) Mount the DMG
-  #--------------------------------------------------------
-  print( ">>> (4) Mounting <%s> to <%s>" % (WorkDMG, MountDir ) )
-  command1 = "hdiutil attach %s -readwrite -noverify -quiet -noautoopen" % WorkDMG
-  os.system(command1)
+    #--------------------------------------------------------
+    # (9) Change the permission
+    #--------------------------------------------------------
+    print( ">>> (9) Changing permission to 755..." )
+    command = "\chmod -Rf 755 %s &> /dev/null" % MountDir
+    os.system(command)
 
-  command2 = "hdiutil info | grep %s | grep \"/dev/\" | awk '{print $1}'" % VolumeDMG
-  FileSys  = os.popen(command2).read().strip('\n')
-  if FileSys == "":
-    print( "! Failed to identify the file system on which <%s> is mounted" % VolumeDMG )
-    return False
-  else:
-    print( "        File System = %s" % FileSys )
+    #--------------------------------------------------------
+    # (10) Set volume bootability and startup disk options.
+    #      The folder will open on mount.
+    #--------------------------------------------------------
+    print( ">>> (10) Setting volume bootability and startup disk options..." )
+    command = "bless --folder %s --openfolder %s" % (MountDir, MountDir)
+    os.system(command)
+    sleep(2)
 
-  #--------------------------------------------------------
-  # (5) Copy the background image
-  #--------------------------------------------------------
-  print( ">>> (5) Copying the background image..." )
-  imageSrc  = "macbuild/Resources/%s" % BackgroundPNG
-  imageDest = "%s/.background" % MountDir
-  if not os.path.isdir(imageDest):
-    os.mkdir(imageDest)
-  command = "\cp -p %s %s/%s" % (imageSrc, imageDest, BackgroundPNG)
-  os.system(command)
+    #--------------------------------------------------------
+    # (11) Set attributes of files and directories
+    #--------------------------------------------------------
+    print( ">>> (11) Setting attributes of files and directories..." )
+    command = "SetFile -a C %s" % MountDir # Custom icon (allowed on folders)
+    os.system(command)
+    sleep(2)
 
-  #--------------------------------------------------------
-  # (6) Create a symbolic link to /Applications
-  #--------------------------------------------------------
-  print( ">>> (6) Creating a symbolic link to /Applications..." )
-  command = "\ln -s %s %s/%s" % (RootApplications, MountDir, RootApplications)
-  os.system(command)
+    #--------------------------------------------------------
+    # (12) Unmount the disk image
+    #--------------------------------------------------------
+    print( ">>> (12) Unmounting the disk image..." )
+    command = "hdiutil detach %s" % FileSys
+    os.system(command)
 
-  #--------------------------------------------------------
-  # (7) Run the AppleScript
-  #--------------------------------------------------------
-  print( ">>> (7) Running the AppleScript..." )
-  command = "/usr/bin/osascript %s %s" % (AppleScriptDMG, VolumeDMG)
-  process = subprocess.Popen( command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True )
-  output, error = process.communicate()
-  if not output == "":
-    print( "        STDOUT: %s" % output )
-  if not error == "":
-    print( "        STDERR: %s" % error )
+    #--------------------------------------------------------
+    # (13) Compress the disk image
+    #--------------------------------------------------------
+    print( "" )
+    print( ">>> (13) Compressing the disk image..." )
+    command = "hdiutil convert %s -format UDZO -imagekey zlib-level=9 -o %s" % (WorkDMG, TargetDMG)
+    os.system(command)
+    os.remove(WorkDMG)
+    print( "" )
+    print( "        generated compressed target DMG <%s>" % TargetDMG )
 
-  #--------------------------------------------------------
-  # (8) Copy the custom volume icon
-  #--------------------------------------------------------
-  sleep(4)
-  print( ">>> (8) Copying the volume icon..." )
-  iconsSrc  = "macbuild/Resources/%s" % VolumeIcons
-  iconsDest = "%s/.VolumeIcon.icns" % MountDir
-  command1  = "\cp -p %s %s" % (iconsSrc, iconsDest)
-  command2  = "SetFile -c icnC %s" % iconsDest
-  os.system(command1)
-  sleep(2)
-  os.system(command2)
-  sleep(2)
+    #--------------------------------------------------------
+    # (14) Compute MD5 checksum
+    #--------------------------------------------------------
+    print( "" )
+    print( ">>> (14) Computing MD5 checksum..." )
+    with open( TargetDMG, "rb" ) as f:
+        data = f.read()
+        md5  = hashlib.md5(data).hexdigest()
+        md5 += " *%s\n" % TargetDMG
+    f.close()
+    path, ext    = os.path.splitext( os.path.basename(TargetDMG) )
+    md5TargetDMG = path + ".dmg.md5"
+    with open( md5TargetDMG, "w" ) as f:
+        f.write(md5)
+    f.close()
+    print( "        generated MD5 checksum file <%s>" % md5TargetDMG )
+    print( "" )
 
-  #--------------------------------------------------------
-  # (9) Change the permission
-  #--------------------------------------------------------
-  print( ">>> (9) Changing permission to 755..." )
-  command = "\chmod -Rf 755 %s &> /dev/null" % MountDir
-  os.system(command)
+    #-------------------------------------------------------------------------
+    # [3] Rename back the application bundle to the default name if required
+    #-------------------------------------------------------------------------
+    if BundleName != "" and BundleName != DefaultBundleName:
+        dirPresent = "%s/%s" % (PkgDir, BundleName)
+        dirDefault = "%s/%s" % (PkgDir, DefaultBundleName)
+        os.rename( dirPresent, dirDefault )
 
-  #--------------------------------------------------------
-  # (10) Set volume bootability and startup disk options.
-  #      The folder will open on mount.
-  #--------------------------------------------------------
-  print( ">>> (10) Setting volume bootability and startup disk options..." )
-  command = "bless --folder %s --openfolder %s" % (MountDir, MountDir)
-  os.system(command)
-  sleep(2)
-
-  #--------------------------------------------------------
-  # (11) Set attributes of files and directories
-  #--------------------------------------------------------
-  print( ">>> (11) Setting attributes of files and directories..." )
-  command = "SetFile -a C %s" % MountDir # Custom icon (allowed on folders)
-  os.system(command)
-  sleep(2)
-
-  #--------------------------------------------------------
-  # (12) Unmount the disk image
-  #--------------------------------------------------------
-  print( ">>> (12) Unmounting the disk image..." )
-  command = "hdiutil detach %s" % FileSys
-  os.system(command)
-
-  #--------------------------------------------------------
-  # (13) Compress the disk image
-  #--------------------------------------------------------
-  print( "" )
-  print( ">>> (13) Compressing the disk image..." )
-  command = "hdiutil convert %s -format UDZO -imagekey zlib-level=9 -o %s" % (WorkDMG, TargetDMG)
-  os.system(command)
-  os.remove(WorkDMG)
-  print( "" )
-  print( "        generated compressed target DMG <%s>" % TargetDMG )
-
-  #--------------------------------------------------------
-  # (14) Compute MD5 checksum
-  #--------------------------------------------------------
-  print( "" )
-  print( ">>> (14) Computing MD5 checksum..." )
-  with open( TargetDMG, "rb" ) as f:
-    data = f.read()
-    md5  = hashlib.md5(data).hexdigest()
-    md5 += " *%s\n" % TargetDMG
-  f.close()
-  path, ext    = os.path.splitext( os.path.basename(TargetDMG) )
-  md5TargetDMG = path + ".dmg.md5"
-  with open( md5TargetDMG, "w" ) as f:
-    f.write(md5)
-  f.close()
-  print( "        generated MD5 checksum file <%s>" % md5TargetDMG )
-  print( "" )
-
-  #-------------------------------------------------------------------------
-  # [3] Rename back the application bundle to the default name if required
-  #-------------------------------------------------------------------------
-  if BundleName != "" and BundleName != DefaultBundleName:
-    dirPresent = "%s/%s" % (PkgDir, BundleName)
-    dirDefault = "%s/%s" % (PkgDir, DefaultBundleName)
-    os.rename( dirPresent, dirDefault )
-
-  return True
+    return True
 
 #------------------------------------------------------------------------------
 ## Clean up
@@ -651,54 +681,55 @@ def MakeTargetDMGFile(msg=""):
 #------------------------------------------------------------------------------
 def CleanUp(msg=""):
 
-  #----------------------------------------------------
-  # [1] Print message
-  #----------------------------------------------------
-  if not msg == "":
-    print(msg)
+    #----------------------------------------------------
+    # [1] Print message
+    #----------------------------------------------------
+    if not msg == "":
+        print(msg)
 
-  #----------------------------------------------------
-  # [2] Clean up *.dmg*
-  #----------------------------------------------------
-  os.chdir(ProjectDir)
-  dmgs = glob.glob( "*.dmg*" )
-  for item in dmgs:
-    os.system( "rm -Rf %s" % item )
+    #----------------------------------------------------
+    # [2] Clean up *.dmg*
+    #----------------------------------------------------
+    os.chdir(ProjectDir)
+    dmgs = glob.glob( "*.dmg*" )
+    for item in dmgs:
+        print("Removing %s" % item)
+        os.system( "rm -Rf -- \"%s\"" % item )
 
-  #----------------------------------------------------
-  # [3] Clean up AppleScript if any
-  #----------------------------------------------------
-  if os.path.exists(AppleScriptDMG) and os.path.isfile(AppleScriptDMG):
-    os.remove(AppleScriptDMG)
+    #----------------------------------------------------
+    # [3] Clean up AppleScript if any
+    #----------------------------------------------------
+    if os.path.exists(AppleScriptDMG) and os.path.isfile(AppleScriptDMG):
+        os.remove(AppleScriptDMG)
 
 #------------------------------------------------------------------------------
 ## The main function
 #------------------------------------------------------------------------------
 def Main():
-  SetGlobals()
-  ParseCommandLineArguments()
-  if OpMake:
-    print( "" )
-    print( "  ### You are going to make <%s> from <%s>" % (TargetDMG, PkgDir) )
-    print( "      KLayout bundles occupy about <%d> [MB] of disc space." % OccupiedDS )
-    print( "" )
-    ok = MakeTargetDMGFile()
-    if not ok:
-      print( "  !!! Failed to make the target DMG <%s> ..." % TargetDMG, file=sys.stderr )
-      print( "", file=sys.stderr )
+    SetGlobals()
+    ParseCommandLineArguments()
+    if OpMake:
+        print( "" )
+        print( "  ### You are going to make <%s> from <%s>" % (TargetDMG, PkgDir) )
+        print( "      KLayout bundles occupy about <%d> [MB] of disc space." % OccupiedDS )
+        print( "" )
+        ok = MakeTargetDMGFile()
+        if not ok:
+            print( "  !!! Failed to make the target DMG <%s> ..." % TargetDMG, file=sys.stderr )
+            print( "", file=sys.stderr )
+        else:
+            print( "  ### Done making the target DMG" )
+            print( "" )
     else:
-      print( "  ### Done making the target DMG" )
-      print( "" )
-  else:
-    print( "" )
-    print( "  ### You are going to clean up <%s> directory" % ProjectDir )
-    CleanUp()
-    print( "  ### Done cleaning up" )
-    print( "" )
+        print( "" )
+        print( "  ### You are going to clean up <%s> directory" % ProjectDir )
+        CleanUp()
+        print( "  ### Done cleaning up" )
+        print( "" )
 
 #===================================================================================
 if __name__ == "__main__":
-  Main()
+    Main()
 
 #---------------
 # End of file
diff --git a/macbuild/nightyCatalina.py b/macbuild/nightyCatalina.py
index 38badd7c3..57ab7f9ef 100755
--- a/macbuild/nightyCatalina.py
+++ b/macbuild/nightyCatalina.py
@@ -6,245 +6,461 @@ import sys
 import os
 import shutil
 import glob
-import platform
 import optparse
 import subprocess
 
-Variation = [ 'std', 'ports', 'brew', 'ana3' ]
+#------------------------------------------------------------------------------
+## To populate the build target dictionary
+#
+# @return a dictionary; key=integer, value=mnemonic
+#------------------------------------------------------------------------------
+def Get_Build_Target_Dict():
+    buildTargetDic    = dict()
+    buildTargetDic[0] = 'std'
+    buildTargetDic[1] = 'ports'
+    buildTargetDic[2] = 'brew'
+    buildTargetDic[3] = 'brewHW'
+    buildTargetDic[4] = 'ana3'
 
-Usage  = "\n"
-Usage += "------------------------------------------------------------------------------------------\n"
-Usage += " nightyCatalina.py [EXPERIMENTAL] \n"
-Usage += "   << To execute the jobs for making KLatyout's DMGs for macOS Catalina >> \n"
-Usage += "\n"
-Usage += "$ [python] nightyCatalina.py \n"
-Usage += "   option & argument : comment on option if any                       | default value\n"
-Usage += "   -------------------------------------------------------------------+--------------\n"
-Usage += "     [--build]            : build and deploy                          | disabled\n"
-Usage += "     [--makedmg <srlno>]  : make DMG                                  | disabled\n"
-Usage += "     [--cleandmg <srlno>] : clean DMG                                 | disabled\n"
-Usage += "     [--upload <dropbox>] : upload to $HOME/Dropbox/klayout/<dropbox> | disabled\n"
-Usage += "     [-?|--?]             : print this usage and exit                 | disabled\n"
-Usage += "----------------------------------------------------------------------+-------------------\n"
+    buildTargetDic[5] = 'brewA'
+    buildTargetDic[6] = 'brewAHW'
+    return buildTargetDic
 
-def ParseCommandLineArguments():
-  global Usage
-  global Build     # operation flag
-  global MakeDMG   # operation flag
-  global CleanDMG  # operation flag
-  global Upload    # operation flag
-  global SrlDMG    # DMG serial number
-  global Dropbox   # Dropbox directory
+#------------------------------------------------------------------------------
+## To get the build option dictionary
+#
+# @param[in] targetDic  build target dictionary
+#
+# @return a dictionary; key=mnemonic, value=build option list
+#------------------------------------------------------------------------------
+def Get_Build_Options( targetDic ):
+    buildOp = dict()
+    for key in targetDic.keys():
+        target = targetDic[key]
+        if target == "std": # use 'Qt5Brew' that provides Qt 5.15.1 to run on "Big Sur", too
+            buildOp["std"]     = [ '-q', 'Qt5Brew',     '-r', 'sys',  '-p', 'sys'    ]
+        elif target == "ports":
+            buildOp["ports"]   = [ '-q', 'Qt5MacPorts', '-r', 'MP27', '-p', 'MP38'   ]
+        elif target == "brew":
+            buildOp["brew"]    = [ '-q', 'Qt5Brew',     '-r', 'HB27', '-p', 'HB38'   ]
+        elif target == "brewHW":
+            buildOp["brewHW"]  = [ '-q', 'Qt5Brew',     '-r', 'sys',  '-p', 'HB38'   ]
+        elif target == "ana3":
+            buildOp["ana3"]    = [ '-q', 'Qt5Ana3',     '-r', 'Ana3', '-p', 'Ana3'   ]
+        elif target == "brewA":
+            buildOp["brewA"]   = [ '-q', 'Qt5Brew',     '-r', 'HB27', '-p', 'HBAuto' ]
+        elif target == "brewAHW":
+            buildOp["brewAHW"] = [ '-q', 'Qt5Brew',     '-r', 'sys',  '-p', 'HBAuto' ]
+    return buildOp
 
-  p = optparse.OptionParser( usage=Usage )
-  p.add_option( '--build',
-                action='store_true',
-                dest='build',
-                default=False,
-                help='build and deploy' )
+#------------------------------------------------------------------------------
+## To get the ".macQAT" dictionary for QA Test
+#
+# @param[in] targetDic  build target dictionary
+#
+# @return a dictionary; key=mnemonic, value=".macQAT" directory
+#------------------------------------------------------------------------------
+def Get_QAT_Directory( targetDic ):
+    dirQAT = dict()
+    for key in targetDic.keys():
+        target = targetDic[key]
+        if target == "std":
+            dirQAT["std"]       = 'qt5Brew.build.macos-Catalina-release-RsysPsys.macQAT'
+        elif target == "ports":
+            dirQAT["ports"]     = 'qt5MP.build.macos-Catalina-release-Rmp27Pmp38.macQAT'
+        elif target == "brew":
+            dirQAT["brew"]      = 'qt5Brew.build.macos-Catalina-release-Rhb27Phb38.macQAT'
+        elif target == "brewHW":
+            dirQAT["brewHW"]    = 'qt5Brew.build.macos-Catalina-release-RsysPhb38.macQAT'
+        elif target == "ana3":
+            dirQAT["ana3"]      = 'qt5Ana3.build.macos-Catalina-release-Rana3Pana3.macQAT'
+        elif target == "brewA":
+            dirQAT["brewA"]     = 'qt5Brew.build.macos-Catalina-release-Rhb27Phbauto.macQAT'
+        elif target == "brewAHW":
+            dirQAT["brewAHW"]   = 'qt5Brew.build.macos-Catalina-release-RsysPhbauto.macQAT'
+    return dirQAT
 
-  p.add_option( '--makedmg',
-                dest='makedmg',
-                help='make DMG' )
+#------------------------------------------------------------------------------
+## To get the build option dictionary for making/cleaning DMG
+#
+# @param[in] targetDic  build target dictionary
+# @param[in] srlDMG     serial number of DMG
+# @param[in] makeflag   True to make; False to clean
+#
+# @return a dictionary; key=mnemonic, value=build option list
+#------------------------------------------------------------------------------
+def Get_Package_Options( targetDic, srlDMG, makeflag ):
+    if makeflag:
+        flag = '-m'
+    else:
+        flag = '-c'
 
-  p.add_option( '--cleandmg',
-                dest='cleandmg',
-                help='clean DMG' )
+    packOp = dict()
+    for key in targetDic.keys():
+        target = targetDic[key]
+        if target == "std":
+            packOp["std"]       = [ '-p', 'ST-qt5Brew.pkg.macos-Catalina-release-RsysPsys',     '-s', '%d' % srlDMG, '%s' % flag ]
+        elif target == "ports":
+            packOp["ports"]     = [ '-p', 'LW-qt5MP.pkg.macos-Catalina-release-Rmp27Pmp38',     '-s', '%d' % srlDMG, '%s' % flag ]
+        elif target == "brew":
+            packOp["brew"]      = [ '-p', 'LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb38',   '-s', '%d' % srlDMG, '%s' % flag ]
+        elif target == "brewHW":
+            packOp["brewHW"]    = [ '-p', 'HW-qt5Brew.pkg.macos-Catalina-release-RsysPhb38',    '-s', '%d' % srlDMG, '%s' % flag ]
+        elif target == "ana3":
+            packOp["ana3"]      = [ '-p', 'LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3',   '-s', '%d' % srlDMG, '%s' % flag ]
+        elif target == "brewA":
+            packOp["brewA"]     = [ '-p', 'LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phbauto', '-s', '%d' % srlDMG, '%s' % flag ]
+        elif target == "brewAHW":
+            packOp["brewAHW"]   = [ '-p', 'HW-qt5Brew.pkg.macos-Catalina-release-RsysPhbauto',  '-s', '%d' % srlDMG, '%s' % flag ]
+    return packOp
 
-  p.add_option( '--upload',
-                dest='upload',
-                help='upload to Dropbox' )
+#------------------------------------------------------------------------------
+## To parse the command line arguments
+#------------------------------------------------------------------------------
+def Parse_CommandLine_Arguments():
+    global Usage     # usage
+    global Target    # target list
+    global Build     # operation flag
+    global QATest    # operation flag
+    global QACheck   # operation flag
+    global MakeDMG   # operation flag
+    global CleanDMG  # operation flag
+    global Upload    # operation flag
+    global SrlDMG    # DMG serial number
+    global Dropbox   # Dropbox directory
 
-  p.add_option( '-?', '--??',
-                action='store_true',
-                dest='checkusage',
-                default=False,
-                help='check usage (false)' )
+    Usage  = "\n"
+    Usage += "--------------------------------------------------------------------------------------------\n"
+    Usage += " nightyCatalina.py [EXPERIMENTAL] \n"
+    Usage += "   << To execute the jobs for making KLatyout's DMGs for macOS Catalina >> \n"
+    Usage += "\n"
+    Usage += "$ [python] nightyCatalina.py \n"
+    Usage += "   option & argument : comment on option if any                            | default value\n"
+    Usage += "   ------------------------------------------------------------------------+--------------\n"
+    Usage += "   [--target <list>] : 0='std', 1='ports', 2='brew', 3='brewHW', 4='ana3', | '0,1,2,3,4'\n"
+    Usage += "                       5='brewA', 6='brewAHW'                              | \n"
+    Usage += "   [--build] : build and deploy                                            | disabled\n"
+    Usage += "   [--test]  : run the QA Test                                             | disabled\n"
+    Usage += "   [--check] : check the QA Test results                                   | disabled\n"
+    Usage += "   [--makedmg|--cleandmg <srlno>] : make or clean DMGs                     | disabled\n"
+    Usage += "   [--upload <dropbox>] : upload DMGs to $HOME/Dropbox/klayout/<dropbox>   | disabled\n"
+    Usage += "   [-?|--?]             : print this usage and exit                        | disabled\n"
+    Usage += "                                                                           | \n"
+    Usage += "      Standard sequence for using this script:                             | \n"
+    Usage += "          (1) $ ./nightyCatalina.py  --build                               | \n"
+    Usage += "          (2)   (confirm the build results)                                | \n"
+    Usage += "          (3) $ ./nightyCatalina.py  --test                                | \n"
+    Usage += "          (4) $ ./nightyCatalina.py  --check (confirm the QA Test results) | \n"
+    Usage += "          (5) $ ./nightyCatalina.py  --makedmg  1                          | \n"
+    Usage += "          (6) $ ./nightyCatalina.py  --upload  '0.26.9'                    | \n"
+    Usage += "          (7) $ ./nightyCatalina.py  --cleandmg 1                          | \n"
+    Usage += "---------------------------------------------------------------------------+----------------\n"
 
-  p.set_defaults( build      = False,
-                  makedmg    = "",
-                  cleandmg   = "",
-                  upload     = "",
-                  checkusage = False )
+    p = optparse.OptionParser( usage=Usage )
+    p.add_option( '--target',
+                    dest='targets',
+                    help='build target list' )
 
-  opt, args = p.parse_args()
-  if opt.checkusage:
-    print(Usage)
-    quit()
+    p.add_option( '--build',
+                    action='store_true',
+                    dest='build',
+                    default=False,
+                    help='build and deploy' )
 
-  Build    = False
-  MakeDMG  = False
-  CleanDMG = False
-  Upload   = False
+    p.add_option( '--test',
+                    action='store_true',
+                    dest='qa_test',
+                    default=False,
+                    help='run the QA Test' )
 
-  Build = opt.build
+    p.add_option( '--check',
+                    action='store_true',
+                    dest='qa_check',
+                    default=False,
+                    help='check the QA Test results' )
 
-  if not opt.makedmg == "":
-    MakeDMG  = True
-    CleanDMG = False
-    SrlDMG   = int(opt.makedmg)
+    p.add_option( '--makedmg',
+                    dest='makedmg',
+                    help='make DMG' )
 
-  if not opt.cleandmg == "":
+    p.add_option( '--cleandmg',
+                    dest='cleandmg',
+                    help='clean DMG' )
+
+    p.add_option( '--upload',
+                    dest='upload',
+                    help='upload to Dropbox' )
+
+    p.add_option( '-?', '--??',
+                    action='store_true',
+                    dest='checkusage',
+                    default=False,
+                    help='check usage' )
+
+    p.set_defaults( targets    = "0,1,2,3,4",
+                    build      = False,
+                    qa_test    = False,
+                    qa_check   = False,
+                    makedmg    = "",
+                    cleandmg   = "",
+                    upload     = "",
+                    checkusage = False )
+
+    opt, args = p.parse_args()
+    if opt.checkusage:
+        print(Usage)
+        quit()
+
+    targetDic = Get_Build_Target_Dict()
+    Target    = list()
+    for idx in sorted( list( set( [ int(item) for item in opt.targets.split(",") ] ) ) ):
+        if idx in range(0, 7):
+            Target.append( targetDic[idx] )
+
+    Build    = opt.build
+    QATest   = opt.qa_test
+    QACheck  = opt.qa_check
     MakeDMG  = False
-    CleanDMG = True
-    SrlDMG   = int(opt.cleandmg)
+    CleanDMG = False
+    Upload   = False
 
-  if not opt.upload == "":
-    Upload  = True
-    Dropbox = opt.upload
+    if not opt.makedmg == "":
+        MakeDMG = True
+        SrlDMG  = int(opt.makedmg)
 
-  if not (Build or MakeDMG or CleanDMG or Upload):
-    print( "! No option selected" )
-    print(Usage)
-    quit()
+    if not opt.cleandmg == "":
+        CleanDMG = True
+        SrlDMG   = int(opt.cleandmg)
 
+    if MakeDMG and CleanDMG:
+        print( "! --makedmg and --cleandmg cannot be used simultaneously" )
+        print(Usage)
+        quit()
 
-def BuildDeploy():
-  PyBuild = "./build4mac.py"
+    if not opt.upload == "":
+        Upload  = True
+        Dropbox = opt.upload
 
-  Build = dict()
-  Build["std"]   = [ '-q', 'Qt5MacPorts', '-r', 'sys',  '-p', 'sys'  ]
-  Build["ports"] = [ '-q', 'Qt5MacPorts', '-r', 'MP26', '-p', 'MP37' ]
-  Build["brew"]  = [ '-q', 'Qt5Brew',     '-r', 'HB27', '-p', 'HB37' ]
-  Build["ana3"]  = [ '-q', 'Qt5Ana3',     '-r', 'Ana3', '-p', 'Ana3' ]
+    if not (Build or QATest or QACheck or MakeDMG or CleanDMG or Upload):
+        print( "! No option selected" )
+        print(Usage)
+        quit()
 
-  for key in Variation:
-    command1 = [ PyBuild ] + Build[key]
-    if key == "std":
-      command2 = [ PyBuild ] + Build[key] + ['-y']
-    else:
-      command2 = [ PyBuild ] + Build[key] + ['-Y']
-    print(command1)
-    print(command2)
-    #continue
+#------------------------------------------------------------------------------
+## To build and deploy
+#------------------------------------------------------------------------------
+def Build_Deploy():
+    pyBuilder = "./build4mac.py"
+    buildOp   = Get_Build_Options( Get_Build_Target_Dict() )
 
-    if subprocess.call( command1, shell=False ) != 0:
-      print( "", file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "!!! <%s>: failed to build KLayout" % PyBuild, file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "", file=sys.stderr )
-      sys.exit(1)
-    else:
-      print( "", file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "### <%s>: successfully built KLayout" % PyBuild, file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "", file=sys.stderr )
+    for key in Target:
+        command1 = [ pyBuilder ] + buildOp[key]
+        if key in [ "std", "brewHW", "brewAHW" ] :
+            command2 = [ pyBuilder ] + buildOp[key] + ['-y']
+        else:
+            command2 = [ pyBuilder ] + buildOp[key] + ['-Y']
+        print(command1)
+        print(command2)
+        #continue
 
-    if subprocess.call( command2, shell=False ) != 0:
-      print( "", file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "!!! <%s>: failed to deploy KLayout" % PyBuild, file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "", file=sys.stderr )
-      sys.exit(1)
-    else:
-      print( "", file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "### <%s>: successfully deployed KLayout" % PyBuild, file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "", file=sys.stderr )
+        if subprocess.call( command1, shell=False ) != 0:
+            print( "", file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "!!! <%s>: failed to build KLayout" % pyBuilder, file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "", file=sys.stderr )
+            sys.exit(1)
+        else:
+            print( "", file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "### <%s>: successfully built KLayout" % pyBuilder, file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "", file=sys.stderr )
 
+        if subprocess.call( command2, shell=False ) != 0:
+            print( "", file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "!!! <%s>: failed to deploy KLayout" % pyBuilder, file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "", file=sys.stderr )
+            sys.exit(1)
+        else:
+            print( "", file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "### <%s>: successfully deployed KLayout" % pyBuilder, file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "", file=sys.stderr )
 
+#------------------------------------------------------------------------------
+## To run the QA tests
+#
+# @param[in] exclude     test to exclude such as 'pymod,pya'
+#------------------------------------------------------------------------------
+def Run_QATest( exclude ):
+    pyRunnerQAT = "./macQAT.py"
+    dirQAT      = Get_QAT_Directory( Get_Build_Target_Dict() )
+
+    for key in Target:
+        command1 = [ pyRunnerQAT ] + [ '--run', '--exclude', '%s' % exclude ]
+        print( dirQAT[key], command1 )
+        #continue
+        os.chdir( dirQAT[key] )
+
+        if subprocess.call( command1, shell=False ) != 0:
+            print( "", file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "!!! <%s>: failed to run the QA Test" % pyRunnerQAT, file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "", file=sys.stderr )
+            sys.exit(1)
+        else:
+            print( "", file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "### <%s>: successfully ran the QA Test" % pyRunnerQAT, file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "", file=sys.stderr )
+
+        os.chdir( "../" )
+
+#------------------------------------------------------------------------------
+## To check the QA test results
+#
+# @param[in] lines  number of lines to dump from the tail
+#------------------------------------------------------------------------------
+def Check_QATest_Results( lines ):
+    tailCommand = "/usr/bin/tail"
+    dirQAT      = Get_QAT_Directory( Get_Build_Target_Dict() )
+
+    for key in Target:
+        os.chdir( dirQAT[key] )
+        logfile  = glob.glob( "*.log" )
+        command1 = [ tailCommand ] + [ '-n', '%d' % lines ] + logfile
+        print( dirQAT[key], command1 )
+        #continue
+
+        if subprocess.call( command1, shell=False ) != 0:
+            print( "", file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "!!! <%s>: failed to check the QA Test results" % tailCommand, file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "", file=sys.stderr )
+            sys.exit(1)
+        else:
+            print( "", file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "### <%s>: successfully checked the QA Test results" % tailCommand, file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "", file=sys.stderr )
+
+        os.chdir( "../" )
+
+#------------------------------------------------------------------------------
+## To make DMGs
+#
+# @param[in] srlDMG     DMG's serial number
+#------------------------------------------------------------------------------
 def DMG_Make( srlDMG ):
-  PyDMG = "./makeDMG4mac.py"
-  Stash = "./DMGStash"
+    pyDMGmaker = "./makeDMG4mac.py"
+    stashDMG   = "./DMGStash"
+    packOp     = Get_Package_Options( Get_Build_Target_Dict(), srlDMG, makeflag=True )
 
-  Pack = dict()
-  Pack["std"]   = [ '-p', 'ST-qt5MP.pkg.macos-Catalina-release-RsysPsys',     '-s', '%d' % srlDMG, '-m' ]
-  Pack["ports"] = [ '-p', 'LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp37',   '-s', '%d' % srlDMG, '-m' ]
-  Pack["brew"]  = [ '-p', 'LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb37', '-s', '%d' % srlDMG, '-m' ]
-  Pack["ana3"]  = [ '-p', 'LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3', '-s', '%d' % srlDMG, '-m' ]
+    if os.path.isdir( stashDMG ):
+        shutil.rmtree( stashDMG )
+    os.mkdir( stashDMG )
 
-  if os.path.isdir( Stash ):
-    shutil.rmtree( Stash )
-  os.mkdir( Stash )
+    for key in Target:
+        command1 = [ pyDMGmaker ] + packOp[key]
+        print(command1)
+        #continue
 
-  for key in Variation:
-    command3 = [ PyDMG ] + Pack[key]
-    print(command3)
-    #continue
-
-    if subprocess.call( command3, shell=False ) != 0:
-      print( "", file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "!!! <%s>: failed to make KLayout DMG" % PyDMG, file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "", file=sys.stderr )
-      sys.exit(1)
-    else:
-      print( "", file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "### <%s>: successfully made KLayout DMG" % PyDMG, file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "", file=sys.stderr )
-
-    dmgs = glob.glob( "*.dmg*" )
-    for item in dmgs:
-      shutil.move( item, Stash )
+        if subprocess.call( command1, shell=False ) != 0:
+            print( "", file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "!!! <%s>: failed to make KLayout DMG" % pyDMGmaker, file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "", file=sys.stderr )
+            sys.exit(1)
+        else:
+            print( "", file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "### <%s>: successfully made KLayout DMG" % pyDMGmaker, file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "", file=sys.stderr )
 
+        dmgs = glob.glob( "*.dmg*" )
+        for item in dmgs:
+            shutil.move( item, stashDMG )
 
+#------------------------------------------------------------------------------
+## To clean up DMGs
+#
+# @param[in] srlDMG     DMG's serial number
+#------------------------------------------------------------------------------
 def DMG_Clean( srlDMG ):
-  PyDMG = "./makeDMG4mac.py"
-  Stash = "./DMGStash"
+    pyDMGmaker = "./makeDMG4mac.py"
+    stashDMG   = "./DMGStash"
+    packOp     = Get_Package_Options( Get_Build_Target_Dict(), srlDMG, makeflag=False )
 
-  Pack = dict()
-  Pack["std"]   = [ '-p', 'ST-qt5MP.pkg.macos-Catalina-release-RsysPsys',     '-s', '%d' % srlDMG, '-c' ]
-  Pack["ports"] = [ '-p', 'LW-qt5MP.pkg.macos-Catalina-release-Rmp26Pmp37',   '-s', '%d' % srlDMG, '-c' ]
-  Pack["brew"]  = [ '-p', 'LW-qt5Brew.pkg.macos-Catalina-release-Rhb27Phb37', '-s', '%d' % srlDMG, '-c' ]
-  Pack["ana3"]  = [ '-p', 'LW-qt5Ana3.pkg.macos-Catalina-release-Rana3Pana3', '-s', '%d' % srlDMG, '-c' ]
+    if os.path.isdir( stashDMG ):
+        shutil.rmtree( stashDMG )
 
-  if os.path.isdir( Stash ):
-    shutil.rmtree( Stash )
+    for key in Target:
+        command1 = [ pyDMGmaker ] + packOp[key]
+        print(command1)
+        #continue
 
-  for key in Variation:
-    command3 = [ PyDMG ] + Pack[key]
-    print(command3)
-    #continue
+        if subprocess.call( command1, shell=False ) != 0:
+            print( "", file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "!!! <%s>: failed to clean KLayout DMG" % pyDMGmaker, file=sys.stderr )
+            print( "-----------------------------------------------------------------", file=sys.stderr )
+            print( "", file=sys.stderr )
+            sys.exit(1)
+        else:
+            print( "", file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "### <%s>: successfully cleaned KLayout DMG" % pyDMGmaker, file=sys.stderr )
+            print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
+            print( "", file=sys.stderr )
 
-    if subprocess.call( command3, shell=False ) != 0:
-      print( "", file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "!!! <%s>: failed to clean KLayout DMG" % PyDMG, file=sys.stderr )
-      print( "-----------------------------------------------------------------", file=sys.stderr )
-      print( "", file=sys.stderr )
-      sys.exit(1)
-    else:
-      print( "", file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "### <%s>: successfully cleaned KLayout DMG" % PyDMG, file=sys.stderr )
-      print( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++", file=sys.stderr )
-      print( "", file=sys.stderr )
+#------------------------------------------------------------------------------
+## To upload DMGs to Dropbox
+#
+# @param[in] targetdir     existing target directory such as "0.26.9"
+#------------------------------------------------------------------------------
+def Upload_To_Dropbox( targetdir ):
+    stashDMG = "./DMGStash"
 
+    distDir = os.environ["HOME"] + "/Dropbox/klayout/" + targetdir
+    if not os.path.isdir(distDir):
+        os.makedirs(distDir)
 
-def UploadToDropbox( targetdir ):
-  Stash = "./DMGStash"
-
-  distDir = os.environ["HOME"] + "/Dropbox/klayout/" + targetdir
-  if not os.path.isdir(distDir):
-    os.makedirs(distDir)
-
-  dmgs = glob.glob( "%s/*.dmg*" % Stash )
-  for item in dmgs:
-    shutil.copy2( item, distDir )
-
+    dmgs = glob.glob( "%s/*.dmg*" % stashDMG )
+    for item in dmgs:
+        shutil.copy2( item, distDir )
 
+#------------------------------------------------------------------------------
+## The main function
+#------------------------------------------------------------------------------
 def Main():
-  ParseCommandLineArguments()
+    Parse_CommandLine_Arguments()
 
-  if Build:
-    BuildDeploy()
-  elif MakeDMG:
-    DMG_Make( SrlDMG )
-  elif CleanDMG:
-    DMG_Clean( SrlDMG )
-  elif Upload:
-    UploadToDropbox( Dropbox )
+    if Build:
+        Build_Deploy()
+    if QATest:
+        Run_QATest( 'pymod,pya' )
+    if QACheck:
+        Check_QATest_Results( 20 )
+    elif MakeDMG:
+        DMG_Make( SrlDMG )
+    elif Upload:
+        Upload_To_Dropbox( Dropbox )
+    elif CleanDMG:
+        DMG_Clean( SrlDMG )
 
 #===================================================================================
 if __name__ == "__main__":
-  Main()
+    Main()
 
 #---------------
 # End of file
diff --git a/setup.py b/setup.py
index dbef7ca6e..02fb3b637 100644
--- a/setup.py
+++ b/setup.py
@@ -59,6 +59,7 @@ from setuptools.extension import Extension, Library
 import glob
 import os
 import re
+import sys
 import platform
 from distutils.errors import CompileError
 import distutils.command.build_ext
@@ -102,12 +103,20 @@ def parallelCCompile(self, sources, output_dir=None, macros=None, include_dirs=N
 
 
 # only if python version > 2.6, somehow the travis compiler hangs in 2.6
-import sys
-if sys.version_info[0] * 10 + sys.version_info[1] > 26:
+if sys.version_info[0] * 100 + sys.version_info[1] > 206:
     import distutils.ccompiler
     distutils.ccompiler.CCompiler.compile = parallelCCompile
 
 
+# put a path in quotes if required
+def quote_path(path):
+    # looks like disutils don't need path quoting in version >= 3.9:
+    if " " in path and sys.version_info[0] * 100 + sys.version_info[1] < 309:
+        return "\"" + path + "\""
+    else:
+        return path
+
+
 # TODO: delete (Obsolete)
 # patch get_ext_filename
 from distutils.command.build_ext import build_ext
@@ -252,10 +261,10 @@ class Config(object):
         if platform.system() == "Windows":
             bits = os.getenv("KLAYOUT_BITS")
             if bits:
-                return ["\"-I" + os.path.join(bits, "zlib", "include") + "\"",
-                        "\"-I" + os.path.join(bits, "ptw", "include") + "\"",
-                        "\"-I" + os.path.join(bits, "expat", "include") + "\"",
-                        "\"-I" + os.path.join(bits, "curl", "include") + "\""]
+                return [quote_path("-I" + os.path.join(bits, "zlib", "include")),
+                        quote_path("-I" + os.path.join(bits, "ptw", "include")),
+                        quote_path("-I" + os.path.join(bits, "expat", "include")),
+                        quote_path("-I" + os.path.join(bits, "curl", "include"))]
             else:
                 return []
         elif platform.system() == "Darwin":
@@ -285,10 +294,10 @@ class Config(object):
             args = ["/DLL"]
             bits = os.getenv("KLAYOUT_BITS")
             if bits:
-                args += ["\"/LIBPATH:" + os.path.join(bits, "zlib", "libraries") + "\"",
-                         "\"/LIBPATH:" + os.path.join(bits, "ptw", "libraries") + "\"",
-                         "\"/LIBPATH:" + os.path.join(bits, "expat", "libraries") + "\"",
-                         "\"/LIBPATH:" + os.path.join(bits, "curl", "libraries") + "\""]
+                args += [quote_path("/LIBPATH:" + os.path.join(bits, "zlib", "libraries")),
+                         quote_path("/LIBPATH:" + os.path.join(bits, "ptw", "libraries")),
+                         quote_path("/LIBPATH:" + os.path.join(bits, "expat", "libraries")),
+                         quote_path("/LIBPATH:" + os.path.join(bits, "curl", "libraries"))]
             return args
         elif platform.system() == "Darwin":
             # For the dependency modules, make sure we produce a dylib.
diff --git a/src/db/db/dbLayout.cc b/src/db/db/dbLayout.cc
index 199441231..2e767684e 100644
--- a/src/db/db/dbLayout.cc
+++ b/src/db/db/dbLayout.cc
@@ -272,6 +272,7 @@ Layout::Layout (db::Manager *manager)
     m_properties_repository (this),
     m_guiding_shape_layer (-1),
     m_waste_layer (-1),
+    m_do_cleanup (false),
     m_editable (db::default_editable_mode ())
 {
   // .. nothing yet ..
@@ -287,6 +288,7 @@ Layout::Layout (bool editable, db::Manager *manager)
     m_properties_repository (this),
     m_guiding_shape_layer (-1),
     m_waste_layer (-1),
+    m_do_cleanup (false),
     m_editable (editable)
 {
   // .. nothing yet ..
@@ -306,6 +308,7 @@ Layout::Layout (const db::Layout &layout)
     m_properties_repository (this),
     m_guiding_shape_layer (-1),
     m_waste_layer (-1),
+    m_do_cleanup (false),
     m_editable (layout.m_editable)
 {
   *this = layout;
@@ -1285,6 +1288,12 @@ Layout::allocate_new_cell ()
 void
 Layout::cleanup (const std::set<db::cell_index_type> &keep)
 {
+  //  only managed layouts will receive cleanup requests. Never library container layouts - these
+  //  cannot know if their proxies are not referenced by other proxies.
+  if (! m_do_cleanup) {
+    return;
+  }
+
   //  deleting cells may create new top cells which need to be deleted as well, hence we iterate
   //  until there are no more cells to delete
   while (true) {
diff --git a/src/db/db/dbLayout.h b/src/db/db/dbLayout.h
index fd6d897aa..f1555cb61 100644
--- a/src/db/db/dbLayout.h
+++ b/src/db/db/dbLayout.h
@@ -539,6 +539,21 @@ public:
    */
   Layout &operator= (const Layout &d);
 
+  /**
+   *  @brief Specifies, if the layout participates in cleanup
+   *
+   *  "cleanup" will be called to get rid of top level proxies.
+   *  This flag controls whether cleanup happens or not. Library
+   *  layouts for example must not loose proxies as they might
+   *  themselves be referenced.
+   *
+   *  The default is OFF.
+   */
+  void do_cleanup (bool f)
+  {
+    m_do_cleanup = f;
+  }
+
   /**
    *  @brief Clear the layout
    */
@@ -1761,6 +1776,7 @@ private:
   lib_proxy_map m_lib_proxy_map;
   int m_guiding_shape_layer;
   int m_waste_layer;
+  bool m_do_cleanup;
   bool m_editable;
   meta_info m_meta_info;
   tl::Mutex m_lock;
diff --git a/src/db/db/dbLibrary.cc b/src/db/db/dbLibrary.cc
index 6c0ca490c..0e10fe3e9 100644
--- a/src/db/db/dbLibrary.cc
+++ b/src/db/db/dbLibrary.cc
@@ -103,7 +103,8 @@ Library::unregister_proxy (db::LibraryProxy *lib_proxy, db::Layout *ly)
       db::cell_index_type ci = c->first;
       m_refcount.erase (c);
       //  remove cells which are itself proxies and are no longer used
-      if (layout ().cell (ci).is_proxy () && layout ().cell (ci).parent_cells () == 0) {
+      db::Cell *lib_cell = &layout ().cell (ci);
+      if (lib_cell && lib_cell->is_proxy () && lib_cell->parent_cells () == 0) {
         layout ().delete_cell (ci);
       }
     }
@@ -190,6 +191,7 @@ Library::remap_to (db::Library *other)
 
       if (! pn.first) {
 
+        //  substitute by static layout cell
         std::string name = r->first->cell_name (ci);
         db::Cell *old_cell = r->first->take_cell (ci);
         r->first->insert_cell (ci, name, new db::Cell (*old_cell));
@@ -201,6 +203,7 @@ Library::remap_to (db::Library *other)
         const db::PCellDeclaration *new_pcell_decl = other->layout ().pcell_declaration (pn.second);
         if (! old_pcell_decl || ! new_pcell_decl) {
 
+          //  substitute by static layout cell
           std::string name = r->first->cell_name (ci);
           db::Cell *old_cell = r->first->take_cell (ci);
           r->first->insert_cell (ci, name, new db::Cell (*old_cell));
@@ -229,7 +232,7 @@ Library::remap_to (db::Library *other)
 
       if (! cn.first) {
 
-        //  unlink this proxy
+        //  unlink this proxy: substitute by static layout cell
         std::string name = r->first->cell_name (ci);
         db::Cell *old_cell = r->first->take_cell (ci);
         r->first->insert_cell (ci, name, new db::Cell (*old_cell));
diff --git a/src/db/db/dbLibraryProxy.cc b/src/db/db/dbLibraryProxy.cc
index db254964a..195c82b99 100644
--- a/src/db/db/dbLibraryProxy.cc
+++ b/src/db/db/dbLibraryProxy.cc
@@ -238,7 +238,12 @@ LibraryProxy::get_basic_name () const
 {
   Library *lib = LibraryManager::instance ().lib (lib_id ());
   if (lib) {
-    return lib->layout ().cell (library_cell_index ()).get_basic_name ();
+    const db::Cell *lib_cell = &lib->layout ().cell (library_cell_index ());
+    if (! lib_cell) {
+      return "<defunct>";
+    } else {
+      return lib_cell->get_basic_name ();
+    }
   } else {
     return Cell::get_basic_name ();
   }
@@ -249,7 +254,12 @@ LibraryProxy::get_display_name () const
 {
   Library *lib = LibraryManager::instance ().lib (lib_id ());
   if (lib) {
-    return lib->get_name () + "." + lib->layout ().cell (library_cell_index ()).get_display_name ();
+    const db::Cell *lib_cell = &lib->layout ().cell (library_cell_index ());
+    if (! lib_cell) {
+      return lib->get_name () + "." + "<defunct>";
+    } else {
+      return lib->get_name () + "." + lib_cell->get_display_name ();
+    }
   } else {
     return Cell::get_display_name ();
   }
@@ -260,7 +270,12 @@ LibraryProxy::get_qualified_name () const
 {
   Library *lib = LibraryManager::instance ().lib (lib_id ());
   if (lib) {
-    return lib->get_name () + "." + lib->layout ().cell (library_cell_index ()).get_qualified_name ();
+    const db::Cell *lib_cell = &lib->layout ().cell (library_cell_index ());
+    if (! lib_cell) {
+      return lib->get_name () + "." + "<defunct>";
+    } else {
+      return lib->get_name () + "." + lib_cell->get_qualified_name ();
+    }
   } else {
     return Cell::get_qualified_name ();
   }
diff --git a/src/db/db/dbManager.cc b/src/db/db/dbManager.cc
index 405c0f45b..0a9e24016 100644
--- a/src/db/db/dbManager.cc
+++ b/src/db/db/dbManager.cc
@@ -147,13 +147,20 @@ Manager::last_transaction_id () const
 void
 Manager::cancel ()
 {
+  //  equivalent to commit and undo. But takes care that an empty commit is not followed by undo
+  //  (which would undo the previous transaction!)
   if (m_enabled) {
 
-    //  commit and undo - revert changes done so far
-    commit ();
-    undo ();
+    tl_assert (m_opened);
+    tl_assert (! m_replay);
+    m_opened = false;
 
-    //  delete all following transactions
+    if (m_current->first.begin () != m_current->first.end ()) {
+      ++m_current;
+      undo ();
+    }
+
+    //  wipe following history as we don't want the cancelled operation to be redoable
     erase_transactions (m_current, m_transactions.end ());
     m_current = m_transactions.end ();
 
diff --git a/src/edt/edt/EditorOptionsInst.ui b/src/edt/edt/EditorOptionsInst.ui
index 53002f9de..d7529a797 100644
--- a/src/edt/edt/EditorOptionsInst.ui
+++ b/src/edt/edt/EditorOptionsInst.ui
@@ -174,9 +174,6 @@
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
-               <property name="clearButtonEnabled">
-                <bool>false</bool>
-               </property>
               </widget>
              </item>
             </layout>
diff --git a/src/edt/edt/edtInstPropertiesPage.cc b/src/edt/edt/edtInstPropertiesPage.cc
index 5266ff485..08a4c27fa 100644
--- a/src/edt/edt/edtInstPropertiesPage.cc
+++ b/src/edt/edt/edtInstPropertiesPage.cc
@@ -439,7 +439,7 @@ InstPropertiesPage::create_applicator (db::Cell & /*cell*/, const db::Instance &
       appl->add (new ChangeTargetCellApplicator (inst_cell_index));
     }
 
-  } catch (tl::Exception &ex) {
+  } catch (tl::Exception &) {
     has_pcell_error = true;
   }
 
diff --git a/src/edt/edt/edtPlugin.cc b/src/edt/edt/edtPlugin.cc
index 7caa8288b..1cf07b535 100644
--- a/src/edt/edt/edtPlugin.cc
+++ b/src/edt/edt/edtPlugin.cc
@@ -61,18 +61,18 @@ void get_text_options (std::vector < std::pair<std::string, std::string> > &opti
   options.push_back (std::pair<std::string, std::string> (cfg_edit_text_valign, "bottom"));
 }
 
-edt::RecentConfigurationPage::ConfigurationDescriptor text_cfg_descriptors[] =
-{
-  edt::RecentConfigurationPage::ConfigurationDescriptor ("", tl::to_string (tr ("Layer")), edt::RecentConfigurationPage::Layer),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_string, tl::to_string (tr ("Text")), edt::RecentConfigurationPage::Text),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_size, tl::to_string (tr ("Size")), edt::RecentConfigurationPage::Double),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_halign, tl::to_string (tr ("Hor. align")), edt::RecentConfigurationPage::Text),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_valign, tl::to_string (tr ("Vert. align")), edt::RecentConfigurationPage::Text)
-};
-
 static
 void get_text_editor_options_pages (std::vector<lay::EditorOptionsPage *> &ret, lay::LayoutView *view, lay::Dispatcher *dispatcher)
 {
+  static edt::RecentConfigurationPage::ConfigurationDescriptor text_cfg_descriptors[] =
+  {
+    edt::RecentConfigurationPage::ConfigurationDescriptor ("", tl::to_string (tr ("Layer")), edt::RecentConfigurationPage::Layer),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_string, tl::to_string (tr ("Text")), edt::RecentConfigurationPage::Text),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_size, tl::to_string (tr ("Size")), edt::RecentConfigurationPage::Double),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_halign, tl::to_string (tr ("Hor. align")), edt::RecentConfigurationPage::Text),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_text_valign, tl::to_string (tr ("Vert. align")), edt::RecentConfigurationPage::Text)
+  };
+
   ret.push_back (new RecentConfigurationPage (view, dispatcher, "edit-recent-text-param",
                         &text_cfg_descriptors[0], &text_cfg_descriptors[sizeof (text_cfg_descriptors) / sizeof (text_cfg_descriptors[0])]));
   ret.push_back (new edt::EditorOptionsText (dispatcher));
@@ -87,18 +87,18 @@ void get_path_options (std::vector < std::pair<std::string, std::string> > &opti
   options.push_back (std::pair<std::string, std::string> (cfg_edit_path_ext_var_end, "0.0"));
 }
 
-edt::RecentConfigurationPage::ConfigurationDescriptor path_cfg_descriptors[] =
-{
-  edt::RecentConfigurationPage::ConfigurationDescriptor ("", tl::to_string (tr ("Layer")), edt::RecentConfigurationPage::Layer),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_width, tl::to_string (tr ("Width")), edt::RecentConfigurationPage::Double),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_ext_type, tl::to_string (tr ("Ends")), edt::RecentConfigurationPage::Int),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_ext_var_begin, tl::to_string (tr ("Begin ext.")), edt::RecentConfigurationPage::Double),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_ext_var_end, tl::to_string (tr ("End ext.")), edt::RecentConfigurationPage::Double)
-};
-
 static
 void get_path_editor_options_pages (std::vector<lay::EditorOptionsPage *> &ret, lay::LayoutView *view, lay::Dispatcher *dispatcher)
 {
+  static edt::RecentConfigurationPage::ConfigurationDescriptor path_cfg_descriptors[] =
+  {
+    edt::RecentConfigurationPage::ConfigurationDescriptor ("", tl::to_string (tr ("Layer")), edt::RecentConfigurationPage::Layer),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_width, tl::to_string (tr ("Width")), edt::RecentConfigurationPage::Double),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_ext_type, tl::to_string (tr ("Ends")), edt::RecentConfigurationPage::Int),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_ext_var_begin, tl::to_string (tr ("Begin ext.")), edt::RecentConfigurationPage::Double),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_path_ext_var_end, tl::to_string (tr ("End ext.")), edt::RecentConfigurationPage::Double)
+  };
+  
   ret.push_back (new RecentConfigurationPage (view, dispatcher, "edit-recent-path-param",
                         &path_cfg_descriptors[0], &path_cfg_descriptors[sizeof (path_cfg_descriptors) / sizeof (path_cfg_descriptors[0])]));
   ret.push_back (new EditorOptionsPath (dispatcher));
@@ -123,26 +123,26 @@ void get_inst_options (std::vector < std::pair<std::string, std::string> > &opti
   options.push_back (std::pair<std::string, std::string> (cfg_edit_show_shapes_of_instances, "true"));
 }
 
-edt::RecentConfigurationPage::ConfigurationDescriptor inst_cfg_descriptors[] =
-{
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_lib_name, tl::to_string (tr ("Library")), edt::RecentConfigurationPage::CellLibraryName),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_cell_name, tl::to_string (tr ("Cell")), edt::RecentConfigurationPage::CellDisplayName),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_angle, tl::to_string (tr ("Angle")), edt::RecentConfigurationPage::Double),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_mirror, tl::to_string (tr ("Mirror")), edt::RecentConfigurationPage::Bool),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_scale, tl::to_string (tr ("Scale")), edt::RecentConfigurationPage::Double),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_array, tl::to_string (tr ("Array")), edt::RecentConfigurationPage::ArrayFlag),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_rows, tl::to_string (tr ("Rows")), edt::RecentConfigurationPage::IntIfArray),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_row_x, tl::to_string (tr ("Row step (x)")), edt::RecentConfigurationPage::DoubleIfArray),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_row_y, tl::to_string (tr ("Row step (y)")), edt::RecentConfigurationPage::DoubleIfArray),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_columns, tl::to_string (tr ("Columns")), edt::RecentConfigurationPage::IntIfArray),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_column_x, tl::to_string (tr ("Column step (x)")), edt::RecentConfigurationPage::DoubleIfArray),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_column_y, tl::to_string (tr ("Column step (y)")), edt::RecentConfigurationPage::DoubleIfArray),
-  edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_pcell_parameters, tl::to_string (tr ("PCell parameters")), edt::RecentConfigurationPage::PCellParameters)
-};
-
 static
 void get_inst_editor_options_pages (std::vector<lay::EditorOptionsPage *> &ret, lay::LayoutView *view, lay::Dispatcher *dispatcher)
 {
+  static edt::RecentConfigurationPage::ConfigurationDescriptor inst_cfg_descriptors[] =
+  {
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_lib_name, tl::to_string (tr ("Library")), edt::RecentConfigurationPage::CellLibraryName),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_cell_name, tl::to_string (tr ("Cell")), edt::RecentConfigurationPage::CellDisplayName),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_angle, tl::to_string (tr ("Angle")), edt::RecentConfigurationPage::Double),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_mirror, tl::to_string (tr ("Mirror")), edt::RecentConfigurationPage::Bool),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_scale, tl::to_string (tr ("Scale")), edt::RecentConfigurationPage::Double),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_array, tl::to_string (tr ("Array")), edt::RecentConfigurationPage::ArrayFlag),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_rows, tl::to_string (tr ("Rows")), edt::RecentConfigurationPage::IntIfArray),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_row_x, tl::to_string (tr ("Row step (x)")), edt::RecentConfigurationPage::DoubleIfArray),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_row_y, tl::to_string (tr ("Row step (y)")), edt::RecentConfigurationPage::DoubleIfArray),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_columns, tl::to_string (tr ("Columns")), edt::RecentConfigurationPage::IntIfArray),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_column_x, tl::to_string (tr ("Column step (x)")), edt::RecentConfigurationPage::DoubleIfArray),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_column_y, tl::to_string (tr ("Column step (y)")), edt::RecentConfigurationPage::DoubleIfArray),
+    edt::RecentConfigurationPage::ConfigurationDescriptor (cfg_edit_inst_pcell_parameters, tl::to_string (tr ("PCell parameters")), edt::RecentConfigurationPage::PCellParameters)
+  };
+
   ret.push_back (new RecentConfigurationPage (view, dispatcher, "edit-recent-inst-param",
                         &inst_cfg_descriptors[0], &inst_cfg_descriptors[sizeof (inst_cfg_descriptors) / sizeof (inst_cfg_descriptors[0])]));
   ret.push_back (new EditorOptionsInstPCellParam (dispatcher));
diff --git a/src/klayout.pri b/src/klayout.pri
index 245b3f12d..e7b3807b7 100644
--- a/src/klayout.pri
+++ b/src/klayout.pri
@@ -160,10 +160,10 @@ equals(HAVE_QT, "0") {
 } else {
 
   DEFINES += HAVE_QT
-  QT += core network xml sql widgets
+  QT += core network xml sql
 
   equals(HAVE_QT5, "1") {
-    QT += designer printsupport
+    QT += designer printsupport widgets
     equals(HAVE_QTBINDINGS, "1") {
       QT += multimedia multimediawidgets xmlpatterns svg gui
     }
diff --git a/src/lay/lay/laySearchReplacePropertiesWidgets.cc b/src/lay/lay/laySearchReplacePropertiesWidgets.cc
index c135d9307..42e7d8979 100644
--- a/src/lay/lay/laySearchReplacePropertiesWidgets.cc
+++ b/src/lay/lay/laySearchReplacePropertiesWidgets.cc
@@ -200,7 +200,7 @@ add_orientation_condition (std::string &expr, QComboBox *op, QComboBox *value, c
     expr += attribute;
     expr += " ";
     expr += tl::to_string (op->currentText ());
-    expr += " Trans." + v;
+    expr += " Trans." + v + ".rot";
 
   }
 }
@@ -308,6 +308,7 @@ add_orientation_assignment (std::string &expr, QComboBox *value, const char *att
     expr += attribute;
     expr += " = Trans.";
     expr += v;
+    expr += ".rot";
 
   }
 }
diff --git a/src/laybasic/laybasic/BrowserPanel.ui b/src/laybasic/laybasic/BrowserPanel.ui
index d77c6c45a..66071a8ee 100644
--- a/src/laybasic/laybasic/BrowserPanel.ui
+++ b/src/laybasic/laybasic/BrowserPanel.ui
@@ -77,7 +77,7 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <widget class="QFrame" name="frame_2">
+        <widget class="QFrame" name="navigation_frame">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -232,11 +232,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QLineEdit" name="on_page_search_edit">
-               <property name="clearButtonEnabled">
-                <bool>true</bool>
-               </property>
-              </widget>
+              <widget class="QLineEdit" name="on_page_search_edit"/>
              </item>
              <item>
               <widget class="QToolButton" name="search_close_button">
@@ -431,9 +427,6 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="clearButtonEnabled">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
    <item row="0" column="10">
diff --git a/src/laybasic/laybasic/layBrowserPanel.cc b/src/laybasic/laybasic/layBrowserPanel.cc
index 3dd2393e2..50f486969 100644
--- a/src/laybasic/laybasic/layBrowserPanel.cc
+++ b/src/laybasic/laybasic/layBrowserPanel.cc
@@ -110,6 +110,11 @@ BrowserPanel::init ()
   mp_ui = new Ui::BrowserPanel ();
   mp_ui->setupUi (this);
 
+#if QT_VERSION >= 0x050200
+  mp_ui->on_page_search_edit->setClearButtonEnabled (true);
+  mp_ui->search_edit->setClearButtonEnabled (true);
+#endif
+
   mp_ui->browser->setReadOnly (true);
   mp_ui->browser->set_panel (this);
   mp_ui->browser->setWordWrapMode (QTextOption::WordWrap);
@@ -147,7 +152,9 @@ BrowserPanel::init ()
   connect (mp_ui->browser_bookmark_view, SIGNAL (itemDoubleClicked (QTreeWidgetItem *, int)), this, SLOT (bookmark_item_selected (QTreeWidgetItem *)));
 
   mp_completer = new QCompleter (this);
+#if QT_VERSION >= 0x050200
   mp_completer->setFilterMode (Qt::MatchStartsWith);
+#endif
   mp_completer->setCaseSensitivity (Qt::CaseInsensitive);
   mp_completer->setCompletionMode (QCompleter::UnfilteredPopupCompletion);
   mp_completer_model = new QStringListModel (mp_completer);
@@ -323,6 +330,8 @@ BrowserPanel::refresh_bookmark_list ()
     item->setData (0, Qt::ToolTipRole, tl::to_qstring (i->title));
     item->setData (0, Qt::DecorationRole, QIcon (":/bookmark_16.png"));
   }
+
+  update_navigation_panel ();
 }
 
 void
@@ -475,7 +484,7 @@ BrowserPanel::set_home (const std::string &url)
   QList<int> sizes = mp_ui->splitter->sizes ();
   if (sizes.size () >= 2) {
     int size_outline = 150;
-    sizes[1] += sizes[0] - size_outline;
+    sizes[1] += std::max (width () - 10 - size_outline, 10);
     sizes[0] = size_outline;
   }
   mp_ui->splitter->setSizes (sizes);
@@ -608,6 +617,13 @@ update_item_with_outline (const BrowserOutline &ol, QTreeWidgetItem *item)
   }
 }
 
+void
+BrowserPanel::update_navigation_panel ()
+{
+  bool navigation_visible = mp_ui->outline_tree->topLevelItemCount () > 0 || mp_ui->browser_bookmark_view->topLevelItemCount () > 0;
+  mp_ui->navigation_frame->setVisible (navigation_visible);
+}
+
 void
 BrowserPanel::set_outline (const BrowserOutline &ol)
 {
@@ -634,6 +650,8 @@ BrowserPanel::set_outline (const BrowserOutline &ol)
     mp_ui->outline_tree->expandAll ();
 
   }
+
+  update_navigation_panel ();
 }
 
 QVariant 
diff --git a/src/laybasic/laybasic/layBrowserPanel.h b/src/laybasic/laybasic/layBrowserPanel.h
index d32366a18..5a2031f75 100644
--- a/src/laybasic/laybasic/layBrowserPanel.h
+++ b/src/laybasic/laybasic/layBrowserPanel.h
@@ -477,6 +477,7 @@ private:
   void add_bookmark (const BookmarkItem &item);
   void refresh_bookmark_list ();
   void store_bookmarks ();
+  void update_navigation_panel ();
 };
 
 }
diff --git a/src/laybasic/laybasic/layCellView.cc b/src/laybasic/laybasic/layCellView.cc
index f76937caa..0b28e12d0 100644
--- a/src/laybasic/laybasic/layCellView.cc
+++ b/src/laybasic/laybasic/layCellView.cc
@@ -59,6 +59,9 @@ LayoutHandle::LayoutHandle (db::Layout *layout, const std::string &filename)
     m_dirty (false),
     m_save_options_valid (false)
 {
+  //  layouts in the managed layouts space participate in spare proxy cleanup
+  layout->do_cleanup (true);
+
   file_watcher ().add_file (m_filename);
 
   if (! m_filename.empty ()) {
diff --git a/src/laybasic/laybasic/layLayerTreeModel.h b/src/laybasic/laybasic/layLayerTreeModel.h
index 852184ab1..b63377e40 100644
--- a/src/laybasic/laybasic/layLayerTreeModel.h
+++ b/src/laybasic/laybasic/layLayerTreeModel.h
@@ -25,6 +25,7 @@
 #define HDR_layLayerTreeModel
 
 #include "dbBox.h"
+#include "laybasicCommon.h"
 
 #include <vector>
 #include <set>
@@ -77,7 +78,7 @@ private:
  *  representation or a hierarchical one.
  */
 
-class LayerTreeModel 
+class LAYBASIC_PUBLIC LayerTreeModel
   : public QAbstractItemModel
 {
 Q_OBJECT
diff --git a/src/laybasic/laybasic/layMove.cc b/src/laybasic/laybasic/layMove.cc
index 8f30a2458..f226368b1 100644
--- a/src/laybasic/laybasic/layMove.cc
+++ b/src/laybasic/laybasic/layMove.cc
@@ -167,7 +167,7 @@ MoveService::mouse_click_event (const db::DPoint &p, unsigned int buttons, bool
     return true;
   } 
   if (prio && (buttons & lay::LeftButton) != 0) {
-    if (handle_dragging (p, buttons, false, 0)) {
+    if (handle_click (p, buttons, false, 0)) {
       return true;
     }
   } 
@@ -184,10 +184,17 @@ bool
 MoveService::mouse_double_click_event (const db::DPoint &p, unsigned int buttons, bool prio)
 {
   if (prio) {
+
+    //  stop dragging if required
+    if (m_dragging) {
+      handle_click (p, buttons, false, 0);
+    }
+
     lay::SelectionService *selector = mp_view->selection_service ();
     if (selector) {
       return selector->mouse_double_click_event (p, buttons, prio);
     }
+
   }
   return false;
 }
@@ -220,7 +227,7 @@ bool
 MoveService::mouse_press_event (const db::DPoint &p, unsigned int buttons, bool prio)
 {
   if (prio && (buttons & lay::LeftButton) != 0) {
-    if (handle_dragging (p, buttons, false, 0)) {
+    if (handle_click (p, buttons, false, 0)) {
       return true;
     }
   } 
@@ -273,11 +280,11 @@ MoveService::begin_move (db::Transaction *transaction, bool selected_after_move)
     pstart.set_y (std::min (pstart.y (), bbox.p2 ().y ()));
   }
 
-  return handle_dragging (pstart, 0, drag_transient, trans_holder.release ());
+  return handle_click (pstart, 0, drag_transient, trans_holder.release ());
 }
 
 bool 
-MoveService::handle_dragging (const db::DPoint &p, unsigned int buttons, bool drag_transient, db::Transaction *transaction)
+MoveService::handle_click (const db::DPoint &p, unsigned int buttons, bool drag_transient, db::Transaction *transaction)
 {
   std::auto_ptr<db::Transaction> trans_holder (transaction);
 
diff --git a/src/laybasic/laybasic/layMove.h b/src/laybasic/laybasic/layMove.h
index 56aa7b9bf..d3f77a33d 100644
--- a/src/laybasic/laybasic/layMove.h
+++ b/src/laybasic/laybasic/layMove.h
@@ -62,7 +62,7 @@ private:
   virtual void drag_cancel ();
   virtual void deactivated ();
 
-  bool handle_dragging (const db::DPoint &p, unsigned int buttons, bool drag_transient, db::Transaction *transaction);
+  bool handle_click (const db::DPoint &p, unsigned int buttons, bool drag_transient, db::Transaction *transaction);
 
   bool m_dragging;
   bool m_dragging_transient;
diff --git a/src/laybasic/laybasic/layRedrawThreadWorker.cc b/src/laybasic/laybasic/layRedrawThreadWorker.cc
index 0aae08e5a..e4fcb0c0f 100644
--- a/src/laybasic/laybasic/layRedrawThreadWorker.cc
+++ b/src/laybasic/laybasic/layRedrawThreadWorker.cc
@@ -30,6 +30,15 @@ namespace lay
 //  time delay until the first snapshot is taken
 const int first_snapshot_delay = 20;
 
+// -------------------------------------------------------------
+
+static inline db::Box safe_transformed_box (const db::Box &box, const db::ICplxTrans &t)
+{
+  db::DBox db = db::CplxTrans (t) * box;
+  db &= db::DBox (db::Box::world ());
+  return db::Box (db);
+}
+
 // -------------------------------------------------------------
 //  RedrawThreadWorker implementation 
 
@@ -816,7 +825,7 @@ RedrawThreadWorker::draw_boxes (bool drawing_context, db::cell_index_type ci, co
 
                   test_snapshot (0);
                   db::ICplxTrans t (cell_inst.complex_trans (*p));
-                  db::Box new_vp = db::Box (t.inverted () * *v);
+                  db::Box new_vp = safe_transformed_box (*v, t.inverted ());
                   draw_boxes (drawing_context, new_ci, trans * t, new_vp, level + 1);
 
                   if (p.quad_id () > 0 && p.quad_id () != qid) {
@@ -990,7 +999,7 @@ RedrawThreadWorker::draw_box_properties (bool drawing_context, db::cell_index_ty
               
                   test_snapshot (0); 
                   db::ICplxTrans t (cell_inst.complex_trans (*p));
-                  db::Box new_vp = db::Box (t.inverted () * *v);
+                  db::Box new_vp = safe_transformed_box (*v, t.inverted ());
                   draw_box_properties (drawing_context, new_ci, trans * t, new_vp, level + 1, cell_inst_prop);
 
                 }
@@ -1474,7 +1483,7 @@ RedrawThreadWorker::draw_text_layer (bool drawing_context, db::cell_index_type c
                         p.index_a () <= 0 || (unsigned long)p.index_a () == amax - 1 || p.index_b () <= 0 || (unsigned long)p.index_b () == bmax - 1) {
 
                       db::ICplxTrans t (cell_inst.complex_trans (*p));
-                      db::Box new_vp = db::Box (t.inverted () * *v);
+                      db::Box new_vp = safe_transformed_box (*v, t.inverted ());
                       draw_text_layer (drawing_context, new_ci, trans * t, new_vp, level + 1, fill, frame, vertex, text, opt_bitmap);
 
                     } 
@@ -1779,7 +1788,7 @@ RedrawThreadWorker::draw_layer_wo_cache (int from_level, int to_level, db::cell_
                     p.index_a () <= 0 || (unsigned long)p.index_a () == amax - 1 || p.index_b () <= 0 || (unsigned long)p.index_b () == bmax - 1) {
 
                   db::ICplxTrans t (cell_inst.complex_trans (*p));
-                  db::Box new_vp = db::Box (t.inverted () * *v);
+                  db::Box new_vp = safe_transformed_box (*v, t.inverted ());
                   draw_layer (from_level, to_level, new_ci, trans * t, new_vp, level + 1, fill, frame, vertex, text, update_snapshot);
 
                   if (p.quad_id () > 0 && p.quad_id () != qid) {
diff --git a/src/laybasic/laybasic/laybasic.pro b/src/laybasic/laybasic/laybasic.pro
index 319bf4e89..5cf65cefe 100644
--- a/src/laybasic/laybasic/laybasic.pro
+++ b/src/laybasic/laybasic/laybasic.pro
@@ -298,7 +298,7 @@ HEADERS = \
     layDispatcher.h \
     laySelectCellViewForm.h \
     layLayoutStatisticsForm.h \
-    layD25TechnologyComponent.h
+    layD25TechnologyComponent.h \
     layLayoutViewFunctions.h 
 
 INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC $$LYM_INC
diff --git a/src/tl/tl/tlHttpStreamQt.cc b/src/tl/tl/tlHttpStreamQt.cc
index 48510c697..f022e92ca 100644
--- a/src/tl/tl/tlHttpStreamQt.cc
+++ b/src/tl/tl/tlHttpStreamQt.cc
@@ -71,7 +71,11 @@ AuthenticationHandler::authenticationRequired (QNetworkReply *reply, QAuthentica
       //  expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ...
       //  We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers
       //  expect UTF-8 encoding.
+#if QT_VERSION >= 0x040700
       bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull ();
+#else
+      bool is_basic_or_digest = true;
+#endif
       if (is_basic_or_digest) {
         auth->setPassword (QString::fromLatin1 (passwd.c_str ()));
         auth->setUser (QString::fromLatin1 (user.c_str ()));
@@ -98,7 +102,11 @@ AuthenticationHandler::proxyAuthenticationRequired (const QNetworkProxy &proxy,
       //  expect UTF-8 today. So do them a favor and encode UTF8 into Latin1, so it gets valid UTF8 when turned into Latin1 ...
       //  We do this for Digest and Basic as they apparently both use Latin 1 encoding. But it's unclear whether all servers
       //  expect UTF-8 encoding.
+#if QT_VERSION >= 0x040700
       bool is_basic_or_digest = ! auth->option (QString::fromUtf8 ("realm")).isNull ();
+#else
+      bool is_basic_or_digest = true;
+#endif
       if (is_basic_or_digest) {
         auth->setPassword (QString::fromLatin1 (passwd.c_str ()));
         auth->setUser (QString::fromLatin1 (user.c_str ()));