diff --git a/macbuild/Resources/KLayoutDMG-Back.logoist b/macbuild/Resources/KLayoutDMG-Back.logoist
index c85a5342e..8c6b6af34 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 b2433a0fc..8db846684 100644
Binary files a/macbuild/Resources/KLayoutDMG-Back.png and b/macbuild/Resources/KLayoutDMG-Back.png differ
diff --git a/macbuild/Resources/script-bundle-A.zip b/macbuild/Resources/script-bundle-A.zip
index eda075de5..58e91d629 100644
Binary files a/macbuild/Resources/script-bundle-A.zip and b/macbuild/Resources/script-bundle-A.zip differ
diff --git a/macbuild/Resources/script-bundle-B.zip b/macbuild/Resources/script-bundle-B.zip
index 0a8dfe893..25d7a5b89 100644
Binary files a/macbuild/Resources/script-bundle-B.zip and b/macbuild/Resources/script-bundle-B.zip differ
diff --git a/macbuild/Resources/script-bundle-P.zip b/macbuild/Resources/script-bundle-P.zip
index 22987f14b..81f1bfef9 100644
Binary files a/macbuild/Resources/script-bundle-P.zip and b/macbuild/Resources/script-bundle-P.zip differ
diff --git a/macbuild/build4mac_env.py b/macbuild/build4mac_env.py
index ea3a84f22..726380184 100755
--- a/macbuild/build4mac_env.py
+++ b/macbuild/build4mac_env.py
@@ -121,7 +121,7 @@ CatalinaSDK     = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p
 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'
+                    'lib':  '%s/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.tbd' % CatalinaSDK
                   }
 
 # Bundled with Big Sur (11.0)
@@ -131,7 +131,7 @@ BigSurSDK       = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p
 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'
+                    'lib':  '%s/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.tbd' % BigSurSDK
                   }
 
 # Ruby 2.7 from MacPorts (https://www.macports.org/) *+*+*+ EXPERIMENTAL *+*+*+
diff --git a/macbuild/makeDMG4mac.py b/macbuild/makeDMG4mac.py
index d50ea43ed..a8b795c93 100755
--- a/macbuild/makeDMG4mac.py
+++ b/macbuild/makeDMG4mac.py
@@ -108,6 +108,7 @@ def SetGlobals():
     if release == 20:
         GenOSName = "macOS"
         Platform  = "BigSur"
+        LatestOS  = Platform
     elif release == 19:
         GenOSName = "macOS"
         Platform  = "Catalina"
diff --git a/macbuild/nightyCatalina.py b/macbuild/nightyCatalina.py
index 57ab7f9ef..3bee90bb6 100755
--- a/macbuild/nightyCatalina.py
+++ b/macbuild/nightyCatalina.py
@@ -37,8 +37,8 @@ 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'    ]
+        if target == "std": # use 'Qt5MacPorts' that provides Qt 5.15.2 to run on "Big Sur", too
+            buildOp["std"]     = [ '-q', 'Qt5MacPorts', '-r', 'sys',  '-p', 'sys'    ]
         elif target == "ports":
             buildOp["ports"]   = [ '-q', 'Qt5MacPorts', '-r', 'MP27', '-p', 'MP38'   ]
         elif target == "brew":
@@ -65,7 +65,7 @@ def Get_QAT_Directory( targetDic ):
     for key in targetDic.keys():
         target = targetDic[key]
         if target == "std":
-            dirQAT["std"]       = 'qt5Brew.build.macos-Catalina-release-RsysPsys.macQAT'
+            dirQAT["std"]       = 'qt5MP.build.macos-Catalina-release-RsysPsys.macQAT'
         elif target == "ports":
             dirQAT["ports"]     = 'qt5MP.build.macos-Catalina-release-Rmp27Pmp38.macQAT'
         elif target == "brew":
@@ -99,7 +99,7 @@ def Get_Package_Options( targetDic, srlDMG, makeflag ):
     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 ]
+            packOp["std"]       = [ '-p', 'ST-qt5MP.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":