diff --git a/.github/workflows/auto-merge-keyman-server-pr.yml b/.github/workflows/auto-merge-keyman-server-pr.yml
index 0c920c2650..39cafc3f91 100644
--- a/.github/workflows/auto-merge-keyman-server-pr.yml
+++ b/.github/workflows/auto-merge-keyman-server-pr.yml
@@ -17,12 +17,15 @@ jobs:
     if: ${{ github.repository == 'keymanapp/keyman' && github.actor == 'keyman-server' && startsWith(github.event.pull_request.title, 'auto:') }}
     steps:
     - name: auto approve PR from keyman-server
-      uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363
-      with:
-        github-token: "${{ secrets.GITHUB_TOKEN }}"
-    - name: auto merge PR from keyman-server
-      uses: "pascalgn/automerge-action@7854d3bd607dccdaf0b2c134b699a812c8960213"
+      shell: bash
       env:
-        GITHUB_TOKEN: "${{ secrets.AUTOINC_GITHUB_TOKEN }}"
-        MERGE_LABELS: "automerge"
-        MERGE_FORKS: false
+        GH_TOKEN: "${{ github.token }}"
+      run: |
+        gh pr review -R keymanapp/keyman --approve ${{ github.event.pull_request.number }}
+    - name: mark PR for auto-merge from keyman-server
+      shell: bash
+      if: contains(github.event.pull_request.labels.*.name, 'automerge')
+      env:
+        GH_TOKEN: "${{ secrets.AUTOINC_GITHUB_TOKEN }}"
+      run: |
+        gh pr merge -R keymanapp/keyman --merge --auto ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index a06d7ed3cd..a40fcb7259 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -86,7 +86,14 @@ jobs:
       shell: bash
       run: |
         THIS_SCRIPT="$GITHUB_WORKSPACE/.github/workflows/deb-packaging.yml"
-        . "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+        if [[ -f "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh" ]]; then
+          . "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
+        else
+          # TODO: remove following block post v19 release (file was renamed in v19 alpha)
+          if [[ -f "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh" ]]; then
+            . "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+          fi
+        fi
         echo "KEYMAN_VERSION=${KEYMAN_VERSION:-${VERSION}}" >> $GITHUB_OUTPUT
 
     - name: Set prerelease tag as output parameter
diff --git a/.gitignore b/.gitignore
index 6c8fbfbec8..6316adb5d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,7 +164,7 @@ tsconfig.tsbuildinfo
 # Windows system files
 Thumbs.db
 
-# Temporary file for logging scripts in xcode runs, see build-utils.sh for
+# Temporary file for logging scripts in xcode runs, see builder-basic.inc.sh for
 # details
 /xcodebuild-scripts.log
 
diff --git a/HISTORY.md b/HISTORY.md
index cb0b00a11b..f92734571d 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,78 @@
 # Keyman Version History
 
+## 19.0.100 alpha 2025-08-14
+
+* maint(resources): add space to test-bot command (#14528)
+* fix(web): improve accuracy of types for suggestions & suggestion-generation (#14517)
+* refactor(web): move applySuggestionCasing to standalone exportable method (#14518)
+* chore(web): convert worker-thread tests to TS (#14510)
+
+## 19.0.99 alpha 2025-08-14
+
+* maint(web): skip unnecessary steps for `build` buildLevel (#14516)
+
+## 19.0.98 alpha 2025-08-14
+
+* maint(resources): specify `keymanapp/keyman` for gh in automerge (#14524)
+
+## 19.0.97 alpha 2025-08-14
+
+* maint(resources): use GH_TOKEN variable for gh calls (#14522)
+
+## 19.0.96 alpha 2025-08-14
+
+* maint(resources): add build-bot commands to increment-version auto PRs (#14504)
+* maint(resources): use GH builtin automerge for auto PRs (#14519)
+
+## 19.0.95 alpha 2025-08-13
+
+* fix(web): use actual legacy model for legacy-model support unit tests (#14460)
+* chore(common): Update Crowdin strings for Spanish (#14464)
+* fix(android): Get default sizes before initializing keyboard (#14472)
+* docs(resources): clarify Build-bot usage (#14282)
+* maint(resources): build.sh-style commands for build-bot (#14461)
+* chore(android): Update keycode test app dependencies (#14474)
+* maint(common): update npm modules brace-expansion to 1.1.12, form-data to 4.0.4 (#14479)
+* chore(android): Specify Java language version 21 (#14491)
+* maint(ios): skip unnecessary network steps when buildLevel is build (#14466)
+* maint(common): rename shellHelperFunctions.sh to utils.inc.sh (#14446)
+* maint(common): consolidate builder scripts (#14449)
+* maint(common): rename and move node-related script functions into node.inc.sh (#14451)
+* maint(common): move typescript script functions into typescript.inc.sh (#14452)
+* maint(common): reorganize mac/ios build script includes (#14458)
+* docs(resources): add note on builder-basic vs builder-full (#14507)
+
+## 19.0.94 alpha 2025-08-01
+
+* maint(common): use `cpp_std=c++17` in meson project default_options (#14433)
+
+## 19.0.93 alpha 2025-07-29
+
+* test(developer): add unit tests for `isValidUtf8` (#14381)
+* maint(linux): fix stopping of test server (#14403)
+
+## 19.0.92 alpha 2025-07-28
+
+* build(deps): bump multer from 2.0.1 to 2.0.2 (#14373)
+* refactor(linux): remove shellcheck warnings (#14409)
+* refactor(linux): move dbus defines to common include (#14407)
+* docs(linux): update readme for test service (#14408)
+* fix(windows): add check a fix for registry datatypes (#14358)
+
+## 19.0.91 alpha 2025-07-26
+
+* maint(windows): fix calls of renamed functions (#14413)
+
+## 19.0.90 alpha 2025-07-25
+
+* maint(common): fix standalone use of `resources/builder.inc.sh` (#14399)
+* maint(resources): use `tc_` prefix for all `tc-*.inc.sh` functions (#14267)
+
+## 19.0.89 alpha 2025-07-24
+
+* docs(common): Document minimum version of Chrome 95.0 for Android (#14385)
+* refactor(android): Update minimum target Chrome version to 95.0 and refactor to use constants (#14391)
+
 ## 19.0.88 alpha 2025-07-23
 
 * maint(windows): consider `GO_FAST` env variable in `add_zip_files` (#14338)
diff --git a/VERSION.md b/VERSION.md
index 48ee77477d..3836ccc4d6 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.89
\ No newline at end of file
+19.0.101
\ No newline at end of file
diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh
index fd54215d1c..525b951138 100755
--- a/android/KMAPro/build.sh
+++ b/android/KMAPro/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 19dba38af3..b41de722c6 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -11,6 +11,12 @@ apply from: "$rootPath/version.gradle"
 
 String tier = new File('../../TIER.md').getText('UTF-8').trim();
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 35
     namespace="com.tavultesoft.kmapro"
@@ -24,11 +30,6 @@ android {
         buildConfig = true
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-
     defaultConfig {
         applicationId "com.tavultesoft.kmapro"
         minSdkVersion 21
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 1515a82076..b422d7e881 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -875,6 +875,9 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
 
   private void displayUpdateChrome() {
     // TextView's default string is to update Chrome
+    TextView textView = (TextView)findViewById(R.id.kmWebViewChromeTextView);
+    textView.setText(String.format(getString(R.string.text_require_chrome_version),
+      WebViewUtils.KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME));
 
     Button button = (Button)findViewById(R.id.webViewChromeButton);
     button.setText(getString(R.string.button_update_chrome));
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
index 09716bdd8a..ea5a9220d5 100644
--- a/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
+++ b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
@@ -15,7 +15,7 @@
     android:background="@android:color/white"
     android:gravity="start"
     android:layout_gravity="center_vertical"
-    android:text="@string/text_require_chrome_57"
+    android:text="@string/text_require_chrome_version"
     android:layout_marginStart="@dimen/button_playstore_margin"
     android:textSize="@dimen/update_chrome_label_textsize" />
 
diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index a0447d0f89..32cdf07f1a 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -30,10 +30,13 @@
   <!-- Context: Title -->
   <string name="title_version" comment="Title of Keyman for Android version">Version: %1$s</string>
 
-  <!-- Context: Text label when old Chrome version installed -->
+  <!-- Context: Text label when old Chrome version installed. Label replaced in Keyman 19.0 -->
   <string name="text_require_chrome_57" comment="Banner text when old version of Chrome is installed">
     Keyman requires Chrome version 57 or newer.</string>
 
+  <string name="text_require_chrome_version" comment="Banner text when old version of Chrome is installed">
+    Keyman requires Chrome version %1$s or newer.</string>
+
   <!-- Context: Button label -->
   <string name="button_update_chrome" comment="Prompt to upgrade Chrome in the Play Store">Update Chrome</string>
 
diff --git a/android/KMEA/app/build.gradle b/android/KMEA/app/build.gradle
index 3b68839d43..fd5a86a3c3 100644
--- a/android/KMEA/app/build.gradle
+++ b/android/KMEA/app/build.gradle
@@ -12,6 +12,12 @@ base {
     archivesName = "keyman-engine"
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 35
     namespace "com.keyman.engine"
@@ -21,11 +27,6 @@ android {
         buildConfig = true
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 35
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index d7302bec4e..60218cb2de 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -495,6 +495,11 @@ public final class KMManager {
       didCopyAssets = true;
     }
 
+    calculateDefaultKeyboardHeights(context);
+    SharedPreferences prefs = context.getSharedPreferences(KMManager.KMEngine_PrefsKey, Context.MODE_PRIVATE);
+    KeyboardHeight_Context_Portrait_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightPortrait, KMManager.KeyboardHeight_Context_Portrait_Default);
+    KeyboardHeight_Context_Landscape_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightLandscape, KMManager.KeyboardHeight_Context_Landscape_Default);
+
     if (keyboardType == KeyboardType.KEYBOARD_TYPE_UNDEFINED) {
       String msg = "Cannot initialize: Invalid keyboard type";
       KMLog.LogError(TAG, msg);
@@ -508,12 +513,6 @@ public final class KMManager {
     migrateCloudKeyboards(appContext);
 
     CloudDownloadMgr.getInstance().initialize(appContext);
-
-    calculateDefaultKeyboardHeights(context);
-    SharedPreferences prefs = context.getSharedPreferences(KMManager.KMEngine_PrefsKey, Context.MODE_PRIVATE);
-    KeyboardHeight_Context_Portrait_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightPortrait, KMManager.KeyboardHeight_Context_Portrait_Default);
-    KeyboardHeight_Context_Landscape_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightLandscape, KMManager.KeyboardHeight_Context_Landscape_Default);
-
   }
 
   public static void executeResourceUpdate(Context aContext)
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
index de8b37f73e..0586ecbcc8 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
@@ -32,6 +32,13 @@ public final class WebViewUtils {
     FULL;          // WebView installed and enabled
   }
 
+  // Min version of Chrome for Keyman for Android for EngineWebViewVersionStatus.DEGRADED
+  public static final String KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME = "37.0";
+
+  // Min version of Chrome for Keyman for Android (EngineWebViewVersionStatus.FULL)
+  // TODO: Keep this version in sync with resources/build/minimum-versions.inc.sh
+  public static final String KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME = "95.0";
+
   private static final String CHROME_INSTALL_PATTERN_FORMATSTR = "^.*Chrome/([\\d.]+).*$";
   private static final Pattern installPattern = Pattern.compile(CHROME_INSTALL_PATTERN_FORMATSTR);
 
@@ -52,9 +59,11 @@ public final class WebViewUtils {
       chromeVersion = getChromeVersion(context, webView);
     }
 
-    if (FileUtils.compareVersions("37.0", chromeVersion) == FileUtils.VERSION_GREATER) {
+    if (FileUtils.compareVersions(KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME, chromeVersion)
+        == FileUtils.VERSION_GREATER) {
       return EngineWebViewVersionStatus.DISABLED;
-    } else if (FileUtils.compareVersions("57.0", chromeVersion) == FileUtils.VERSION_GREATER) {
+    } else if (FileUtils.compareVersions(KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME, chromeVersion)
+        == FileUtils.VERSION_GREATER) {
       return EngineWebViewVersionStatus.DEGRADED;
     }
 
diff --git a/android/KMEA/app/src/main/res/values-es-rES/strings.xml b/android/KMEA/app/src/main/res/values-es-rES/strings.xml
index 0ab0ea317b..4846da0dac 100644
--- a/android/KMEA/app/src/main/res/values-es-rES/strings.xml
+++ b/android/KMEA/app/src/main/res/values-es-rES/strings.xml
@@ -83,13 +83,13 @@
     <!-- Context: Fatal keyboard error.  -->
     <string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language).">      Error en el teclado %1$s:%2$s para %3$s idioma.</string>
     <!-- Context: Alert Dialog body: System WebView not installed -->
-    <string name="body_install_webview" comment="Notification when WebView not installed">        Keyman requires WebView to be installed.\"</string>
+    <string name="body_install_webview" comment="Notification when WebView not installed">        Keyman requiere que WebView esté instalado.\"</string>
     <!-- Context: Alert Dialog body: System WebView installed but not enabled -->
-    <string name="body_enable_webview" comment="Notification when WebView installed but not enabled">        Keyman requires WebView to be enabled.\"</string>
+    <string name="body_enable_webview" comment="Notification when WebView installed but not enabled">        Keyman requiere que WebView esté habilitado.\"</string>
     <!-- Context Button label: Install WebView -->
-    <string name="label_install_webview" comment="Button label to install webview">Install WebView</string>
+    <string name="label_install_webview" comment="Button label to install webview">Instalar WebView</string>
     <!-- Context Button label: Enable WebView -->
-    <string name="label_enable_webview" comment="Button label to enable webview">Enable WebView</string>
+    <string name="label_enable_webview" comment="Button label to enable webview">Habilitar WebView</string>
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Comprobando si hay un diccionario asociado para descargar</string>
     <string name="cannot_query_associated_model" comment="Cannot reach server to check if there's an available dictionary to download">      No se puede conectar al servidor Keyman para comprobar si hay un diccionario asociado para descargar</string>
@@ -124,7 +124,7 @@
     <!-- Context: General Updates -->
     <string name="update_check_unavailable" comment="Error message when a Keyman server can't be reached">¡Falló al acceder al servidor!</string>
     <!-- Context:  Update-check failure notification -->
-    <string name="update_check_download_manager_disabled" comment="Notification that a system service needed for updates is disabled">DownloadManager disabled - cannot check for updates</string>
+    <string name="update_check_download_manager_disabled" comment="Notification that a system service needed for updates is disabled">Descargador deshabilitado: no se pueden comprobar actualizaciones</string>
     <!-- Context: General Updates -->
     <string name="update_check_current" comment="Notification that all resources are up to date">"¡Todos los recursos están actualizados!"</string>
     <!-- Context: General Updates -->
diff --git a/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
index 344b01879a..342934200a 100644
--- a/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
+++ b/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
@@ -32,28 +32,30 @@ public class WebViewUtilsTest {
 
   @Test
   public void test_Chrome36_EngineWebViewVersionStatusDisabled() {
-    String chromeVersion = "36.0";
+    double chromeVersionFloat = Float.parseFloat(WebViewUtils.KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME) - 1.0;
+    String chromeVersion = String.valueOf(chromeVersionFloat);
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.DISABLED);
   }
 
   @Test
   public void test_Chrome37_EngineWebViewVersionStatusDegraded() {
-    String chromeVersion = "37.0";
+    String chromeVersion = WebViewUtils.KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME;
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.DEGRADED);
   }
 
   @Test
-  public void test_Chrome56_EngineWebViewVersionStatusDegraded() {
-    String chromeVersion = "56.0";
+  public void test_Chrome94_EngineWebViewVersionStatusDegraded() {
+    double chromeVersionFloat = Float.parseFloat(WebViewUtils.KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME) - 1.0;
+    String chromeVersion = String.valueOf(chromeVersionFloat);
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.DEGRADED);
   }
 
   @Test
-  public void test_Chrome57_EngineWebViewVersionStatusFull() {
-    String chromeVersion = "57.0";
+  public void test_Chrome95_EngineWebViewVersionStatusFull() {
+    String chromeVersion = WebViewUtils.KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME;
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.FULL);
   }
diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh
index 4d4ea7f8e3..9b6d0d4892 100755
--- a/android/KMEA/build.sh
+++ b/android/KMEA/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 # ################################ Main script ################################
diff --git a/android/Samples/KMSample1/app/build.gradle b/android/Samples/KMSample1/app/build.gradle
index 53a4a560f2..07f6e903f3 100644
--- a/android/Samples/KMSample1/app/build.gradle
+++ b/android/Samples/KMSample1/app/build.gradle
@@ -2,6 +2,12 @@ plugins {
     id 'com.android.application'
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 35
     namespace="com.keyman.kmsample1"
diff --git a/android/Samples/KMSample1/build.sh b/android/Samples/KMSample1/build.sh
index 172ef6c5e7..65e5619815 100755
--- a/android/Samples/KMSample1/build.sh
+++ b/android/Samples/KMSample1/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -23,7 +23,7 @@ builder_describe "Build KMSample1 app for Android." \
   "configure" \
   "build" \
   "test" \
-  ":app                   KMSample1" 
+  ":app                   KMSample1"
 
 # parse before describe_outputs to check debug flags
 builder_parse "$@"
diff --git a/android/Samples/KMSample2/app/build.gradle b/android/Samples/KMSample2/app/build.gradle
index 5bafdc295a..4baaf52b6f 100644
--- a/android/Samples/KMSample2/app/build.gradle
+++ b/android/Samples/KMSample2/app/build.gradle
@@ -2,6 +2,12 @@ plugins {
     id 'com.android.application'
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 35
     namespace="com.keyman.kmsample2"
diff --git a/android/Samples/KMSample2/build.sh b/android/Samples/KMSample2/build.sh
index 2f7a99c764..08c5261778 100755
--- a/android/Samples/KMSample2/build.sh
+++ b/android/Samples/KMSample2/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -23,7 +23,7 @@ builder_describe "Build KMSample2 app for Android." \
   "configure" \
   "build" \
   "test" \
-  ":app                   KMSample2" 
+  ":app                   KMSample2"
 
 # parse before describe_outputs to check debug flags
 builder_parse "$@"
diff --git a/android/Tests/KeyboardHarness/app/build.gradle b/android/Tests/KeyboardHarness/app/build.gradle
index 3eb7f27d28..6b28b62d9c 100644
--- a/android/Tests/KeyboardHarness/app/build.gradle
+++ b/android/Tests/KeyboardHarness/app/build.gradle
@@ -5,6 +5,12 @@ plugins {
 ext.rootPath = '../../../'
 apply from: "$rootPath/version.gradle"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 35
     namespace="com.keyman.android.tests.keyboardHarness"
diff --git a/android/Tests/KeyboardHarness/build.gradle b/android/Tests/KeyboardHarness/build.gradle
index 8fdf2aa422..966127346a 100644
--- a/android/Tests/KeyboardHarness/build.gradle
+++ b/android/Tests/KeyboardHarness/build.gradle
@@ -15,8 +15,8 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url uri("${projectDir}/libs") }
         google()
-        jcenter()
         mavenCentral()
     }
 }
diff --git a/android/Tests/KeyboardHarness/build.sh b/android/Tests/KeyboardHarness/build.sh
index c23f8ca0f5..66f2b0496e 100755
--- a/android/Tests/KeyboardHarness/build.sh
+++ b/android/Tests/KeyboardHarness/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -23,7 +23,7 @@ builder_describe "Build KeyboardHarness test app for Android." \
   "configure" \
   "build" \
   "test" \
-  ":app                   KeyboardHarness" 
+  ":app                   KeyboardHarness"
 
 # parse before describe outputs to check debug flags
 builder_parse "$@"
diff --git a/android/Tests/keycode/app/build.gradle b/android/Tests/keycode/app/build.gradle
index 975d8054ae..769cddb88a 100644
--- a/android/Tests/keycode/app/build.gradle
+++ b/android/Tests/keycode/app/build.gradle
@@ -1,4 +1,6 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 ext.rootPath = '../../../'
 apply from: "$rootPath/version.gradle"
@@ -7,6 +9,11 @@ android {
     compileSdk 35
     namespace="com.keyman.android.tests.keycode"
 
+    buildFeatures {
+        // needed for custom BuildConfigField values in defaultConfig
+        buildConfig = true
+    }
+
     defaultConfig {
         applicationId "com.keyman.android.tests.keycode"
         minSdkVersion 21
@@ -27,11 +34,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'androidx.test.ext:junit:1.1.5'
-    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'androidx.test.ext:junit:1.2.1'
+    testImplementation 'org.robolectric:robolectric:4.14.1'
+    testImplementation 'androidx.test:core:1.6.1'
 }
diff --git a/android/Tests/keycode/app/src/androidTest/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
similarity index 72%
rename from android/Tests/keycode/app/src/androidTest/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
rename to android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
index d4bbda1b05..cf2b42ce88 100644
--- a/android/Tests/keycode/app/src/androidTest/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
+++ b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
@@ -1,25 +1,25 @@
 package com.keyman.android.tests.keycode;
 
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import android.content.Context;
 
 import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
-@RunWith(AndroidJUnit4.class)
+@RunWith(RobolectricTestRunner.class)
 public class ExampleInstrumentedTest {
   @Test
   public void useAppContext() {
     // Context of the app under test.
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = ApplicationProvider.getApplicationContext();
 
     assertEquals("com.keyman.android.tests.keycode", appContext.getPackageName());
   }
diff --git a/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java
index 7e0e3c7481..544b21224c 100644
--- a/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java
+++ b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.example.darcy.keycode;
+package com.keyman.android.tests.keycode;
 
 import org.junit.Test;
 
diff --git a/android/Tests/keycode/build.gradle b/android/Tests/keycode/build.gradle
index 47a85343bf..3a7f319289 100644
--- a/android/Tests/keycode/build.gradle
+++ b/android/Tests/keycode/build.gradle
@@ -4,10 +4,10 @@ buildscript {
     
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.9.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,10 +18,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/android/Tests/keycode/gradle.properties b/android/Tests/keycode/gradle.properties
index 7d43aa3719..44ff6135fe 100644
--- a/android/Tests/keycode/gradle.properties
+++ b/android/Tests/keycode/gradle.properties
@@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx1024m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+# AGP 8.0 generates R classes for resources defined in the current module only.
+android.nonTransitiveRClass=false
 
diff --git a/android/build.sh b/android/build.sh
index eeaa3f6e9a..e00c99e634 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -10,11 +10,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/build-utils-ci.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
 
@@ -108,8 +108,18 @@ function archive_artifacts() {
   fi
 }
 
-# Override JAVA_HOME to OpenJDK 11
-set_java_home
+
+# For CI compatibility of building Keyman for Android 18.0 with OpenJDK 11,
+# this overrides JAVA_HOME for the builder script to use OpenJDK 21.
+android_set_java_home() {
+  if [[ ! -z ${JAVA_HOME_21+x} ]]; then
+    builder_echo "Setting JAVA_HOME to JAVA_HOME_21 (${JAVA_HOME_21})"
+    export JAVA_HOME="${JAVA_HOME_21}"
+  fi
+}
+
+# Override JAVA_HOME
+android_set_java_home
 
 # This script also responsible for cleaning up /android/upload
 builder_run_child_actions clean
diff --git a/android/docs/help/about/system-requirements.md b/android/docs/help/about/system-requirements.md
index 16efbf28af..ae43794793 100644
--- a/android/docs/help/about/system-requirements.md
+++ b/android/docs/help/about/system-requirements.md
@@ -9,7 +9,7 @@ Keyman for Android will run on Android phones and tablets that have a minimum ve
 [Android 5.0 (Lollipop)](https://developer.android.com/about/versions/lollipop).
 
 ### Minimum Chrome Version
-Keyman for Android requires a minimum version 53.0 of [Google
+Keyman for Android requires a minimum version 95.0 of [Google
 Chrome](https://play.google.com/store/apps/details?id=com.android.chrome).
 If you have an older device, you may need to upgrade Chrome before you can use
 Keyman, e.g. through the Play Store.
diff --git a/android/utility/i18n-check-unused-strings.sh b/android/utility/i18n-check-unused-strings.sh
index 062ff8cff4..9e3a0a21c3 100755
--- a/android/utility/i18n-check-unused-strings.sh
+++ b/android/utility/i18n-check-unused-strings.sh
@@ -25,7 +25,7 @@ set -u # die on undefined variables
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Preparation
diff --git a/build.sh b/build.sh
index a455d3307f..2589a162b1 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman -- all projects" \
diff --git a/common/build.sh b/common/build.sh
index 5119bca8ac..a066cf15d3 100755
--- a/common/build.sh
+++ b/common/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman common and resources modules" \
diff --git a/common/include/build.sh b/common/include/build.sh
index 9115bd661a..962d13d5c7 100755
--- a/common/include/build.sh
+++ b/common/include/build.sh
@@ -5,7 +5,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build keymanversion_build.h" configure build clean
diff --git a/common/linux/build.sh b/common/linux/build.sh
index b52102313e..2df05e03ba 100755
--- a/common/linux/build.sh
+++ b/common/linux/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #
diff --git a/common/mac/build.sh b/common/mac/build.sh
index 44a7064c83..1acf2f3ccd 100755
--- a/common/mac/build.sh
+++ b/common/mac/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #
diff --git a/common/test/keyboards/baseline/build.sh b/common/test/keyboards/baseline/build.sh
index 065e2593c5..1428b5e0c4 100755
--- a/common/test/keyboards/baseline/build.sh
+++ b/common/test/keyboards/baseline/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Baseline keyboards tests -- built with 16.0 compiler" \
diff --git a/common/test/keyboards/build.sh b/common/test/keyboards/build.sh
index 2d6a986b87..489bf17543 100755
--- a/common/test/keyboards/build.sh
+++ b/common/test/keyboards/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/zip.inc.sh"
diff --git a/common/test/keyboards/issue/6254-invalid-version-99/build.sh b/common/test/keyboards/issue/6254-invalid-version-99/build.sh
index 7bf37f54e4..80c5e575e6 100755
--- a/common/test/keyboards/issue/6254-invalid-version-99/build.sh
+++ b/common/test/keyboards/issue/6254-invalid-version-99/build.sh
@@ -3,8 +3,8 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh"
-# . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-basic.inc.sh"
+# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 THIS_DIR="$(dirname "$THIS_SCRIPT")"
 
diff --git a/common/test/resources/model-helpers.mjs b/common/test/resources/model-helpers.mjs
index a3f141cd54..6ea3620c9d 100644
--- a/common/test/resources/model-helpers.mjs
+++ b/common/test/resources/model-helpers.mjs
@@ -19,7 +19,9 @@ import { fileURLToPath } from 'url';
 /**
  * Creates a MessageEvent (for inter-worker communication), with the given data payload.
  *
- * @param {*} data
+ * @template {T}
+ * @param {T} data
+ * @returns {T}
  */
 export function createMessageEventWithData(data) {
   return { data };
diff --git a/common/test/resources/test_kill_browserstack.sh b/common/test/resources/test_kill_browserstack.sh
index f6ea16a36b..cbca52da45 100755
--- a/common/test/resources/test_kill_browserstack.sh
+++ b/common/test/resources/test_kill_browserstack.sh
@@ -8,7 +8,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 
diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh
index 073b008bf2..45706c35b4 100755
--- a/common/tools/hextobin/build.sh
+++ b/common/tools/hextobin/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -17,5 +18,5 @@ builder_describe_outputs \
 builder_parse "$@"
 
 builder_run_action clean      rm -rf build/ node_modules/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
diff --git a/common/tools/sourcemap-path-remapper/build.sh b/common/tools/sourcemap-path-remapper/build.sh
index 3d50eccf83..871de4c546 100755
--- a/common/tools/sourcemap-path-remapper/build.sh
+++ b/common/tools/sourcemap-path-remapper/build.sh
@@ -6,10 +6,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -34,7 +35,7 @@ fi
 ### CONFIGURE ACTIONS
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/common/web/build.sh b/common/web/build.sh
index 2370e3ecf4..182de85d62 100755
--- a/common/web/build.sh
+++ b/common/web/build.sh
@@ -5,7 +5,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman common web modules" \
diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh
index 9de3da3f8f..0c9657f74b 100755
--- a/common/web/keyman-version/build.sh
+++ b/common/web/keyman-version/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -53,6 +54,6 @@ export default KEYMAN_VERSION;
 }
 
 builder_run_action clean        rm -rf version.inc.ts keyman-version.mts build/
-builder_run_action configure    verify_npm_setup
+builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
 builder_run_action publish      builder_publish_npm
diff --git a/common/web/langtags/build.sh b/common/web/langtags/build.sh
index f125448d4a..d1b951b624 100755
--- a/common/web/langtags/build.sh
+++ b/common/web/langtags/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman langtags.js common module" \
@@ -32,7 +33,7 @@ function compile_langtags() {
 }
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   compile_langtags
 }
 
diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index 5a9243e6cd..1ece69f2af 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman common file types module" \
@@ -76,7 +77,7 @@ function compile_schemas() {
 
 function do_configure() {
   compile_schemas
-  verify_npm_setup
+  node_select_version_and_npm_ci
 }
 
 function do_test() {
diff --git a/common/web/types/src/lexical-model-types.ts b/common/web/types/src/lexical-model-types.ts
index e2670d2e21..82619b4ce4 100644
--- a/common/web/types/src/lexical-model-types.ts
+++ b/common/web/types/src/lexical-model-types.ts
@@ -417,13 +417,24 @@ export interface ProbabilityMass<T> {
 export type Distribution<T> = ProbabilityMass<T>[];
 
 /**
- * A type augmented with an optional probability.
+ * A type augmented with optional probability data.
  */
 export type Outcome<T> = T & {
   /**
-   * [optional] probability of this outcome.
+   * [optional] the modeled likelihood associated with this outcome.
    */
   p?: number;
+
+  /**
+   * The likelihood of the suggestion itself based solely on the lexical model
+   */
+  ['lexical-p']?: number
+
+  /**
+   * The likelihood associated with the keystroke sequence and/or associated
+   * text corrections best matching the suggestion.
+   */
+  ['correction-p']?: number
 };
 
 /**
@@ -434,6 +445,21 @@ export type WithOutcome<T> = T & {
    * Probability of this outcome.
    */
   p: number;
+
+  /**
+   * The likelihood of the suggestion itself based solely on the lexical model
+   *
+   * Only emitted for verbose mode.
+   */
+  ['lexical-p']?: number
+
+  /**
+   * The likelihood associated with the keystroke sequence and/or associated
+   * text corrections best matching the suggestion.
+   *
+   * Only omitted for verbose mode.
+   */
+  ['correction-p']?: number
 };
 
 
diff --git a/common/windows/build.sh b/common/windows/build.sh
index 663a7f41c7..45941b668d 100755
--- a/common/windows/build.sh
+++ b/common/windows/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #
diff --git a/common/windows/cef-checkout.sh b/common/windows/cef-checkout.sh
index b8326561b8..c669961328 100755
--- a/common/windows/cef-checkout.sh
+++ b/common/windows/cef-checkout.sh
@@ -13,8 +13,8 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
-# . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
+# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 pushd $KEYMAN_CEF4DELPHI_ROOT > /dev/null
diff --git a/common/windows/data/build.sh b/common/windows/data/build.sh
index ac559612bb..2b70c426ed 100755
--- a/common/windows/data/build.sh
+++ b/common/windows/data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/build.sh b/common/windows/delphi/build.sh
index b3e0ddfc1f..81042422fd 100755
--- a/common/windows/delphi/build.sh
+++ b/common/windows/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/components/build.sh b/common/windows/delphi/components/build.sh
index 86bad135e0..6fe3dfa9ec 100755
--- a/common/windows/delphi/components/build.sh
+++ b/common/windows/delphi/components/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Common Delphi components" clean configure build test edit
diff --git a/common/windows/delphi/ext/build.sh b/common/windows/delphi/ext/build.sh
index 3fb17d98b3..05dffca69d 100755
--- a/common/windows/delphi/ext/build.sh
+++ b/common/windows/delphi/ext/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/ext/cef4delphi/build.sh b/common/windows/delphi/ext/cef4delphi/build.sh
index 340cfbf9b1..856694dd27 100755
--- a/common/windows/delphi/ext/cef4delphi/build.sh
+++ b/common/windows/delphi/ext/cef4delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "cef4delphi component" clean configure build test
diff --git a/common/windows/delphi/ext/dcpcrypt/build.sh b/common/windows/delphi/ext/dcpcrypt/build.sh
index cbda46a94d..eceaf361b0 100755
--- a/common/windows/delphi/ext/dcpcrypt/build.sh
+++ b/common/windows/delphi/ext/dcpcrypt/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "dcpcrypt component" clean configure build test
diff --git a/common/windows/delphi/ext/jwa/build.sh b/common/windows/delphi/ext/jwa/build.sh
index 12b27dfe81..30cbbeb919 100755
--- a/common/windows/delphi/ext/jwa/build.sh
+++ b/common/windows/delphi/ext/jwa/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "jwa component" clean configure build test
diff --git a/common/windows/delphi/ext/sentry/build.sh b/common/windows/delphi/ext/sentry/build.sh
index b25d9c3253..c0b0cc9147 100755
--- a/common/windows/delphi/ext/sentry/build.sh
+++ b/common/windows/delphi/ext/sentry/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Sentry component for Delphi" clean configure build test
diff --git a/common/windows/delphi/ext/tds2dbg/build.sh b/common/windows/delphi/ext/tds2dbg/build.sh
index a8fc83989d..805f957ea1 100755
--- a/common/windows/delphi/ext/tds2dbg/build.sh
+++ b/common/windows/delphi/ext/tds2dbg/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # TODO: move this out of ext and into tools
diff --git a/common/windows/delphi/general/KeymanVersionInfo.inc b/common/windows/delphi/general/KeymanVersionInfo.inc
index 4991b42385..41e316e051 100644
--- a/common/windows/delphi/general/KeymanVersionInfo.inc
+++ b/common/windows/delphi/general/KeymanVersionInfo.inc
@@ -1,6 +1,6 @@
 type
   TKeymanVersionInfo = record
-    // These fields match fields in /resources/build/build-utils.sh
+    // These fields match fields in /resources/build/builder-basic.inc.sh
     Version: string;        // 14.0.2
     VersionWin: string;     // 14.0.2.0
     VersionRelease: string; // 14.0
diff --git a/common/windows/delphi/general/keymanversion_build.in b/common/windows/delphi/general/keymanversion_build.in
index edd55572a6..a5ada65e15 100644
--- a/common/windows/delphi/general/keymanversion_build.in
+++ b/common/windows/delphi/general/keymanversion_build.in
@@ -6,7 +6,7 @@
   // Keyman Version Information
 
   CKeymanVersionInfo: TKeymanVersionInfo = (
-    // These fields match fields in /resources/build/build-utils.sh
+    // These fields match fields in /resources/build/builder-basic.inc.sh
     Version: '$Version';
     VersionWin: '$VersionWin';
     VersionRelease: '$VersionRelease';
diff --git a/common/windows/delphi/tools/build.sh b/common/windows/delphi/tools/build.sh
index 6fad40a4d6..220463620b 100755
--- a/common/windows/delphi/tools/build.sh
+++ b/common/windows/delphi/tools/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/tools/build_standards_data/build.sh b/common/windows/delphi/tools/build_standards_data/build.sh
index 3d39aefe9d..239bde79f0 100755
--- a/common/windows/delphi/tools/build_standards_data/build.sh
+++ b/common/windows/delphi/tools/build_standards_data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build build_standards_data tool" clean configure build test edit
diff --git a/common/windows/delphi/tools/buildunidata/build.sh b/common/windows/delphi/tools/buildunidata/build.sh
index b4e13c264d..36b069351b 100755
--- a/common/windows/delphi/tools/buildunidata/build.sh
+++ b/common/windows/delphi/tools/buildunidata/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Unicode character database build tool" \
diff --git a/common/windows/delphi/tools/certificates/build.sh b/common/windows/delphi/tools/certificates/build.sh
index 10ab4c75ce..dfe4911f18 100755
--- a/common/windows/delphi/tools/certificates/build.sh
+++ b/common/windows/delphi/tools/certificates/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build and install test certificates" clean configure build test \
diff --git a/common/windows/delphi/tools/devtools/build.sh b/common/windows/delphi/tools/devtools/build.sh
index f514ea7578..f7b9dd52d4 100755
--- a/common/windows/delphi/tools/devtools/build.sh
+++ b/common/windows/delphi/tools/devtools/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/tools/sentrytool/build.sh b/common/windows/delphi/tools/sentrytool/build.sh
index ca4e427c39..c1672b0aeb 100755
--- a/common/windows/delphi/tools/sentrytool/build.sh
+++ b/common/windows/delphi/tools/sentrytool/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Sentrytool for converting Delphi symbols into sentry-readable format" \
diff --git a/common/windows/delphi/tools/test-klog/build.sh b/common/windows/delphi/tools/test-klog/build.sh
index b271565cae..acdd90cd53 100755
--- a/common/windows/delphi/tools/test-klog/build.sh
+++ b/common/windows/delphi/tools/test-klog/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Tool for validating klog is disabled for release builds" \
diff --git a/common/windows/delphi/tools/verify_signatures/build.sh b/common/windows/delphi/tools/verify_signatures/build.sh
index f53883c70e..d1b29e89cb 100755
--- a/common/windows/delphi/tools/verify_signatures/build.sh
+++ b/common/windows/delphi/tools/verify_signatures/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Tool to verify all Windows executable signatures and manifests" \
diff --git a/common/windows/mkver.sh b/common/windows/mkver.sh
index 8ddb9e34ed..84886666bd 100755
--- a/common/windows/mkver.sh
+++ b/common/windows/mkver.sh
@@ -9,7 +9,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 display_usage() {
diff --git a/core/build.sh b/core/build.sh
index 94e8ae4e38..1c1d337b1c 100755
--- a/core/build.sh
+++ b/core/build.sh
@@ -3,11 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$THIS_SCRIPT_PATH/commands.inc.sh"
 
 ################################ Main script ################################
diff --git a/core/include/ldml/build.sh b/core/include/ldml/build.sh
index 17902411d3..f2633ed348 100755
--- a/core/include/ldml/build.sh
+++ b/core/include/ldml/build.sh
@@ -5,10 +5,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman ldml-keyboard-constants package" \
@@ -30,7 +31,7 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 # builder_run_action test       # no tests at this time
 builder_run_action publish    builder_publish_npm
diff --git a/core/meson.build b/core/meson.build
index a5dffb5ede..01e016ad27 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -9,6 +9,7 @@ project('keyman_core', 'cpp', 'c',
         version: files('../VERSION.md'),
         license: 'MIT',
         default_options : ['buildtype=release',
+                           'cpp_std=c++17',
                            'b_vscrt=static_from_buildtype',
                            'warning_level=2',
                            'debug=true'],
diff --git a/core/tools/api-header-extractor/build.sh b/core/tools/api-header-extractor/build.sh
index fe048ce48b..bf26598ce2 100755
--- a/core/tools/api-header-extractor/build.sh
+++ b/core/tools/api-header-extractor/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 CORE_ROOT="$KEYMAN_ROOT/core"
diff --git a/core/tools/ldml-const-builder/build.sh b/core/tools/ldml-const-builder/build.sh
index 26c7c0a60e..8c8bc364b5 100755
--- a/core/tools/ldml-const-builder/build.sh
+++ b/core/tools/ldml-const-builder/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 CORE_LDML_H_FILE="../../include/ldml/keyman_core_ldml.h"
 
diff --git a/developer/build.sh b/developer/build.sh
index b75967a4ce..74269abcc3 100755
--- a/developer/build.sh
+++ b/developer/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD UTILITY SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD UTILITY SCRIPT INCLUDE
 
 # This is not a builder script but calls a builder script
diff --git a/developer/docs/help/reference/bcp-47.md b/developer/docs/help/reference/bcp-47.md
index f5c8a49539..0d087911e2 100644
--- a/developer/docs/help/reference/bcp-47.md
+++ b/developer/docs/help/reference/bcp-47.md
@@ -30,26 +30,30 @@ The following are all examples of valid BCP 47 tags:
 * `en-US`: English, in United States
 * `km-Khmr-KH`: Khmer, written in the Khmer script, in Cambodia
 * `km-fonipa`: Khmer, transcribed in IPA
+* `und-cpmn`: Undetermined (Cypro-Minoan)
+* `tok-Zzzz`: Toki Pona (Code for uncoded script)
+
+> [!NOTE]
+> `Zzzz` is an uncoded script of ISO 15924 and one of the Special codes of the Script subtag.
 
 ### The language subtag
 
-The only required option is the Language subtag, which is an [ISO 639-1][2] or
-[ISO 639-3][3] code.
+The only required option is the Language subtag, which is an [ISO 639][4] code. If a two-letter code[ISO 639-1][2] is available, it is used instead of the three-letter code [ISO 639-3][3].   
 
-ISO 639-1 tags are a two-letter code. ISO 639-3 tags are a three-letter code.
 First, try to find your language on the list of two-letter ISO 639-1 codes.
-[This Wikipedia page][4] lists all of the two-letter codes.
+[This Wikipedia page][5] lists all of the two-letter codes.
 
 If you can't find a two-letter code, you'll need to find the closest
-three-letter code. You can use [Glottolog][5] to search for your language, and
+three-letter code. You can use [Glottolog][6] to search for your language, and
 it will give you an appropriate code. In this example, I searched Glottolog for
-“[Saanich][6]” (name of the First Nations that speak SENĆOŦEN) and found `str`
+“[Saanich][7]” (name of the First Nations that speak SENĆOŦEN) and found `str`
 as the code for all Straits Salish languages.
 
-The Language subtag is conventionally written in lower case.
+> [!IMPORTANT] 
+> The Language subtag is conventionally written in lower case.
 
-The next two subtags are **optional**, however, they allow you to be more
-specific about your language.
+> [!NOTE]
+>  The next two subtags are **optional**, however, they allow you to be more specific about your language.
 
 ### The script subtag
 
@@ -58,7 +62,7 @@ model or keyboard. If your language only uses one writing system, omit the
 Script subtag.
 
 Otherwise, in cases where a language can be written in many different writing
-systems, you can choose the four letter [ISO 15924][7] script tag that your
+systems, you can choose the four letter [ISO 15924][8] script tag that your
 keyboard or lexical model produces.
 
 For example, Plains Cree can either be written in _standard Roman orthography_,
@@ -67,8 +71,8 @@ of the **Canadian Aboriginal syllabics** family of writing systems. If I wrote a
 keyboard or lexical model that produced syllabics, I would choose `Cans`, as
 that is the **ISO 15924** tag for Canadian Aboriginal syllabics.
 
-The Script subtag is conventionally written in title case - first letter
-capitalized.
+> [!IMPORTANT] 
+> The Script subtag is conventionally written in title case - first letter capitalized.
 
 ### The region subtag
 
@@ -88,11 +92,11 @@ Latin America. Additionally, regions may have vocabulary that doesn't exist in
 the other regions where the language is spoken.
 
 If I were working with a language specific to one country, I would use the [ISO
-3166-1 alpha-2][8] country code for the region subtag. For example, `ES` for
+3166-1 alpha-2][9] country code for the region subtag. For example, `ES` for
 Spain or `MX` for Mexico.
 
 However, if I were working with Latin American Spanish (a group of countries), I
-would need to specify Latin America's [UN M49][9] region code. For Latin
+would need to specify Latin America's [UN M49][10] region code. For Latin
 America, its code is `419`. My lexical model would not suggest words that are
 common in Spain, but vulgar in Latin America, however it would predict words
 like "pupupsas" and "chuchitos", which are words that are uncommon in both Spain
@@ -100,14 +104,16 @@ and Mexico.
 
 Another common UN M49 region code is `001` for the whole world.
 
-Alphabetic region subtags are conventionally written in upper case.
+> [!IMPORTANT] 
+> Alphabetic region subtags are conventionally written in upper case.
 
 [1]: https://en.wikipedia.org/wiki/IETF_language_tag
 [2]: https://en.wikipedia.org/wiki/ISO_639-1
 [3]: https://en.wikipedia.org/wiki/ISO_639-3
-[4]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-[5]: https://glottolog.org/glottolog/language
-[6]: https://glottolog.org/resource/languoid/id/saan1246
-[7]: https://en.wikipedia.org/wiki/ISO_15924
-[8]: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-[9]: https://en.wikipedia.org/wiki/UN_M49
+[4]: https://en.wikipedia.org/wiki/ISO_639
+[5]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+[6]: https://glottolog.org/glottolog/language
+[7]: https://glottolog.org/resource/languoid/id/saan1246
+[8]: https://en.wikipedia.org/wiki/ISO_15924
+[9]: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+[10]: https://en.wikipedia.org/wiki/UN_M49
diff --git a/developer/src/build.sh b/developer/src/build.sh
index d81762aa2c..6e23dc8c0a 100755
--- a/developer/src/build.sh
+++ b/developer/src/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
diff --git a/developer/src/common/build.sh b/developer/src/common/build.sh
index b37c2bc948..8ef5a4a1f2 100755
--- a/developer/src/common/build.sh
+++ b/developer/src/common/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/common/delphi/build.sh b/developer/src/common/delphi/build.sh
index 63680a5624..907621194f 100755
--- a/developer/src/common/delphi/build.sh
+++ b/developer/src/common/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/common/web/build.sh b/developer/src/common/web/build.sh
index 7ca90bd986..9be3a521fa 100755
--- a/developer/src/common/web/build.sh
+++ b/developer/src/common/web/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/common/web/test-helpers/build.sh b/developer/src/common/web/test-helpers/build.sh
index c1664cfddd..98b8e0b184 100755
--- a/developer/src/common/web/test-helpers/build.sh
+++ b/developer/src/common/web/test-helpers/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 builder_describe "Keyman Developer unit test helpers" \
   "@/developer/src/common/web/utils" \
@@ -20,6 +21,6 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean       rm -rf ./build/
-builder_run_action configure   verify_npm_setup
+builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       tsc --build
 # builder_run_action test        # no tests at this time
diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh
index 251588e2f6..7c0f8f0ed9 100755
--- a/developer/src/common/web/utils/build.sh
+++ b/developer/src/common/web/utils/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman Developer web utility module" \
@@ -47,7 +49,7 @@ function do_build() {
 }
 
 builder_run_action clean       rm -rf ./build/
-builder_run_action configure   verify_npm_setup
+builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       do_build
-builder_run_action test        builder_do_typescript_tests 45
+builder_run_action test        typescript_run_eslint_mocha_tests 45
 builder_run_action publish     builder_publish_npm
diff --git a/developer/src/ext/browse4folder/build.sh b/developer/src/ext/browse4folder/build.sh
index d59e17ee71..cc86bd3427 100755
--- a/developer/src/ext/browse4folder/build.sh
+++ b/developer/src/ext/browse4folder/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "browse4folder component" clean configure build test
diff --git a/developer/src/ext/build.sh b/developer/src/ext/build.sh
index 6dd7a576a1..fda45cef67 100755
--- a/developer/src/ext/build.sh
+++ b/developer/src/ext/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/ext/jedi/build.sh b/developer/src/ext/jedi/build.sh
index d43ad7e1fb..226819d268 100755
--- a/developer/src/ext/jedi/build.sh
+++ b/developer/src/ext/jedi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/developer/src/ext/mbcolor/build.sh b/developer/src/ext/mbcolor/build.sh
index 7d1a2d174a..bbfc3a6fdc 100755
--- a/developer/src/ext/mbcolor/build.sh
+++ b/developer/src/ext/mbcolor/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "mbcolor component" clean configure build test
diff --git a/developer/src/ext/scfontcombobox/build.sh b/developer/src/ext/scfontcombobox/build.sh
index 332f043875..72d0aec3fb 100755
--- a/developer/src/ext/scfontcombobox/build.sh
+++ b/developer/src/ext/scfontcombobox/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "scfontcombobox component" clean configure build test
diff --git a/developer/src/inst/build.sh b/developer/src/inst/build.sh
index 504811eb4b..8b37048e1e 100755
--- a/developer/src/inst/build.sh
+++ b/developer/src/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 source "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 
 builder_describe "Installation files for Keyman Developer" \
diff --git a/developer/src/kmanalyze/build.sh b/developer/src/kmanalyze/build.sh
index ecd9fd263f..a72381557f 100755
--- a/developer/src/kmanalyze/build.sh
+++ b/developer/src/kmanalyze/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Legacy keyboard source analysis tool" \
diff --git a/developer/src/kmc-analyze/build.sh b/developer/src/kmc-analyze/build.sh
index ace83ffbbe..d54ed8927f 100755
--- a/developer/src/kmc-analyze/build.sh
+++ b/developer/src/kmc-analyze/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman Developer Compiler Analysis Tools" \
@@ -26,8 +28,8 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       builder_do_typescript_tests 70
+builder_run_action test       typescript_run_eslint_mocha_tests 70
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-copy/build.sh b/developer/src/kmc-copy/build.sh
index b681757be2..eb52215ec9 100755
--- a/developer/src/kmc-copy/build.sh
+++ b/developer/src/kmc-copy/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman kmc-copy module" \
@@ -32,13 +34,13 @@ builder_parse "$@"
 
 
 builder_run_action clean      rm -rf ./build/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
 
 # note: `export TEST_SAVE_ARTIFACTS=1` to save a copy of artifacts to temp path
 # note: `export TEST_SAVE_FIXTURES=1` to get a copy of cloud-based fixtures saved to online/
 # TODO: -skip-full
-builder_run_action test       builder_do_typescript_tests 75
+builder_run_action test       typescript_run_eslint_mocha_tests 75
 
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-generate/build.sh b/developer/src/kmc-generate/build.sh
index 7db46acd56..f1762f4ccf 100755
--- a/developer/src/kmc-generate/build.sh
+++ b/developer/src/kmc-generate/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman kmc-generate module" \
@@ -38,8 +40,8 @@ do_build() {
 }
 
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      do_build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       builder_do_typescript_tests
+builder_run_action test       typescript_run_eslint_mocha_tests
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-keyboard-info/build.sh b/developer/src/kmc-keyboard-info/build.sh
index 87902b6876..b22d973636 100755
--- a/developer/src/kmc-keyboard-info/build.sh
+++ b/developer/src/kmc-keyboard-info/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 
 builder_describe "Build Keyman kmc keyboard-info Compiler module" \
   "@/common/web/langtags" \
@@ -31,10 +33,10 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean       rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure   verify_npm_setup
+builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       tsc --build
 builder_run_action api         api-extractor run --local --verbose
-builder_run_action test        builder_do_typescript_tests
+builder_run_action test        typescript_run_eslint_mocha_tests
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-kmn/build.sh b/developer/src/kmc-kmn/build.sh
index c6ed29b6f9..867f791bf9 100755
--- a/developer/src/kmc-kmn/build.sh
+++ b/developer/src/kmc-kmn/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman Developer Compiler Module for .kmn to .kmx" \
@@ -43,7 +45,7 @@ fi
 #-------------------------------------------------------------------------------------------------------------------
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
@@ -63,7 +65,7 @@ function do_build() {
 
 function do_test() {
   copy_deps
-  builder_do_typescript_tests 80
+  typescript_run_eslint_mocha_tests 80
 }
 
 builder_run_action build      do_build
diff --git a/developer/src/kmc-ldml/build.sh b/developer/src/kmc-ldml/build.sh
index 689291b247..73763be4d5 100755
--- a/developer/src/kmc-ldml/build.sh
+++ b/developer/src/kmc-ldml/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 
 builder_describe "Keyman kmc Keyboard Compiler module" \
   "@/common/web/keyman-version" \
@@ -38,7 +40,7 @@ function do_clean() {
 }
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   do_build_abnf
 }
 
@@ -87,7 +89,7 @@ builder_run_action configure       do_configure
 builder_run_action build           do_build
 builder_run_action build-fixtures  do_build_fixtures
 builder_run_action api             api-extractor run --local --verbose
-builder_run_action test            builder_do_typescript_tests  90
+builder_run_action test            typescript_run_eslint_mocha_tests  90
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-model-info/build.sh b/developer/src/kmc-model-info/build.sh
index 766c9be413..816a195e00 100755
--- a/developer/src/kmc-model-info/build.sh
+++ b/developer/src/kmc-model-info/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 
 builder_describe "Build Keyman kmc Lexical Model model-info Compiler module" \
   "@/common/web/types" \
@@ -28,10 +30,10 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure    verify_npm_setup
+builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        tsc --build
 builder_run_action api          api-extractor run --local --verbose
-builder_run_action test         builder_do_typescript_tests 55
+builder_run_action test         typescript_run_eslint_mocha_tests 55
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-model/build.sh b/developer/src/kmc-model/build.sh
index 9e7166f8b7..f2eef55cfc 100755
--- a/developer/src/kmc-model/build.sh
+++ b/developer/src/kmc-model/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman kmc Lexical Model Compiler module" \
@@ -36,9 +38,9 @@ function do_build() {
 }
 
 builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure    verify_npm_setup
+builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
 builder_run_action api          api-extractor run --local --verbose
-builder_run_action test         builder_do_typescript_tests
+builder_run_action test         typescript_run_eslint_mocha_tests
 builder_run_action publish      builder_publish_npm
 
diff --git a/developer/src/kmc-package/build.sh b/developer/src/kmc-package/build.sh
index 81f8b928c7..4b9379881a 100755
--- a/developer/src/kmc-package/build.sh
+++ b/developer/src/kmc-package/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman kmc Package Compiler module" \
@@ -33,8 +35,8 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       builder_do_typescript_tests
+builder_run_action test       typescript_run_eslint_mocha_tests
 builder_run_action publish     builder_publish_npm
diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh
index b7f06852c4..1644540651 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -5,11 +5,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe "Build Keyman Keyboard Compiler kmc" \
@@ -54,7 +56,7 @@ function do_build() {
 #-------------------------------------------------------------------------------------------------------------------
 
 function do_test() {
-  builder_do_typescript_tests 50
+  typescript_run_eslint_mocha_tests 50
   ./test/command-line-tests.sh test
 }
 
@@ -107,7 +109,7 @@ function do_bundle() {
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      do_build
 builder_run_action test       do_test
 builder_run_action api        do_api
diff --git a/developer/src/kmc/test/command-line-tests.sh b/developer/src/kmc/test/command-line-tests.sh
index 74447afd41..41652bcdfd 100755
--- a/developer/src/kmc/test/command-line-tests.sh
+++ b/developer/src/kmc/test/command-line-tests.sh
@@ -5,11 +5,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-# . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 # . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe "Test Keyman Keyboard Compiler kmc command line e2e" \
diff --git a/developer/src/kmcmplib/build.sh b/developer/src/kmcmplib/build.sh
index 77036cc990..952c0732b8 100755
--- a/developer/src/kmcmplib/build.sh
+++ b/developer/src/kmcmplib/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$THIS_SCRIPT_PATH/checkout-keyboards.inc.sh"
 . "$THIS_SCRIPT_PATH/commands.inc.sh"
diff --git a/developer/src/kmcmplib/meson.build b/developer/src/kmcmplib/meson.build
index 0493c504f4..935f8496f1 100644
--- a/developer/src/kmcmplib/meson.build
+++ b/developer/src/kmcmplib/meson.build
@@ -8,7 +8,7 @@ project('kmcmplib', 'cpp', 'c',
         version: files('../../../VERSION.md'),
         license: 'MIT',
         default_options : ['buildtype=release',
-                           'cpp_std=c++14',
+                           'cpp_std=c++17',
                            'b_vscrt=static_from_buildtype',
                            'default_library=static',
                            'debug=true'])
diff --git a/developer/src/kmcmplib/src/Compiler.cpp b/developer/src/kmcmplib/src/Compiler.cpp
index b09e9e704d..ab6296609b 100644
--- a/developer/src/kmcmplib/src/Compiler.cpp
+++ b/developer/src/kmcmplib/src/Compiler.cpp
@@ -3874,7 +3874,7 @@ bool isValidUtf8(KMX_BYTE* str, int sz) {
       // 2-byte sequence
       if (remaining < 2 ||
           (str[i + 1] & 0xC0) != 0x80 ||
-          str[i] == 0xC0 ||
+          str[i] == 0xC0 || // C0 and C1 are illegal values
           str[i] == 0xC1) {
         return false;
       }
diff --git a/developer/src/kmcmplib/tests/get-test-source.sh b/developer/src/kmcmplib/tests/get-test-source.sh
index fe6cded2f1..af647ee311 100755
--- a/developer/src/kmcmplib/tests/get-test-source.sh
+++ b/developer/src/kmcmplib/tests/get-test-source.sh
@@ -3,7 +3,7 @@
 # Finds all keyboards in the keyboards repo (passed in $1) that are valid source
 # keyboards (i.e. <area>/<prefix>/<name>/source/<name>.kmn)
 #
-# Called from meson.build, so this script does not use build-utils.sh. Do not run this
+# Called from meson.build, so this script does not use builder-basic.inc.sh. Do not run this
 # script directly.
 #
 set -eu
diff --git a/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp b/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
index 5589056d7e..757767762f 100644
--- a/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
+++ b/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
@@ -24,7 +24,8 @@ KMX_DWORD GetRHS(PFILE_KEYBOARD fk, PKMX_WCHAR p, PKMX_WCHAR buf, int bufsize, i
 bool isIntegerWstring(PKMX_WCHAR p);
 bool hasPreamble(std::u16string result);
 KMX_DWORD ProcessKeyLineImpl(PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX_BOOL IsUnicode, PKMX_WCHAR pklIn, PKMX_WCHAR pklKey, PKMX_WCHAR pklOut);
-bool UTF16TempFromUTF8(KMX_BYTE* infile, int sz, KMX_BYTE** tempfile, int* sz16);
+extern bool UTF16TempFromUTF8(KMX_BYTE* infile, int sz, KMX_BYTE** tempfile, int* sz16);
+extern bool isValidUtf8(KMX_BYTE* str, int sz);
 
 namespace kmcmp {
     extern int nErrors;
@@ -2160,3 +2161,98 @@ TEST(UTF16TempFromUTF8, HandlesEmptyInput) {
   EXPECT_EQ(tempfile, nullptr);
   EXPECT_EQ(sz16, 0);
 }
+
+TEST(IsValidUtf8Test, ValidAscii) {
+  std::vector<KMX_BYTE> v = {'h', 'e', 'l', 'l', 'o'};
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Valid2Byte) {
+  std::vector<KMX_BYTE> v = {0xC2, 0xA2};  // U+00A2: ¢
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Valid3Byte) {
+  std::vector<KMX_BYTE> v = {0xE2, 0x82, 0xAC};  // U+20AC: €
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Valid4Byte) {
+  std::vector<KMX_BYTE> v = {0xF0, 0x9F, 0x98, 0x80};  // U+1F600: 😀
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidOverlongEncoding) {
+  std::vector<KMX_BYTE> v = {0xC1, 0x81};  // Overlong encoding for ASCII
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidMissingContinuation) {
+  std::vector<KMX_BYTE> v = {0xE2, 0x82};  // Missing one continuation byte
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidLoneContinuation) {
+  std::vector<KMX_BYTE> v = {0x80};  // Continuation byte without starter
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteOutOfRange) {
+  std::vector<KMX_BYTE> v = {0xF4, 0x90, 0x80, 0x80};  // > U+10FFFF
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, ValidMixedAsciiAndMultiByte) {
+  std::vector<KMX_BYTE> v = {'A', 0xC2, 0xA2, 0xE2, 0x82, 0xAC, 0xF0, 0x9F, 0x98, 0x80};
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid2ByteBadSecondByte) {
+  std::vector<KMX_BYTE> v = {0xD2, 0x28};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid2ByteBadSecondByteTooHigh) {
+  std::vector<KMX_BYTE> v = {0xD2, 0xC8};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid3ByteBadSecondByte) {
+  std::vector<KMX_BYTE> v = {0xE2, 0x28, 0xA1};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid3ByteBadThirdByte) {
+  std::vector<KMX_BYTE> v = {0xE2, 0xA8, 0xD1};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteBadSecondByte) {
+  std::vector<KMX_BYTE> v = {0xF2, 0xC8, 0xB2, 0x88};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteBadThirdByte) {
+  std::vector<KMX_BYTE> v = {0xF2, 0xB8, 0x02, 0x88};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteBadFourthByte) {
+  std::vector<KMX_BYTE> v = {0xF2, 0xB8, 0xA2, 0xD8};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidByteC0) {
+  std::vector<KMX_BYTE> v = {0xC1};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidByteF5) {
+  std::vector<KMX_BYTE> v = {0xF5};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, ValidEmptyInput) {
+  std::vector<KMX_BYTE> v = {};
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
diff --git a/developer/src/kmcmplib/tests/prep.sh b/developer/src/kmcmplib/tests/prep.sh
index 8ad9b81171..e00f2fc1fd 100755
--- a/developer/src/kmcmplib/tests/prep.sh
+++ b/developer/src/kmcmplib/tests/prep.sh
@@ -11,7 +11,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/developer/src/kmconvert/build.sh b/developer/src/kmconvert/build.sh
index 3ba94c21dc..e18977f05b 100755
--- a/developer/src/kmconvert/build.sh
+++ b/developer/src/kmconvert/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyboard project generation and conversion tool" \
diff --git a/developer/src/kmdbrowserhost/build.sh b/developer/src/kmdbrowserhost/build.sh
index 55e7ae8d14..8996b17bc4 100755
--- a/developer/src/kmdbrowserhost/build.sh
+++ b/developer/src/kmdbrowserhost/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Chromium browser host process for Keyman Developer" \
diff --git a/developer/src/kmdecomp/build.sh b/developer/src/kmdecomp/build.sh
index 494b8afde5..069e3e836a 100755
--- a/developer/src/kmdecomp/build.sh
+++ b/developer/src/kmdecomp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/samples/build.sh b/developer/src/samples/build.sh
index 703a2691a8..c60602bf85 100755
--- a/developer/src/samples/build.sh
+++ b/developer/src/samples/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/samples/imsample/build.sh b/developer/src/samples/imsample/build.sh
index 2cdd11ac70..50447040ac 100755
--- a/developer/src/samples/imsample/build.sh
+++ b/developer/src/samples/imsample/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index 6741bb68de..785fd496c0 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -3,10 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 
 builder_describe "Build Keyman Developer Server" \
@@ -49,7 +50,7 @@ function clean_server() {
 }
 
 function configure_server() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   # See https://github.com/bubenshchykov/ngrok/issues/254, https://github.com/bubenshchykov/ngrok/pull/255
   # TODO: this is horrible; is there a way we can avoid this?
   rm -f "$KEYMAN_ROOT"/node_modules/ngrok/bin/ngrok
diff --git a/developer/src/server/package.json b/developer/src/server/package.json
index 99cd6bb260..37192ca6f3 100644
--- a/developer/src/server/package.json
+++ b/developer/src/server/package.json
@@ -13,7 +13,7 @@
     "@sentry/node": "^7.57.0",
     "chalk": "^4.1.2",
     "express": "^4.20.0",
-    "multer": "^2.0.1",
+    "multer": "^2.0.2",
     "ngrok": "^5.0.0-beta.2",
     "open": "^8.4.0",
     "restructure": "^3.0.1",
diff --git a/developer/src/server/src/version-data.ts b/developer/src/server/src/version-data.ts
index 05f266c5c6..a082a65170 100644
--- a/developer/src/server/src/version-data.ts
+++ b/developer/src/server/src/version-data.ts
@@ -1,5 +1,5 @@
 /*
-  Version information from build-utils.sh:
+  Version information from builder-basic.inc.sh:
 
   #   KEYMAN_VERSION:              Full current build version, e.g. "14.0.1"
   #   [KEYMAN_VERSION_WIN:         Full current build version for Windows, e.g. "14.0.1.0"]
diff --git a/developer/src/setup/build.sh b/developer/src/setup/build.sh
index ef84122fdb..1e4ab94a68 100755
--- a/developer/src/setup/build.sh
+++ b/developer/src/setup/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/test/auto/build.sh b/developer/src/test/auto/build.sh
index 043711e752..a2bca0e0dd 100755
--- a/developer/src/test/auto/build.sh
+++ b/developer/src/test/auto/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/test/auto/compile-supplementary-support/build.sh b/developer/src/test/auto/compile-supplementary-support/build.sh
index b004605b1d..4f8acf40a9 100755
--- a/developer/src/test/auto/compile-supplementary-support/build.sh
+++ b/developer/src/test/auto/compile-supplementary-support/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "test if KS=1 is in the right files, both in debug and non-debug versions" clean configure build test
diff --git a/developer/src/test/auto/keyboard-js-info/build.sh b/developer/src/test/auto/keyboard-js-info/build.sh
index 0a19929f4b..7bbf417681 100755
--- a/developer/src/test/auto/keyboard-js-info/build.sh
+++ b/developer/src/test/auto/keyboard-js-info/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test the read of basic keyboard info info from js files" clean configure build test
diff --git a/developer/src/test/auto/kmcomp/build.sh b/developer/src/test/auto/kmcomp/build.sh
index 7239010b06..8bfcd69149 100755
--- a/developer/src/test/auto/kmcomp/build.sh
+++ b/developer/src/test/auto/kmcomp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test that kmc passes various compile tests" clean configure build test
diff --git a/developer/src/test/auto/kmx-file-languages/build.sh b/developer/src/test/auto/kmx-file-languages/build.sh
index 58ae1492ef..9bf1821450 100755
--- a/developer/src/test/auto/kmx-file-languages/build.sh
+++ b/developer/src/test/auto/kmx-file-languages/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test the read of language info from kmx files and translation from legacy ids to BCP47" clean configure build test
diff --git a/developer/src/test/auto/model-ts-parser/build.sh b/developer/src/test/auto/model-ts-parser/build.sh
index eaf5bb4819..e4e2208e56 100755
--- a/developer/src/test/auto/model-ts-parser/build.sh
+++ b/developer/src/test/auto/model-ts-parser/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test lexical model parser" clean configure build test
diff --git a/developer/src/test/auto/package-info/build.sh b/developer/src/test/auto/package-info/build.sh
index e67366b26e..32f9fbbbc4 100755
--- a/developer/src/test/auto/package-info/build.sh
+++ b/developer/src/test/auto/package-info/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test lexical model parser" clean configure build test
diff --git a/developer/src/test/build.sh b/developer/src/test/build.sh
index 48f3e69ac5..6546dbf752 100755
--- a/developer/src/test/build.sh
+++ b/developer/src/test/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/tike/build.sh b/developer/src/tike/build.sh
index b06fd1f847..0ba6c98642 100755
--- a/developer/src/tike/build.sh
+++ b/developer/src/tike/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build Keyman Developer IDE" \
diff --git a/developer/src/tools/sentry-upload-difs.sh b/developer/src/tools/sentry-upload-difs.sh
index 34ab4c60b0..b45387ec3e 100755
--- a/developer/src/tools/sentry-upload-difs.sh
+++ b/developer/src/tools/sentry-upload-difs.sh
@@ -14,7 +14,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$KEYMAN_ROOT/developer"
diff --git a/docs/build-bot.md b/docs/build-bot.md
index e879154a96..642f285894 100644
--- a/docs/build-bot.md
+++ b/docs/build-bot.md
@@ -26,9 +26,43 @@ Build-bot: skip
 Or you may want to ensure that an artifact is built for Windows:
 
 ```
-Build-bot: release windows
+Build-bot: release:windows
 ```
 
+## The Build-bot command
+
+The build bot is controlled through the `Build-bot` command, which can be put
+into commit trailers or the PR body (not PR comments). The format of the command
+is:
+
+```
+Build-bot: <BuildLevel>:[Platforms] ...
+```
+
+* `BuildLevel` can be `skip`, `build`, or `release`. See [Build Level] for more
+  details.
+* `Platforms` can be omitted, in which case the command applies to all
+  previously-specified platforms (which is not equivalent to specifying `all` --
+  if no platform is specified, it will only update platforms that were already
+  in the build set). If specified, it must be a comma-separated list, without
+  spaces, of one or more of the following platform identifiers:
+
+  * `all`: apply to all platforms listed below
+  * `android`
+  * `developer`
+  * `ios`
+  * `linux`
+  * `mac`
+  * `web`
+  * `windows`
+  * `common`: build common components, on all three build platforms (note:
+    `release` is equivalent to `build` buildLevel for `common`)
+  * `core`: build Keyman Core, on all three build platforms, and also WASM
+    (note: `release` is equivalent to `build` buildLevel for `core`)
+
+The list of platforms can be found in the `available_platforms` variable in
+trigger-definitions.inc.sh.
+
 ## Build Level
 
 The build level specifies what we want to be run for a test build on a PR.
@@ -42,8 +76,8 @@ other release distribution endpoints.
 The build level is controlled by the Build-bot commit trailer and PR body
 Build-bot/Test-bot trailers. The default build level will be 'build'.
 
-For target branch builds, the build level will always be 'build', and Build-bot:
-commit trailers are ignored.
+For target branch (master, beta, stable-x.y) builds, the build level will always
+be 'build', and Build-bot: commit trailers are ignored.
 
 ### 'skip' build level
 
@@ -82,7 +116,8 @@ For a 'release' build level:
 * we won't upload artifacts to any release endpoint such as Debian,
   packages.sil.org, etc, or to the release areas for Play Store or App Store
 
-(uploading to *.keyman.com and to release endpoints happens in the release TC build config/GHA)
+(uploading to *.keyman.com and to release endpoints happens in the release TC
+build config/GHA)
 
 ## Controlling the build bot with trailers
 
@@ -113,10 +148,11 @@ The Build-bot has limited interactions with the Keyman test bot (aka
 keymanapp-test-bot): if a 'User Testing' section is found in the PR body, the
 default build level will be upgraded from 'build' to 'release'.
 
-Build bot trailers found in the commits or in the PR body are applied after the
-test bot command.
+Build bot trailers found in either the commits or in the PR body are applied
+after the test bot command.
 
-WARNING: The build bot does not check PR comments for Test-bot commands.
+WARNING: The build bot does not check PR comments for Test-bot commands or a
+'User Testing' section.
 
 ## Example Build-bot interactions
 
@@ -126,16 +162,68 @@ Say we have a PR that touches `/android/build.sh`. The default build set will be
 The PR body has a User Testing section: `# User Testing`. The build set is
 upgraded to: `(android:release)`.
 
-The first commit includes a Build-bot command: `Build-bot: build ios`. The build
+The first commit includes a Build-bot command: `Build-bot: build:ios`. The build
 set is now `(android:release ios:build)`.
 
 In a subsequent commit, the PR author decides that nothing needs to be built,
 after all: `Build-bot: skip`. The build set is now `(android:skip ios:skip)`.
 Note that other platforms are still 'skip' but not included in the build set.
 
-Finally, the PR author pushes another commit, with `Build-bot: release windows`.
+Finally, the PR author pushes another commit, with `Build-bot: release:windows`.
 The build set is now: `(android:skip ios:skip windows:release)`.
 
+# FAQ
 
+* How do I specify commands for multiple platforms, e.g. building on Windows and Linux?
+
+```
+Build-bot: build:windows,linux
+```
+
+* If I modify a file that would cause a build on all platforms, does `Build-bot:
+  build android` then cause a build only on Android and skip all others? Or is
+  it only additive?
+
+The commands are additive. To skip all others, you would do:
+
+```
+Build-bot: skip
+Build-bot: build:android
+```
+
+* What happens in the following scenario: I have a PR that I only want to build
+  on Android and I add `Build-bot: build android`. Later on I merge in the
+  changes from `master` and add another commit. If I still only want to build on
+  Android, do I have to add `Build-bot: build android` on my new commit again?
+  Or what happens with merges that touch other files which would cause builds
+  for other platforms?
+
+First, you would need to specify `skip` for all other platforms in order to only
+build on Android:
+
+```
+Build-bot: skip
+Build-bot: build:android
+```
+
+Then, the build bot scans all the commits in the PR, and additively builds the
+final build set from the `Build-bot` commands from all the commits (up to 2000
+in one PR). Thus, earlier bot commands commits will continue to be honoured.
+This makes it easier to apply merge commits, for example, or small fixups,
+without needing to think about what needs to be built again.
+
+* How can I re-trigger builds after changing my build bot commands?
+
+In [TeamCity - Trigger Test Builds](https://build.palaso.org/buildConfiguration/Keyman_Test),
+select a custom Run (small button attached to right of Run button), and in the
+"Changes" tab, "Build branch" field, enter the PR number to re-run the builds.
+Any test builds currently running against that PR will be cancelled and
+restarted.
+
+Note: if you reduce the build set (with `skip`), and re-run builds in this way
+without pushing a new commit, you will end up with stale status checks on the
+latest commit in your PR for the builds that are now skipped on the new run, so
+in this scenario it is safest to push a new commit with the updated build bot
+commands.
 
 [Build Level]: #Build_Level
\ No newline at end of file
diff --git a/docs/builder.md b/docs/builder.md
index 18272accd0..538bf783bd 100644
--- a/docs/builder.md
+++ b/docs/builder.md
@@ -1,4 +1,7 @@
-# Using the build-utils.sh builder functions
+# Using the builder.inc.sh builder functions
+
+Note: see [resources/build/README.md](../resources/build/README.md) for
+distinction on builder-basic.inc.sh and builder-full.inc.sh.
 
 The Keyman repository is standardising on bash scripts for builds. These may
 call project-specific builders, such as `tsc` for Typescript projects, `meson`
@@ -43,7 +46,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/build-utils.sh"
+. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # . "$KEYMAN_ROOT/.../foo.inc.sh"     # any other includes, such as jq.inc.sh
@@ -78,7 +81,7 @@ Builder scripts will inherit `set -eu` from builder.inc.sh:
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/build-utils.sh"
+. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 ```
 
@@ -100,7 +103,7 @@ search-and-replace) this section in the future as required.
 
 ## Any other includes
 
-Once `build-utils.sh` has been included, the variable `$KEYMAN_ROOT` will be
+Once `builder-basic.inc.sh` has been included, the variable `$KEYMAN_ROOT` will be
 available, so other include scripts should be sourced accordingly, for example:
 
 ```bash
@@ -114,7 +117,7 @@ to `cd` at the start of your script.
 
 ## Standard environment
 
-`build-utils.sh` will prepend `$KEYMAN_ROOT/node_modules/.bin` to the `PATH`
+`builder-basic.inc.sh` will prepend `$KEYMAN_ROOT/node_modules/.bin` to the `PATH`
 variable to ensure that we run the correct versions of npm package commands, so
 there is no need to hard-code path references or add script wrappers to
 package.json (`npm run <script>`).
@@ -228,7 +231,7 @@ The first step in your script is to describe the available parameters, using
 
 ```bash
 builder_describe \
-  "Tests the build-utils.sh builder functions. This is merely an example." \
+  "Tests the builder-basic.inc.sh builder functions. This is merely an example." \
   clean \
   build \
   test \
@@ -266,7 +269,7 @@ for example:
 
 ```bash
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
@@ -1089,7 +1092,7 @@ longhand form.
   }
 
   builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-  builder_run_action configure    verify_npm_setup
+  builder_run_action configure    node_select_version_and_npm_ci
   builder_run_action build        do_build
 ```
 
@@ -1228,7 +1231,7 @@ fi
 
 --------------------------------------------------------------------------------
 
-## `builder_do_typescript_tests` function
+## `typescript_run_eslint_mocha_tests` function
 
 Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
 
@@ -1238,7 +1241,7 @@ be moved to builder.typescript.inc.sh in the future.
 ### Usage
 
 ```bash
-builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
+builder_run_action  test    typescript_run_eslint_mocha_tests [coverage_threshold]
 ```
 
 ### Parameters
diff --git a/ios/build.sh b/ios/build.sh
index f260b07f8b..fb4df58ed8 100755
--- a/ios/build.sh
+++ b/ios/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Builds Keyman Engine and the Keyman app for use on iOS devices - iPhone and iPad." \
   "@/resources/tools/check-markdown  test:help" \
diff --git a/ios/ci.sh b/ios/ci.sh
index fbcb46409f..03c1e11df8 100755
--- a/ios/ci.sh
+++ b/ios/ci.sh
@@ -3,17 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
 builder_describe "Defines actions for use in CI-related iOS builds." \
   "build" \
@@ -25,6 +19,8 @@ builder_describe "Defines actions for use in CI-related iOS builds." \
 
 builder_parse "$@"
 
+verify_on_mac
+
 function do_build() {
   ./build.sh                         clean configure build:engine build:app --sim-artifact
 
diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
index 524aecdfba..94dea1d5c7 100644
--- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
+++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
@@ -1363,7 +1363,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-tagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-tagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		CEC0C66F2410B005003E1BCD /* Run Script - upload dsyms to Sentry */ = {
@@ -1383,7 +1383,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n. \"$KEYMAN_ROOT/resources/build/xcode-utils.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  phaseSentryDsymUpload \"keyman-ios\"\nfi\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n. \"$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  phaseSentryDsymUpload \"keyman-ios\"\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/ios/engine/build.sh b/ios/engine/build.sh
index fd473a2cdf..a14287c0fd 100755
--- a/ios/engine/build.sh
+++ b/ios/engine/build.sh
@@ -3,16 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
 builder_describe "Builds Keyman Engine for use on iOS devices - iPhone and iPad." \
   "@/web/src/app/webview        build" \
   "@/web/src/engine/sentry-manager  build" \
@@ -23,6 +20,8 @@ builder_describe "Builds Keyman Engine for use on iOS devices - iPhone and iPad.
 
 builder_parse "$@"
 
+verify_on_mac
+
 CONFIG="Release"
 if builder_is_debug_build; then
   CONFIG="Debug"
@@ -50,7 +49,7 @@ XCODEFLAGS="-quiet -configuration $CONFIG"
 XCODEFLAGS_EXT="$XCODEFLAGS -derivedDataPath \"$DERIVED_DATA\" -workspace ../keymanios.xcworkspace"
 
 CODE_SIGN=
-if builder_is_debug_build; then
+if builder_is_debug_build || ( builder_is_ci_build && ! builder_is_ci_build_level_release ); then
   CODE_SIGN="CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO ${DEV_TEAM:-} CODE_SIGN_ENTITLEMENTS= CODE_SIGNING_ALLOWED=NO"
 fi
 
@@ -133,7 +132,9 @@ function build_engine() {
             KEYMAN_VERSION_ENVIRONMENT=$KEYMAN_VERSION_ENVIRONMENT \
             UPLOAD_SENTRY=$UPLOAD_SENTRY
 
-  assertDirExists "$KEYMAN_XCFRAMEWORK"
+  if ! [[ -d "${KEYMAN_XCFRAMEWORK}" ]]; then
+    builder_die "Build failed: directory '${KEYMAN_XCFRAMEWORK}' missing"
+  fi
 }
 
 builder_run_action clean         do_clean
diff --git a/ios/i18n-export.sh b/ios/i18n-export.sh
index 5ae87a6f97..aa41fd8b30 100755
--- a/ios/i18n-export.sh
+++ b/ios/i18n-export.sh
@@ -3,21 +3,17 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
 # This script runs from its own folder
 cd "$(dirname "$THIS_SCRIPT")"
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
 verify_on_mac
 
-## END STANDARD BUILD SCRIPT INCLUDE
-
-
 #xcodebuild -exportLocalizations -project "engine/KMEI/KeymanEngine.xcodeproj"
 #xcodebuild -exportLocalizations -project "keyman/Keyman/Keyman.xcodeproj"
 
diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
index 010674c7e0..7292a3f91d 100644
--- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
+++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
@@ -974,7 +974,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = ". \"$KEYMAN_ROOT/resources/build/xcode-utils.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  \"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/sentry-dsym-upload.sh\"\nfi\n";
+			shellScript = ". \"$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  \"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/sentry-dsym-upload.sh\"\nfi\n";
 		};
 		CE06AA671F161422006D91C3 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1006,7 +1006,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-and-settings-tagged.sh\"\necho \"script - set version complete\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-and-settings-tagged.sh\"\necho \"script - set version complete\"\n";
 			showEnvVarsInLog = 0;
 		};
 		CED3CFDA240E49DF001540A1 /* ShellScript */ = {
@@ -1024,7 +1024,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-untagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-untagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/ios/keyman/build.sh b/ios/keyman/build.sh
index cc43d42e60..5c6182a036 100755
--- a/ios/keyman/build.sh
+++ b/ios/keyman/build.sh
@@ -3,11 +3,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
 
 # Please note that this build script (understandably) assumes that it is running on Mac OS X.
@@ -92,7 +93,9 @@ function build_app() {
               KEYMAN_VERSION_ENVIRONMENT=$KEYMAN_VERSION_ENVIRONMENT \
               UPLOAD_SENTRY=$UPLOAD_SENTRY
 
-  assertDirExists "$ARCHIVE_PATH"
+  if ! [[ -d "${ARCHIVE_PATH}" ]]; then
+    builder_die "Build failed: directory '${ARCHIVE_PATH}' missing"
+  fi
 
   if ! builder_is_debug_build; then
     echo "Preparing .ipa file for deployment to real devices"
diff --git a/ios/samples/KMSample1/build.sh b/ios/samples/KMSample1/build.sh
index f7bb8798c7..c3bf1cc712 100755
--- a/ios/samples/KMSample1/build.sh
+++ b/ios/samples/KMSample1/build.sh
@@ -3,19 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
-source "${THIS_SCRIPT%/*}/../common.inc.sh"
+source "${THIS_SCRIPT_PATH}/../common.inc.sh"
 
 TARGET=KMSample1
 execute_sample_build "$@"
\ No newline at end of file
diff --git a/ios/samples/KMSample2/build.sh b/ios/samples/KMSample2/build.sh
index 0b0fdc542d..3b3f58ccfe 100755
--- a/ios/samples/KMSample2/build.sh
+++ b/ios/samples/KMSample2/build.sh
@@ -3,19 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
-source "${THIS_SCRIPT%/*}/../common.inc.sh"
+source "${THIS_SCRIPT_PATH}/../common.inc.sh"
 
 TARGET=KMSample2
 execute_sample_build "$@"
\ No newline at end of file
diff --git a/ios/samples/common.inc.sh b/ios/samples/common.inc.sh
index cbfc4796fd..131343ec8f 100755
--- a/ios/samples/common.inc.sh
+++ b/ios/samples/common.inc.sh
@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
-# This script is included by each sample build.sh.  Accordingly, it inherits build-utils.sh, etc
-# from the including script.
+# This script is included by each sample build.sh.  Accordingly, it inherits
+# builder-full.inc.sh from the including script.
+
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
 function do_build() {
   # Copy resources.
@@ -32,6 +36,8 @@ function execute_sample_build() {
 
   builder_parse "$@"
 
+  verify_on_mac
+
   local CONFIG=Release
   if builder_is_debug_build; then
     CONFIG="Debug"
diff --git a/ios/scripts/kme-universal.sh b/ios/scripts/kme-universal.sh
index ab61a5b7ce..7a70662e67 100755
--- a/ios/scripts/kme-universal.sh
+++ b/ios/scripts/kme-universal.sh
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
-set -u
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
+
 SCHEME_NAME="KeymanEngine"
 FRAMEWORK_NAME="KeymanEngine"
 
diff --git a/ios/test.sh b/ios/test.sh
index fbff357cdb..e93614f682 100755
--- a/ios/test.sh
+++ b/ios/test.sh
@@ -1,3 +1,17 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
+
+verify_on_mac
+
 if [ "$#" -ge 1 ]; then
   DEVICE=$1
 else
diff --git a/ios/tools/prepRelease.sh b/ios/tools/prepRelease.sh
index c9e47edd20..28adfbe1ff 100755
--- a/ios/tools/prepRelease.sh
+++ b/ios/tools/prepRelease.sh
@@ -12,7 +12,7 @@ set -e
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/zip.inc.sh"
@@ -27,7 +27,7 @@ fi
 
 #Include script dependency
 . $KEYMAN_ROOT/resources/build/history/history-utils.sh         #includes the following
-#. ../resources/shellHelperFunctions.sh
+#. ../resources/build/utils.inc.sh
 
 BUILD_NUMBER=`cat ../VERSION.md`
 KEYMAN_TIER=`cat ../TIER.md`
@@ -50,12 +50,10 @@ mkdir -p "${UPLOAD_DIR}"
 echo "Writing changelog to $CHANGELOG_PATH"
 get_version_notes "ios" "${BUILD_NUMBER}" "$KEYMAN_TIER" > $CHANGELOG_PATH
 echo "* Minor fixes and performance improvements" >> $CHANGELOG_PATH
-assertFileExists "${CHANGELOG_PATH}"
 
 # Strip emoji as App Store does not allow emoji in changelogs
 node "$KEYMAN_ROOT/resources/tools/strip-emoji" < "$CHANGELOG_PATH" > "$CHANGELOG_PATH.1"
 mv -f "$CHANGELOG_PATH.1" "$CHANGELOG_PATH"
-assertFileExists "${CHANGELOG_PATH}"
 
 #
 # Keyman Engine
diff --git a/linux/build.sh b/linux/build.sh
index ae5e5d3bd4..418c6d2fb2 100755
--- a/linux/build.sh
+++ b/linux/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/linux/ibus-keyman/build.sh b/linux/ibus-keyman/build.sh
index b3ec6be21a..a266aec740 100755
--- a/linux/ibus-keyman/build.sh
+++ b/linux/ibus-keyman/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/linux/ibus-keyman/meson.build b/linux/ibus-keyman/meson.build
index 3d0bbf0fce..f7a0eb7c7f 100644
--- a/linux/ibus-keyman/meson.build
+++ b/linux/ibus-keyman/meson.build
@@ -1,5 +1,6 @@
 project('ibus-keyman', 'c', 'cpp',
         version: files('../../VERSION.md'),
+        default_options: ['cpp_std=c++17'],
         license: 'GPL-2+',
         meson_version: '>=1.0')
 
diff --git a/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp b/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
index 1c2867778e..ca3f077afc 100644
--- a/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
+++ b/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
@@ -5,11 +5,9 @@
 #else
 #include <basu/sd-bus.h>
 #endif
+#include <km_linux_common.h>
 #include "KeymanSystemServiceClient.h"
 
-#define KEYMAN_BUS_NAME "com.keyman.SystemService1"
-#define KEYMAN_INTERFACE_NAME "com.keyman.SystemService1.System"
-#define KEYMAN_OBJECT_PATH "/com/keyman/SystemService1/System"
 
 extern gboolean testing;
 
diff --git a/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
index 80ae444185..50007e2b9e 100644
--- a/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
+++ b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
@@ -98,11 +98,9 @@ void KmDbusTestServer::Loop()
     return;
   }
 
-  guint exitFlag = FALSE;
-
   // Install the object
   ret = sd_bus_add_object_vtable(bus, NULL, KEYMAN_TESTSVC_OBJECT_PATH,
-    KEYMAN_TESTSVC_INTERFACE_NAME, test_service_vtable, &exitFlag);
+    KEYMAN_TESTSVC_INTERFACE_NAME, test_service_vtable, this);
   if (ret < 0) {
     g_error("Failed to issue method call: %s", strerror(-ret));
     return;
@@ -118,12 +116,12 @@ void KmDbusTestServer::Loop()
   for (;;) {
     // Process requests
     ret = sd_bus_process(bus, NULL);
-    g_debug("sd_bus_process returned %d, exitFlag=%d", ret, exitFlag);
+    g_debug("sd_bus_process returned %d, exitFlag=%d", ret, this->exitFlag);
     if (ret < 0) {
       g_error("Failed to process bus: %s", strerror(-ret));
       return;
     }
-    if (exitFlag) {
+    if (this->exitFlag) {
       // `exitFlag` can be modified by the callback function
       // `on_exit_method` which can be called by `sd_bus_process`
       g_debug("Exiting loop");
diff --git a/linux/ibus-keyman/tests/scripts/run-tests.sh b/linux/ibus-keyman/tests/scripts/run-tests.sh
index 1f26b39a41..c2b9d796df 100755
--- a/linux/ibus-keyman/tests/scripts/run-tests.sh
+++ b/linux/ibus-keyman/tests/scripts/run-tests.sh
@@ -1,20 +1,24 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2312
+
 set -eu
 
+# shellcheck disable=SC2034
 TOP_SRCDIR=${top_srcdir:-$(realpath "$(dirname "$0")/../..")}
-TESTBASEDIR=${XDG_DATA_HOME:-$HOME/.local/share}/keyman
+TESTBASEDIR=${XDG_DATA_HOME:-${HOME}/.local/share}/keyman
 TESTDIR=${TESTBASEDIR}/test_kmx
 CLEANUP_FILE=/tmp/ibus-keyman-test-cleanup
 PID_FILE=/tmp/ibus-keyman-test.pids
 ENV_FILE=/tmp/keyman-env.txt
 
+# shellcheck disable=SC1091
 . "$(dirname "$0")"/test-helper.inc.sh
 
 local_cleanup() {
-  cleanup "$CLEANUP_FILE"
+  cleanup "${CLEANUP_FILE}"
 }
 
-if [ -v KEYMAN_PKG_BUILD ]; then
+if [[ -v KEYMAN_PKG_BUILD ]]; then
   # During package builds we skip these tests that require to start ibus because
   # ibus requires to find /var/lib/dbus/machine-id or /etc/machine-id, otherwise it fails with:
   # "Bail out! IBUS-FATAL-WARNING: Unable to load /var/lib/dbus/machine-id: Failed to open file
@@ -23,7 +27,7 @@ if [ -v KEYMAN_PKG_BUILD ]; then
   exit 0
 fi
 
-if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null || ! which mutter > /dev/null; then
+if ! command -v Xvfb > /dev/null || ! command -v Xephyr > /dev/null || ! command -v metacity > /dev/null || ! command -v mutter > /dev/null; then
   echo "Please install Xvfb, Xephyr, metacity and mutter before running these tests!"
   echo "sudo apt install xvfb xserver-xephyr metacity mutter"
   exit 1
@@ -54,9 +58,9 @@ function run_tests() {
   DISPLAY_SERVER=$1
   shift
 
-  if [ -d "$(dirname "$0")/../../../build/$(arch)/debug" ]; then
+  if [[ -d "$(dirname "$0")/../../../build/$(arch)/debug" ]]; then
     CONFIG=debug
-  elif [ -d "$(dirname "$0")/../../../build/$(arch)/release" ]; then
+  elif [[ -d "$(dirname "$0")/../../../build/$(arch)/release" ]]; then
     CONFIG=release
   else
     echo "Cannot find ../../../build/$(arch)/debug or ../../../build/$(arch)/release"
@@ -74,19 +78,20 @@ function run_tests() {
   fi
   echo ""
 
-  if [ $# -gt 0 ]; then
+  if [[ $# -gt 0 ]]; then
     #shellcheck disable=SC2206
     TESTFILES=($@)
   else
-    pushd "$TESTDIR" > /dev/null || exit
+    pushd "${TESTDIR}" > /dev/null || exit
     TESTFILES=(*.kmx)
     popd > /dev/null || exit
   fi
 
   echo "# Starting tests..."
   # shellcheck disable=SC1090
-  source "$ENV_FILE"
-  echo "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
+  source "${ENV_FILE}"
+  # shellcheck disable=SC2154
+  echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}"
 
   if [[ -n ${REMOTE_DEBUG:-} ]]; then
     echo "===> Now attach debugger to ${REMOTE_HOST}"
@@ -97,10 +102,10 @@ function run_tests() {
   #shellcheck disable=SC2086
   ${REMOTE_DEBUG:-} "${G_TEST_BUILDDIR:-../../build/$(arch)/${CONFIG}/tests}/ibus-keyman-tests" ${ARG_K-} ${ARG_TAP-} \
     ${ARG_VERBOSE-} ${ARG_DEBUG-} ${ARG_SURROUNDING_TEXT-} ${ARG_NO_SURROUNDING_TEXT-} \
-    --directory "$TESTDIR" "${DISPLAY_SERVER}" ${TESTFILES[@]}
+    --directory "${TESTDIR}" "${DISPLAY_SERVER}" ${TESTFILES[@]}
   echo "# Finished tests."
 
-  cleanup "$CLEANUP_FILE"
+  cleanup "${CLEANUP_FILE}"
 }
 
 USE_WAYLAND=1
@@ -124,34 +129,34 @@ while (( $# )); do
   shift || (echo "Error: The last argument is missing a value. Exiting."; false) || exit 5
 done
 
-if ! can_run_wayland && [ "$USE_WAYLAND" == "0" ]; then
+if ! can_run_wayland && [[ "${USE_WAYLAND}" == "0" ]]; then
   # support for --headless got added in mutter 40.x
   echo "# WARNING: mutter doesn't support running headless. Skipping Wayland tests."
   USE_WAYLAND=0
-  if [ "$USE_X11" == "0" ]; then
+  if [[ "${USE_X11}" == "0" ]]; then
     echo "ERROR: no tests to run. Can't run Wayland tests, and --no-x11 is specified."
     exit 8
   fi
 fi
 
-if [ "$USE_WAYLAND" == "0" ] && [ "$USE_X11" == "0" ]; then
+if [[ "${USE_WAYLAND}" == "0" ]] && [[ "${USE_X11}" == "0" ]]; then
   echo "ERROR: I'll have to run somewhere. Specifying both --no-wayland and --no-x11 is not allowed."
   exit 6
 fi
 
 G_TEST_BUILDDIR="${G_TEST_BUILDDIR:-../../build/$(arch)/debug/tests}"
-if [ ! -f "${G_TEST_BUILDDIR}/ibus-keyman-tests" ]; then
+if [[ ! -f "${G_TEST_BUILDDIR}/ibus-keyman-tests" ]]; then
   G_TEST_BUILDDIR="${G_TEST_BUILDDIR:-../../build/$(arch)/release/tests}"
 fi
 
-echo > "$CLEANUP_FILE"
-echo > "$PID_FILE"
+echo > "${CLEANUP_FILE}"
+echo > "${PID_FILE}"
 trap local_cleanup EXIT SIGINT
 
-if [ "$USE_WAYLAND" == "1" ]; then
+if [[ "${USE_WAYLAND}" == "1" ]]; then
   run_tests --wayland "$@"
 fi
 
-if [ "$USE_X11" == "1" ]; then
+if [[ "${USE_X11}" == "1" ]]; then
   run_tests --x11 "$@"
 fi
diff --git a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
index e9732cc478..2a6b38be3d 100755
--- a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
+++ b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 function can_run_wayland() {
   local MUTTER_VERSION
@@ -13,9 +13,9 @@ function can_run_wayland() {
 function _generate_kmpjson() {
   local TESTDIR
   TESTDIR="$1"
-  pushd "$TESTDIR" > /dev/null || exit
+  pushd "${TESTDIR}" > /dev/null || exit
   KMPFILE="${TESTDIR}/kmp.json"
-  cat <<-EOF > "$KMPFILE"
+  cat <<-EOF > "${KMPFILE}"
   {
     "system": {
       "keymanDeveloperVersion": "10.0.1099.0",
@@ -36,33 +36,33 @@ function _generate_kmpjson() {
       }
 EOF
   for f in k_*.kmx; do
-    keyboard=$(basename "$f")
+    keyboard=$(basename "${f}")
     keyboard="${keyboard%.*}"
-    echo "      ," >> "$KMPFILE"
-    cat <<-EOF >> "$KMPFILE"
+    echo "      ," >> "${KMPFILE}"
+    cat <<-EOF >> "${KMPFILE}"
       {
-        "name": "$keyboard",
-        "description": "$keyboard"
+        "name": "${keyboard}",
+        "description": "${keyboard}"
       }
 EOF
   done
-  cat <<-EOF >> "$KMPFILE"
+  cat <<-EOF >> "${KMPFILE}"
     ],
     "keyboards": [
 EOF
   FIRST=true
   for f in k_*.kmx; do
-    keyboard=$(basename "$f")
+    keyboard=$(basename "${f}")
     keyboard="${keyboard%.*}"
-    if $FIRST; then
+    if ${FIRST}; then
       FIRST=false
     else
-      echo "    ," >> "$KMPFILE"
+      echo "    ," >> "${KMPFILE}"
     fi
-    cat <<-EOF >> "$KMPFILE"
+    cat <<-EOF >> "${KMPFILE}"
     {
-      "name": "$keyboard",
-      "id": "$keyboard",
+      "name": "${keyboard}",
+      "id": "${keyboard}",
       "version": "0.0",
       "languages": [
         {
@@ -73,8 +73,8 @@ EOF
     }
 EOF
   done
-  echo "  ]" >> "$KMPFILE"
-  echo "}" >> "$KMPFILE"
+  echo "  ]" >> "${KMPFILE}"
+  echo "}" >> "${KMPFILE}"
   popd > /dev/null || exit
 }
 
@@ -84,9 +84,9 @@ function _link_test_keyboards() {
   TESTBASEDIR=$3
 
   if [[ $(find "${KMX_TEST_DIR}/" -name k_\*.kmx 2>/dev/null | wc -l) -gt 0 ]]; then
-    mkdir -p "$(realpath --canonicalize-missing "$TESTBASEDIR")"
-    rm -f "$TESTDIR"
-    ln -sf "$(realpath "${KMX_TEST_DIR}")" "$TESTDIR"
+    mkdir -p "$(realpath --canonicalize-missing "${TESTBASEDIR}")"
+    rm -f "${TESTDIR}"
+    ln -sf "$(realpath "${KMX_TEST_DIR}")" "${TESTDIR}"
   else
     echo "Can't find test kmx files in ${KMX_TEST_DIR}"
     exit 3
@@ -99,31 +99,31 @@ function _setup_init() {
   CLEANUP_FILE=$2
   PID_FILE=$3
 
-  if [ -z "${TOP_SRCDIR:-}" ]; then
+  if [[ -z "${TOP_SRCDIR:-}" ]]; then
     TOP_SRCDIR=${G_TEST_SRCDIR:-$(realpath "$(dirname "$0")/..")}/..
   fi
-  if [ -z "${TOP_BINDIR:-}" ]; then
+  if [[ -z "${TOP_BINDIR:-}" ]]; then
     TOP_BINDIR=${G_TEST_BUILDDIR:-$(realpath "$(dirname "$0/..")")}/..
   fi
 
-  echo > "$ENV_FILE"
+  echo > "${ENV_FILE}"
 
-  if [ -f "$CLEANUP_FILE" ]; then
+  if [[ -f "${CLEANUP_FILE}" ]]; then
     # kill previous instances
-    "$(dirname "$0")"/teardown-tests.sh "$CLEANUP_FILE" || true
+    "$(dirname "$0")"/teardown-tests.sh "${CLEANUP_FILE}" || true
   fi
 
-  echo > "$CLEANUP_FILE"
-  echo > "$PID_FILE"
+  echo > "${CLEANUP_FILE}"
+  echo > "${PID_FILE}"
   TEMP_DATA_DIR=$(mktemp --directory)
   echo "rm -rf \"${TEMP_DATA_DIR}\" || true # TEMP_DATA_DIR" >> "${CLEANUP_FILE}"
 
   COMMON_ARCH_DIR=
-  [ -d "${TOP_SRCDIR}"/../../core/build/arch ] && COMMON_ARCH_DIR=${TOP_SRCDIR}/../../core/build/arch
+  [[ -d "${TOP_SRCDIR}"/../../core/build/arch ]] && COMMON_ARCH_DIR=${TOP_SRCDIR}/../../core/build/arch
 
-  if [ -d "${COMMON_ARCH_DIR}"/release ]; then
+  if [[ -d "${COMMON_ARCH_DIR}"/release ]]; then
     COMMON_ARCH_DIR=${COMMON_ARCH_DIR}/release
-  elif [ -d "${COMMON_ARCH_DIR}"/debug ]; then
+  elif [[ -d "${COMMON_ARCH_DIR}"/debug ]]; then
     COMMON_ARCH_DIR=${COMMON_ARCH_DIR}/debug
   else
     echo "Can't find neither ${COMMON_ARCH_DIR}/release nor ${COMMON_ARCH_DIR}/debug"
@@ -131,7 +131,7 @@ function _setup_init() {
   fi
 
   export LD_LIBRARY_PATH=${COMMON_ARCH_DIR}/src:${LD_LIBRARY_PATH-}
-  echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> "$ENV_FILE"
+  echo "export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> "${ENV_FILE}"
 }
 
 function _setup_test_dbus_server() {
@@ -143,12 +143,14 @@ function _setup_test_dbus_server() {
   "${TOP_BINDIR}/tests/dbus-test-server/km-dbus-test-server" &> /tmp/km-test-server.log &
   sleep 1
 
-  cat /tmp/km-test-server.env >> "$ENV_FILE"
-  cat /tmp/km-test-server.env >> "$CLEANUP_FILE"
-  echo "${TOP_BINDIR}/tests/dbus-test-server/stop-test-server" >> "$CLEANUP_FILE"
+  cat /tmp/km-test-server.env >> "${ENV_FILE}"
+  cat /tmp/km-test-server.env >> "${CLEANUP_FILE}"
+  echo "${TOP_BINDIR}/tests/dbus-test-server/stop-test-server" >> "${CLEANUP_FILE}"
 
+  # shellcheck disable=SC1091
   source /tmp/km-test-server.env
-  echo "# DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
+  # shellcheck disable=SC2154
+  echo "# DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}"
 }
 
 function _setup_display_server() {
@@ -158,7 +160,7 @@ function _setup_display_server() {
   PID_FILE=$3
   DISPLAY_SERVER=$4
 
-  if [ "$DISPLAY_SERVER" == "--wayland" ]; then
+  if [[ "${DISPLAY_SERVER}" == "--wayland" ]]; then
     if ! can_run_wayland; then
       # support for --headless got added in mutter 40.x
       echo "ERROR: mutter doesn't support running headless. Can't run Wayland tests."
@@ -168,49 +170,49 @@ function _setup_display_server() {
     echo "Starting mutter..."
     TMPFILE=$(mktemp)
     # mutter-Message: 18:56:15.422: Using Wayland display name 'wayland-1'
-    mutter --wayland --headless --no-x11 --virtual-monitor 1024x768 &> "$TMPFILE" &
+    mutter --wayland --headless --no-x11 --virtual-monitor 1024x768 &> "${TMPFILE}" &
     PID=$!
-    echo "kill -9 ${PID} || true # mutter" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # mutter" >> "${CLEANUP_FILE}"
     echo "${PID} mutter" >> "${PID_FILE}"
     sleep 1s
     export WAYLAND_DISPLAY
-    WAYLAND_DISPLAY=$(grep "Using Wayland display" "$TMPFILE" | cut -d"'" -f2)
-    rm "$TMPFILE"
-    echo "export WAYLAND_DISPLAY=\"$WAYLAND_DISPLAY\"" >> "$ENV_FILE"
+    WAYLAND_DISPLAY=$(grep "Using Wayland display" "${TMPFILE}" | cut -d"'" -f2)
+    rm "${TMPFILE}"
+    echo "export WAYLAND_DISPLAY=\"${WAYLAND_DISPLAY}\"" >> "${ENV_FILE}"
   else
     echo "Running on X11:"
     while true; do
       echo "Starting Xvfb..."
-      DISP_XVFB=$RANDOM
-      Xvfb -screen 0 1024x768x24 :${DISP_XVFB} &> /dev/null &
+      DISP_XVFB=${RANDOM}
+      Xvfb -screen 0 1024x768x24 ":${DISP_XVFB}" &> /dev/null &
       PID=$!
       sleep 1
-      if ps --no-headers --pid="$PID" > /dev/null; then
+      if ps --no-headers --pid="${PID}" > /dev/null; then
         break
       fi
     done
-    echo "kill -9 ${PID} || true # Xvfb" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # Xvfb" >> "${CLEANUP_FILE}"
     echo "${PID} Xvfb" >> "${PID_FILE}"
     while true; do
       echo "Starting Xephyr..."
-      DISP_XEPHYR=$RANDOM
-      DISPLAY=:${DISP_XVFB} Xephyr :${DISP_XEPHYR} -screen 1024x768 &> /dev/null &
+      DISP_XEPHYR=${RANDOM}
+      DISPLAY=:${DISP_XVFB} Xephyr ":${DISP_XEPHYR}" -screen 1024x768 &> /dev/null &
       PID=$!
       sleep 1
-      if ps --no-headers --pid="$PID" > /dev/null; then
+      if ps --no-headers --pid="${PID}" > /dev/null; then
         break
       fi
     done
-    echo "kill -9 ${PID} || true # Xephyr" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # Xephyr" >> "${CLEANUP_FILE}"
     echo "${PID} Xephyr" >> "${PID_FILE}"
     echo "Starting metacity"
-    metacity --display=:${DISP_XEPHYR} &> /dev/null &
+    metacity --display=":${DISP_XEPHYR}" &> /dev/null &
     PID=$!
-    echo "kill -9 ${PID} || true # metacity" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # metacity" >> "${CLEANUP_FILE}"
     echo "${PID} metacity" >> "${PID_FILE}"
 
     export DISPLAY=:${DISP_XEPHYR}
-    echo "export DISPLAY=\"$DISPLAY\"" >> "$ENV_FILE"
+    echo "export DISPLAY=\"${DISPLAY}\"" >> "${ENV_FILE}"
   fi
 }
 
@@ -219,23 +221,23 @@ function _setup_schema_and_gsettings() {
   ENV_FILE=$1
 
   # Install schema to temporary directory. This removes the build dependency on the keyman package.
-  SCHEMA_DIR=$TEMP_DATA_DIR/glib-2.0/schemas
-  export XDG_DATA_DIRS=$TEMP_DATA_DIR:${XDG_DATA_DIRS-}
-  echo "export XDG_DATA_DIRS=$XDG_DATA_DIRS" >> "$ENV_FILE"
+  SCHEMA_DIR=${TEMP_DATA_DIR}/glib-2.0/schemas
+  export XDG_DATA_DIRS=${TEMP_DATA_DIR}:${XDG_DATA_DIRS-}
+  echo "export XDG_DATA_DIRS=${XDG_DATA_DIRS}" >> "${ENV_FILE}"
 
   export GSETTINGS_SCHEMA_DIR=${SCHEMA_DIR}
-  echo "export GSETTINGS_SCHEMA_DIR=\"$SCHEMA_DIR\"" >> "$ENV_FILE"
+  echo "export GSETTINGS_SCHEMA_DIR=\"${SCHEMA_DIR}\"" >> "${ENV_FILE}"
 
-  mkdir -p "$SCHEMA_DIR"
-  cp "${TOP_SRCDIR}"/../keyman-config/resources/com.keyman.gschema.xml "$SCHEMA_DIR"/
-  glib-compile-schemas "$SCHEMA_DIR"
+  mkdir -p "${SCHEMA_DIR}"
+  cp "${TOP_SRCDIR}"/../keyman-config/resources/com.keyman.gschema.xml "${SCHEMA_DIR}"/
+  glib-compile-schemas "${SCHEMA_DIR}"
 
   # Ubuntu 18.04 Bionic doesn't have ibus-memconf, and glib is not compiled with the keyfile
   # backend enabled, so we just use the default backend. Otherwise we use the keyfile
   # store which interferes less when running on a dev machine.
-  if [ -f /usr/libexec/ibus-memconf ]; then
+  if [[ -f /usr/libexec/ibus-memconf ]]; then
     export GSETTINGS_BACKEND=keyfile
-    echo "export GSETTINGS_BACKEND=\"$GSETTINGS_BACKEND\"" >> "$ENV_FILE"
+    echo "export GSETTINGS_BACKEND=\"${GSETTINGS_BACKEND}\"" >> "${ENV_FILE}"
     IBUS_CONFIG=--config=/usr/libexec/ibus-memconf
   fi
 }
@@ -264,7 +266,7 @@ function _setup_ibus() {
   IBUS_ADDRESS=$(ibus address)
   export IBUS_ADDRESS
 
-  echo "export IBUS_ADDRESS=\"$IBUS_ADDRESS\"" >> "$ENV_FILE"
+  echo "export IBUS_ADDRESS=\"${IBUS_ADDRESS}\"" >> "${ENV_FILE}"
 
   echo "Starting ibus-engine-keyman..."
   #shellcheck disable=SC2086
@@ -285,12 +287,12 @@ function setup() {
 
   _setup_init "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}"
 
-  TESTBASEDIR=${XDG_DATA_HOME:-$HOME/.local/share}/keyman
+  TESTBASEDIR=${XDG_DATA_HOME:-${HOME}/.local/share}/keyman
   TESTDIR=${TESTBASEDIR}/test_kmx
 
-  _link_test_keyboards "${TOP_SRCDIR}/../../common/test/keyboards/baseline" "$TESTDIR" "$TESTBASEDIR"
+  _link_test_keyboards "${TOP_SRCDIR}/../../common/test/keyboards/baseline" "${TESTDIR}" "${TESTBASEDIR}"
 
-  _generate_kmpjson "$TESTDIR"
+  _generate_kmpjson "${TESTDIR}"
 
   _setup_test_dbus_server "${ENV_FILE}" "${CLEANUP_FILE}"
   _setup_display_server "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}" "${DISPLAY_SERVER}"
@@ -314,10 +316,10 @@ function cleanup() {
   local CLEANUP_FILE
   CLEANUP_FILE=$1
 
-  if [ -f "$CLEANUP_FILE" ]; then
+  if [[ -f "${CLEANUP_FILE}" ]]; then
     echo
     echo "# Shutting down processes..."
-    bash "$CLEANUP_FILE" # > /dev/null 2>&1
+    bash "${CLEANUP_FILE}" # > /dev/null 2>&1
     rm "$CLEANUP_FILE"
     echo "# Finished shutdown of processes."
   fi
@@ -333,7 +335,7 @@ function cleanup() {
 }
 
 function exit_on_package_build() {
-  if [ -v KEYMAN_PKG_BUILD ]; then
+  if [[ -v KEYMAN_PKG_BUILD ]]; then
     # Skip setup during package builds - can't run headless and we won't
     # run the other tests anyway
     exit 0
@@ -346,12 +348,12 @@ function _get_missing_processes() {
   MISSING_PROCS=""
 
   while read -r LINE; do
-    if [ -z "$LINE" ]; then
+    if [[ -z "${LINE}" ]]; then
       continue
     fi
-    PID=$(echo "$LINE" | cut -d' ' -f1)
-    if ! ps --no-headers --pid="$PID" > /dev/null; then
-      MISSING_PROCS="${MISSING_PROCS}    $(echo "$LINE" | cut -d' ' -f2)"
+    PID=$(echo "${LINE}" | cut -d' ' -f1)
+    if ! ps --no-headers --pid="${PID}" > /dev/null; then
+      MISSING_PROCS="${MISSING_PROCS}    $(echo "${LINE}" | cut -d' ' -f2)"
       break
     fi
   done < "${PID_FILE}"
@@ -364,19 +366,19 @@ function check_processes_running() {
   CLEANUP_FILE=$3
   PID_FILE=$4
   TEST_NAME=$5
-  MISSING_PROCS=$(_get_missing_processes "$PID_FILE")
+  MISSING_PROCS=$(_get_missing_processes "${PID_FILE}")
 
-  if [ "$MISSING_PROCS" != "" ]; then
+  if [[ "${MISSING_PROCS}" != "" ]]; then
     echo "# Some background processes no longer running. Restarting..."
     { echo "Some background processes no longer running (running ${TEST_NAME}):" ; \
-      echo "$MISSING_PROCS" ; \
+      echo "${MISSING_PROCS}" ; \
       echo "Restarting..." ; } >> /tmp/debug.output
     mv /tmp/ibus-engine-keyman.log{,"-${TEST_NAME}-$(date -Iseconds)"}
     cleanup "${CLEANUP_FILE}" > /dev/null 2>&1
     setup "${DISPLAY_SERVER}" "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}" > /dev/null 2>&1
   fi
 
-  if [ "$(_get_missing_processes "$PID_FILE")" != "" ]; then
+  if [[ "$(_get_missing_processes "$PID_FILE")" != "" ]]; then
     echo "# WARNING: Expected background processes are still missing after restart: ${MISSING_PROCS}"
     echo "# Maybe an old process is still running?"
   fi
diff --git a/linux/include/km_linux_common.h b/linux/include/km_linux_common.h
index 374ae01251..65204d9ccf 100644
--- a/linux/include/km_linux_common.h
+++ b/linux/include/km_linux_common.h
@@ -4,4 +4,8 @@
 
 #define KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL 194  // 0xC2
 
+#define KEYMAN_BUS_NAME "com.keyman.SystemService1"
+#define KEYMAN_INTERFACE_NAME "com.keyman.SystemService1.System"
+#define KEYMAN_OBJECT_PATH "/com/keyman/SystemService1/System"
+
 #endif // __KM_LINUX_COMMON_H__
diff --git a/linux/keyman-config/build.sh b/linux/keyman-config/build.sh
index 8da21f35ce..32383ac83d 100755
--- a/linux/keyman-config/build.sh
+++ b/linux/keyman-config/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/linux/keyman-system-service/build.sh b/linux/keyman-system-service/build.sh
index c673907882..9949fb1531 100755
--- a/linux/keyman-system-service/build.sh
+++ b/linux/keyman-system-service/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/linux/keyman-system-service/meson.build b/linux/keyman-system-service/meson.build
index b6f16e82f8..6f950ba59f 100644
--- a/linux/keyman-system-service/meson.build
+++ b/linux/keyman-system-service/meson.build
@@ -1,5 +1,6 @@
 project('keyman-system-service', 'c', 'cpp',
         version: files('../../VERSION.md'),
+        default_options: ['cpp_std=c++17'],
         license: 'MIT',
         meson_version: '>=1.0')
 
diff --git a/linux/keyman-system-service/src/KeymanSystemService.cpp b/linux/keyman-system-service/src/KeymanSystemService.cpp
index f226ff2b2f..88cfa09ffa 100644
--- a/linux/keyman-system-service/src/KeymanSystemService.cpp
+++ b/linux/keyman-system-service/src/KeymanSystemService.cpp
@@ -17,12 +17,10 @@
 #else
 #include <basu/sd-bus.h>
 #endif
+#include <km_linux_common.h>
 #include "KeymanSystemService.h"
 #include "KeyboardDevice.h"
 
-#define KEYMAN_BUS_NAME "com.keyman.SystemService1"
-#define KEYMAN_INTERFACE_NAME "com.keyman.SystemService1.System"
-#define KEYMAN_OBJECT_PATH "/com/keyman/SystemService1/System"
 
 using namespace std;
 
diff --git a/linux/keyman-system-service/tests/README.md b/linux/keyman-system-service/tests/README.md
index af77363b65..477a776c63 100644
--- a/linux/keyman-system-service/tests/README.md
+++ b/linux/keyman-system-service/tests/README.md
@@ -9,3 +9,11 @@ keyman-system-service. The differences are:
 
 The keyman-test-service gets called/used by the ibus-keyman integration
 tests.
+
+This test service goes hand in hand with `linux/ibus-keyman/tests/dbus-test-server`:
+during test setup the dbus-test-server gets started (and registers its
+class), but also adds our `services` subdir (`linux/keyman-system-service/tests/services`)
+to the list of directories to be searched for services.
+
+When during the test `ibus-engine-keyman` calls a method on
+`keyman-test-service` it will be started by dbus.
diff --git a/linux/mcompile/keymap/build.sh b/linux/mcompile/keymap/build.sh
index d7c6aac34f..e969d0d025 100755
--- a/linux/mcompile/keymap/build.sh
+++ b/linux/mcompile/keymap/build.sh
@@ -3,11 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 . "${THIS_SCRIPT%/*}/../../../resources/build/meson-utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-#. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+#. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/linux/mcompile/keymap/meson.build b/linux/mcompile/keymap/meson.build
index b6d489902c..af9c84017e 100644
--- a/linux/mcompile/keymap/meson.build
+++ b/linux/mcompile/keymap/meson.build
@@ -1,6 +1,7 @@
 project(
   'mcompile', 'c', 'cpp',
   version: files('../../../VERSION.md'),
+  default_options: ['cpp_std=c++17'],
   license: 'MIT',
   meson_version: '>=1.0',
 )
diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
index bc5cca2730..97f069377b 100755
--- a/linux/scripts/deb-packaging.sh
+++ b/linux/scripts/deb-packaging.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2154 # (variables are set in build-utils.sh)
+# shellcheck disable=SC2154 # (variables are set in builder-basic.inc.sh)
 # Actions for creating a Debian source package and verifying the API.
 # Used by deb-packaging.yml and api-verification.yml GHAs.
 
@@ -9,7 +9,7 @@ shopt -s inherit_errexit
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/linux/scripts/verify_api.inc.sh"
diff --git a/linux/scripts/debian.sh b/linux/scripts/debian.sh
index 3a896c10b2..6c8314ee10 100755
--- a/linux/scripts/debian.sh
+++ b/linux/scripts/debian.sh
@@ -16,7 +16,7 @@ set -e
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . $(dirname "$THIS_SCRIPT")/package-build.inc.sh
diff --git a/linux/scripts/dist.sh b/linux/scripts/dist.sh
index a0d6cd7f21..f1580c99cd 100755
--- a/linux/scripts/dist.sh
+++ b/linux/scripts/dist.sh
@@ -12,7 +12,7 @@ set -e
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 BASEDIR=$(pwd)
diff --git a/linux/scripts/launchpad.sh b/linux/scripts/launchpad.sh
index 2e50922309..47e0144595 100755
--- a/linux/scripts/launchpad.sh
+++ b/linux/scripts/launchpad.sh
@@ -15,8 +15,8 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-# shellcheck source=resources/build/build-utils.sh
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+# shellcheck source=resources/build/builder-basic.inc.sh
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck source=linux/scripts/package-build.inc.sh
diff --git a/linux/scripts/reconf.sh b/linux/scripts/reconf.sh
index d6d2c3891c..a6b7f1f5a0 100755
--- a/linux/scripts/reconf.sh
+++ b/linux/scripts/reconf.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 BASEDIR="$KEYMAN_ROOT/linux"
diff --git a/linux/scripts/test/deb-packaging.tests.sh b/linux/scripts/test/deb-packaging.tests.sh
index 8da8fd8ec8..c3cd751e5c 100755
--- a/linux/scripts/test/deb-packaging.tests.sh
+++ b/linux/scripts/test/deb-packaging.tests.sh
@@ -4,7 +4,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT%/*}/test.inc.sh"
diff --git a/linux/scripts/test/verify_api.tests.sh b/linux/scripts/test/verify_api.tests.sh
index 05f60cea83..d3095ae150 100755
--- a/linux/scripts/test/verify_api.tests.sh
+++ b/linux/scripts/test/verify_api.tests.sh
@@ -6,7 +6,7 @@ shopt -s inherit_errexit
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT%/*}/test.inc.sh"
diff --git a/linux/scripts/upload-to-debian.sh b/linux/scripts/upload-to-debian.sh
index 3b2c5ba1dd..50a1831830 100755
--- a/linux/scripts/upload-to-debian.sh
+++ b/linux/scripts/upload-to-debian.sh
@@ -33,10 +33,10 @@ END
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 NOOP=
 PUSH=
diff --git a/linux/scripts/verify_api.inc.sh b/linux/scripts/verify_api.inc.sh
index 0caaa6d23f..843a7ea350 100644
--- a/linux/scripts/verify_api.inc.sh
+++ b/linux/scripts/verify_api.inc.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2154 # (variables are set in build-utils.sh)
+# shellcheck disable=SC2154 # (variables are set in builder-basic.inc.sh)
 
 output_log() {
   echo "$1" >&2
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings b/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings
index 5251447fa7..5813350d75 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings
+++ b/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings
@@ -71,7 +71,7 @@
 "privacy-alert-text" = "Para funcionar correctamente, Keyman requiere las siguientes características de accesibilidad:\nel acceso en Preferencias del Sistema, Seguridad y Privacidad.\nel reinicio del sistema.";
 
 /* message displayed to alert user to grant accessibility permission in Settings, for macOS Ventura and later */
-"privacy-alert-text-ventura" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Settings, Privacy & Security.\nRestart your system.";
+"privacy-alert-text-ventura" = "Para funcionar correctamente, Keyman requiere características de accesibilidad:\n\nConceder acceso en la configuración del sistema, privacidad y seguridad.\nReinicie su sistema.";
 
 /* Text of menu item in Input Menu when no Keyboards are configured -- include parentheses  */
 "no-keyboard-configured-menu-placeholder" = "(Sin teclado configurado)";
diff --git a/mac/Keyman4MacIM/make-km-dmg.sh b/mac/Keyman4MacIM/make-km-dmg.sh
index 21559b59ff..0ee1d7395b 100755
--- a/mac/Keyman4MacIM/make-km-dmg.sh
+++ b/mac/Keyman4MacIM/make-km-dmg.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Please note that this build script (understandably) assumes that it is running on Mac OS X.
@@ -46,7 +46,7 @@ cd `dirname ${KEYMAN_MACIM_BASE_PATH}` > /dev/null
 KEYMAN_MACIM_BASE_PATH=`pwd`;
 popd  > /dev/null
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 KM_APP_NAME="Install Keyman.app"
 OUTPUT_DIR="$KEYMAN_MACIM_BASE_PATH/output"
@@ -141,14 +141,14 @@ fi
 
 # Step 1 - Copy template to working copy to prevent unintended changes
 WORKING_COPY_OF_IMAGE="$OUTPUT_DIR/Keyman-temp-$KEYMAN_VERSION.dmg"
-displayInfo "Copying \"$TEMPLATE_IMAGE\" to \"$WORKING_COPY_OF_IMAGE\"..."
+builder_echo info "Copying \"$TEMPLATE_IMAGE\" to \"$WORKING_COPY_OF_IMAGE\"..."
 if [[ -e "$WORKING_COPY_OF_IMAGE" && "$VERBOSITY" != "-quiet" ]] ; then
     builder_warn "Overwriting: $WORKING_COPY_OF_IMAGE"
 fi
 cp -f "$TEMPLATE_IMAGE" "$WORKING_COPY_OF_IMAGE"
 
 # Step 2 - Mount (copy of) template image - writeable
-displayInfo "Attaching \"$WORKING_COPY_OF_IMAGE\"" "Mounting as \"$STAGING_DIR\"..."
+builder_echo info "Attaching \"$WORKING_COPY_OF_IMAGE\"" "Mounting as \"$STAGING_DIR\"..."
 if [[ -e "$STAGING_DIR" ]]; then
     builder_die "Mount folder $STAGING_DIR is already present. Unmount it first."
 fi
@@ -170,7 +170,7 @@ ls -la "$STAGING_DIR/background"
 echo "---- End Listing ----"
 
 # Step 3 - Replace existing application files with new version
-displayInfo "Copying files from \"$SOURCE_KM_APP\"..."
+builder_echo info "Copying files from \"$SOURCE_KM_APP\"..."
 find "$DEST_KM_APP" -mindepth 1 -maxdepth 1
 echo "---------"
 find "$DEST_KM_APP" -mindepth 1 -maxdepth 1 -print0 | xargs -0 rm -rf
@@ -184,7 +184,7 @@ ls -la "$STAGING_DIR/background"
 echo "---- End Listing ----"
 
 # Step 4 - Detach/unmount the temporary image/staging area
-displayInfo "Detaching \"$WORKING_COPY_OF_IMAGE\""
+builder_echo info "Detaching \"$WORKING_COPY_OF_IMAGE\""
 
 # Attempt to detach 10 times, waiting 5 seconds each time
 # because macOS may still be working in the folder in the
@@ -213,7 +213,7 @@ fi
 
 # Step 5 - Convert image to a compressed readonly DMG image
 DMG_FILE_PATH="$DEST_DIR/keyman-$KEYMAN_VERSION.dmg"
-displayInfo "Converting/compressing image to create \"$DMG_FILE_PATH\""
+builder_echo info "Converting/compressing image to create \"$DMG_FILE_PATH\""
 if [[ -e "$DMG_FILE_PATH" ]] ; then
     if [[ "$VERBOSITY" != "-quiet" ]] ; then
         builder_warn "Overwriting: $DMG_FILE_PATH"
@@ -226,8 +226,8 @@ if ! [[ $? == 0 && -f "$DMG_FILE_PATH" ]]; then
 fi
 
 # Step 6 - Clean up
-displayInfo "Cleaning up..."
+builder_echo info "Cleaning up..."
 rm "$WORKING_COPY_OF_IMAGE"
 
-displayInfo "Make DMG completed successfully."
+builder_echo info "Make DMG completed successfully."
 exit 0
diff --git a/mac/build.sh b/mac/build.sh
index 6bd91d73a5..cff2b22b84 100755
--- a/mac/build.sh
+++ b/mac/build.sh
@@ -2,12 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
-. "$KEYMAN_ROOT/mac/mac-utils.inc.sh"
 
 builder_describe "Builds Keyman for macOS." \
   "@/core:mac" \
@@ -27,6 +27,8 @@ builder_describe "Builds Keyman for macOS." \
 
 builder_parse "$@"
 
+verify_on_mac
+
 # Default is release build of Engine and (code-signed) Input Method
 if builder_is_debug_build; then
   CONFIG="Debug"
@@ -102,7 +104,7 @@ execBuildCommand() {
     shift
     declare -r cmnd="$*"
 
-    displayInfo "Building $component:" "$cmnd"
+    builder_echo heading "Building $component:" "$cmnd"
     set +e
     local ret_code=0
     eval "$cmnd" || ret_code=$?
@@ -276,7 +278,7 @@ do_install() {
 
   builder_heading "Attempting local deployment with command:"
   KM4MIM_APP_BASE_PATH="$KM4MIM_BASE_PATH/build/$CONFIG"
-  displayInfo "$KM4MIM_BASE_PATH/localdeploy.sh \"$KM4MIM_APP_BASE_PATH\""
+  builder_echo info "$KM4MIM_BASE_PATH/localdeploy.sh \"$KM4MIM_APP_BASE_PATH\""
   "$KM4MIM_BASE_PATH/localdeploy.sh" "$KM4MIM_APP_BASE_PATH"
 }
 
diff --git a/mac/is_same_version.sh b/mac/is_same_version.sh
index da9daf1610..d8c3441a6e 100755
--- a/mac/is_same_version.sh
+++ b/mac/is_same_version.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# TODO: this is currently a no-op. Eliminate or fix.
+
 # compares the version of this branch (in ../VERSION.md) to the
 #	version in the Xcode project file of the subproject named in $1
 # returns zero if they are the same, non-zero if not the same or a problem occurs
@@ -7,7 +9,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #TODO:
diff --git a/mac/mac-utils.inc.sh b/mac/mac-utils.inc.sh
deleted file mode 100644
index a9d814d247..0000000000
--- a/mac/mac-utils.inc.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-
-if [ -z "${DEVELOPMENT_TEAM+x}" ]; then
-    DEVELOPMENT_TEAM=3YE4W86L3G
-fi
-
-function mac_notarize() {
-  local TARGET_PATH="$1"
-  local TARGET_FILE="$2"
-
-  local NOTARYTOOL_LOG_PATH="$TARGET_PATH/notarytool.log"
-
-  xcrun notarytool submit \
-      --apple-id "$APPSTORECONNECT_USERNAME" \
-      --team-id "$DEVELOPMENT_TEAM" \
-      --password "$APPSTORECONNECT_PASSWORD" \
-      --output-format json \
-      --wait \
-      "$TARGET_FILE" > "$NOTARYTOOL_LOG_PATH"
-  # notarytool output: {"status":"Accepted","id":"ca62bba0-6c49-43c2-90d8-83a8ef306e0f","message":"Processing complete"}
-
-  cat "$NOTARYTOOL_LOG_PATH"
-  local NOTARYTOOL_STATUS=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .status`
-  local NOTARYTOOL_SUBMISSION_ID=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .id`
-  if [[ "$NOTARYTOOL_STATUS" != Accepted ]]; then
-      # We won't assume notarytool returns an error code if status != Accepted
-      builder_die "Notarization failed with $NOTARYTOOL_STATUS"
-  fi
-
-  builder_heading "Notarization completed successfully. Review logs below for any warnings."
-
-  xcrun notarytool log \
-        --apple-id "$APPSTORECONNECT_USERNAME" \
-        --team-id "$DEVELOPMENT_TEAM" \
-        --password "$APPSTORECONNECT_PASSWORD" \
-        "$NOTARYTOOL_SUBMISSION_ID"
-
-  rm -f "$NOTARYTOOL_LOG_PATH"
-}
-
-execCodeSign() {
-  # Allow the signing to fail up to 5 times (network transient error on timestamping)
-  local ret_code=0
-  local count=0
-  local method="$1"
-  shift
-  if [[ "$method" == direct ]]; then
-    method=
-  fi
-  while (( count <  5 )); do
-    $method codesign "$@" || ret_code=$?
-    if [ $ret_code == 0 ]; then
-      return 0
-    fi
-    (( count++ ))
-    builder_echo "codesign attempt $count failed with error $ret_code"
-    sleep 5
-  done
-
-  builder_echo "*** codesign parameters: $@"
-  builder_die "Unable to sign component after 5 attempts (exit code $ret_code)"
-}
diff --git a/mac/mcompile/build.sh b/mac/mcompile/build.sh
index c689cd7a39..76571ffa18 100755
--- a/mac/mcompile/build.sh
+++ b/mac/mcompile/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 . "${THIS_SCRIPT%/*}/../../resources/build/meson-utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
diff --git a/mac/mcompile/meson.build b/mac/mcompile/meson.build
index 2429799442..6a156752ab 100644
--- a/mac/mcompile/meson.build
+++ b/mac/mcompile/meson.build
@@ -1,5 +1,6 @@
 project('mcompile', 'c', 'cpp',
         version: files('../../VERSION.md'),
+        default_options: ['cpp_std=c++17'],
         license: 'MIT',
         meson_version: '>=1.0')
 
diff --git a/mac/setup/build.sh b/mac/setup/build.sh
index af39660b6a..f8c161c08a 100755
--- a/mac/setup/build.sh
+++ b/mac/setup/build.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-. "$KEYMAN_ROOT/mac/mac-utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
 verify_on_mac
 
 cd "${THIS_SCRIPT_PATH}"
diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index c384a70b32..d165e31da3 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -7,6 +7,12 @@ plugins {
 ext.rootPath = '../../../../android'
 apply from: "$rootPath/version.gradle"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 35
     namespace="com.firstvoices.keyboards"
diff --git a/oem/firstvoices/android/build.sh b/oem/firstvoices/android/build.sh
index 2e10dd5b83..f571c8209b 100755
--- a/oem/firstvoices/android/build.sh
+++ b/oem/firstvoices/android/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
diff --git a/oem/firstvoices/common/build_csv_languages.sh b/oem/firstvoices/common/build_csv_languages.sh
index 19e6ba06ed..dc33056f79 100755
--- a/oem/firstvoices/common/build_csv_languages.sh
+++ b/oem/firstvoices/common/build_csv_languages.sh
@@ -11,7 +11,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
diff --git a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
index 7546e31557..1242db1b8f 100644
--- a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
+++ b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
@@ -440,7 +440,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-untagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-untagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		37DF007C24595F6F00C73128 /* Run Script */ = {
@@ -459,7 +459,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-and-settings-untagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-and-settings-untagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		9800EC5D1C029FCD00BF0FB5 /* ShellScript */ = {
diff --git a/oem/firstvoices/ios/build.sh b/oem/firstvoices/ios/build.sh
index 1b13248f98..18fe62ef44 100755
--- a/oem/firstvoices/ios/build.sh
+++ b/oem/firstvoices/ios/build.sh
@@ -4,18 +4,15 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
 # ################################ Main script ################################
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
 export TARGET=FirstVoices
 
 builder_describe "Builds the $TARGET app for use on iOS devices - iPhone and iPad." \
@@ -27,6 +24,8 @@ builder_describe "Builds the $TARGET app for use on iOS devices - iPhone and iPa
 
 builder_parse "$@"
 
+verify_on_mac
+
 KMEI_BUILD_DIR="$KEYMAN_ROOT/ios/build"
 DERIVED_DATA="$THIS_SCRIPT_PATH/build"
 
@@ -109,8 +108,9 @@ function do_build() {
             KEYMAN_VERSION=$KEYMAN_VERSION \
             KEYMAN_VERSION_WITH_TAG=$KEYMAN_VERSION_WITH_TAG
 
-    assertDirExists "$ARCHIVE_PATH"
-
+    if ! [[ -d "${ARCHIVE_PATH}" ]]; then
+      builder_die "Build failed: directory '${ARCHIVE_PATH}' missing"
+    fi
 
     # Do NOT use the _EXT variant here; there's no scheme to ref, which will lead
     # Xcode to generate a build error.
diff --git a/oem/firstvoices/windows/src/inst/build.sh b/oem/firstvoices/windows/src/inst/build.sh
index 0d0767ae66..c264fcbc83 100755
--- a/oem/firstvoices/windows/src/inst/build.sh
+++ b/oem/firstvoices/windows/src/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 source "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
 builder_describe "Installation files for FirstVoices Keyboards" \
diff --git a/package-lock.json b/package-lock.json
index 5262663a45..91bbb1d165 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1153,7 +1153,7 @@
         "@sentry/node": "^7.57.0",
         "chalk": "^4.1.2",
         "express": "^4.20.0",
-        "multer": "^2.0.1",
+        "multer": "^2.0.2",
         "ngrok": "^5.0.0-beta.2",
         "open": "^8.4.0",
         "restructure": "^3.0.1",
@@ -5053,7 +5053,9 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5342,6 +5344,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -6259,6 +6274,20 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "dev": true,
@@ -6396,12 +6425,10 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -6420,15 +6447,29 @@
       "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==",
       "dev": true
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "dev": true,
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7892,13 +7933,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -8038,15 +8082,21 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8055,6 +8105,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "license": "MIT",
@@ -8297,11 +8360,12 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8383,6 +8447,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -8391,9 +8456,10 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8402,12 +8468,13 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9876,6 +9943,15 @@
       "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
       "dev": true
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "license": "MIT",
@@ -10197,9 +10273,9 @@
       }
     },
     "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10493,9 +10569,9 @@
       "license": "MIT"
     },
     "node_modules/multer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
-      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
+      "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
diff --git a/resources/build.sh b/resources/build.sh
index 48be50fa96..432cd8c9eb 100755
--- a/resources/build.sh
+++ b/resources/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman resources module" clean configure build test
diff --git a/resources/build/README.md b/resources/build/README.md
index 6a9271a5e4..1a03fbda34 100644
--- a/resources/build/README.md
+++ b/resources/build/README.md
@@ -12,9 +12,22 @@ including this file...
 
 ## Various tools
 
-### build-utils.sh, builder.inc.sh
+### builder-basic.inc.sh, builder-full.inc.sh
 
-See [builder.md](../../docs/builder.md)
+There are two wrappers for builder.inc.sh:
+
+* resources/build/builder-basic.inc.sh - Keyman-specific builder-based script
+  that also sets version environment,  repo base path, and other environment
+  variables
+* resources/build/builder-full.inc.sh - Keyman-specific builder-based script,
+  calls builder-basic.inc.sh, sets cwd to script path, and on exit verifies that
+  builder functions were used appropriately.
+
+All build.sh scripts should use builder-full.inc.sh. Some helper scripts may
+use builder-basic.inc.sh. No scripts in this repo (apart from tests) should
+use builder.inc.sh directly.
+
+builder.inc.sh is documented in [builder.md](../../docs/builder.md)
 
 ### jq/jq-win64
 
diff --git a/resources/build/build-utils-ci.inc.sh b/resources/build/build-utils-ci.inc.sh
index bd9fc7995b..33c074037a 100644
--- a/resources/build/build-utils-ci.inc.sh
+++ b/resources/build/build-utils-ci.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 #
 # This script gets CI / pull request details for builds, part of the build-utils
 # builder_ suite of functions. All functions and variables in this file have the
diff --git a/resources/build/build-utils-ci.test.sh b/resources/build/build-utils-ci.test.sh
index 8251156d27..a4d79e5d5a 100755
--- a/resources/build/build-utils-ci.test.sh
+++ b/resources/build/build-utils-ci.test.sh
@@ -8,11 +8,11 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # Tests
 
diff --git a/resources/build/build-utils.sh b/resources/build/build-utils.sh
index 003129aaad..0d735b0add 100755
--- a/resources/build/build-utils.sh
+++ b/resources/build/build-utils.sh
@@ -1,389 +1,6 @@
 #!/usr/bin/env bash
-#
-# This script sets build environment variables. KEYMAN_VERSION vars are also exported:
-#   KEYMAN_VERSION:          Full current build version, e.g. "14.0.1"
-#   KEYMAN_VERSION_WIN:      Full current build version for Windows, e.g. "14.0.1.0"
-#   KEYMAN_VERSION_RELEASE:  Current release version, e.g. "14.0"
-#   KEYMAN_VERSION_MAJOR:    Major version, e.g. "14"
-#   KEYMAN_VERSION_MINOR:    Minor version, e.g. "0"
-#   KEYMAN_VERSION_PATCH:    Patch version, e.g. "1"
-#   KEYMAN_TIER:             Current tier, one of "alpha", "beta" or "stable"
-#   KEYMAN_VERSION_TAG:      Tier + Pull Request + Location of build [-alpha|-beta][-test[-1234]][-local]
-#   KEYMAN_VERSION_WITH_TAG: e.g. "14.0.1-alpha-test-1234" or "14.0.5-beta-local" or "14.0.1-alpha-test"
-#   KEYMAN_VERSION_GIT_TAG:  Git tag for the release, "release@$KEYMAN_VERSION_WITH_TAG", e.g. "release@14.0.1-alpha-test-1234"
-#   KEYMAN_ROOT:      fully resolved root path of Keyman repository
-#   KEYMAN_VERSION_ENVIRONMENT: One of: local, test, alpha, beta, stable
-#   UPLOAD_SENTRY:    true - if KEYMAN_VERSION_ENVIRONMENT is one of alpha, beta, stable
-#                     false - if local, test.  Indicates if debug artifacts should be uploaded to Sentry
-#   BUILDER_OS:       win|mac|linux -- current build environment
-#
-# On macOS, this script requires coreutils (`brew install coreutils`)
-#
-# Here is how to include this script reliably, cross-platform:
-#    ## START STANDARD BUILD SCRIPT INCLUDE
-#    # adjust relative paths as necessary
-#    THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-#    . "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
-#    # END STANDARD BUILD SCRIPT INCLUDE
-#
-# Note: keep changes to version, tier and tag determination in sync with mkver (windows/src/buildutils/mkver)
-#
 
-# Note: set -eu and SHLVL are deliberately set both here and in builder.inc.sh,
-#       because we want them set as early as possible, and because
-#       builder.inc.sh is shared to other repos, this keeps the usage consistent
-#       there as well.
-
-# Exit on command failure and when using unset variables:
-set -eu
-
-#
-# Prevents 'clear' on exit of mingw64 bash shell
-#
-SHLVL=0
-
-function findKeymanRoot() {
-  # We don't need readlink here because our standard script prolog does a
-  # readlink -f already so we will have already escaped from any symlinks but we
-  # still need to canonicalize paths to remove ../../..
-  #
-  # We only want to set KEYMAN_ROOT if it isn't already set and readonly
-  # (https://stackoverflow.com/a/4441178/1836776)
-  if (unset KEYMAN_ROOT 2>/dev/null); then
-    KEYMAN_ROOT="${BASH_SOURCE[0]%/*/*/*}"
-    KEYMAN_ROOT="$( cd "$KEYMAN_ROOT" && echo "$PWD" )"
-    readonly KEYMAN_ROOT
-  fi
-}
-
-function findVersion() {
-    local KEYMAN_VERSION_MD="$KEYMAN_ROOT/VERSION.md"
-    KEYMAN_VERSION=$(builder_trim $(<"$KEYMAN_VERSION_MD"))
-    [[ "$KEYMAN_VERSION" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] && {
-        KEYMAN_VERSION_MAJOR="${BASH_REMATCH[1]}"
-        KEYMAN_VERSION_MINOR="${BASH_REMATCH[2]}"
-        KEYMAN_VERSION_PATCH="${BASH_REMATCH[3]}"
-        KEYMAN_VERSION_RELEASE="$KEYMAN_VERSION_MAJOR.$KEYMAN_VERSION_MINOR"
-    } || {
-        echo "Invalid VERSION.md file: expected major.minor.patch";
-        exit 1;
-    }
-
-    # Used for Windows, which requires a four part version string
-    KEYMAN_VERSION_WIN="$KEYMAN_VERSION.0"
-
-    #
-    # Build a tag to append to the version string. This is not assigned
-    # to the version number used in the projects but may be used as a
-    # display string and in TeamCity configuration
-    #
-
-    if [ "$KEYMAN_TIER" == "alpha" ] || [ "$KEYMAN_TIER" == "beta" ]; then
-        KEYMAN_VERSION_TAG="-$KEYMAN_TIER"
-    else
-        KEYMAN_VERSION_TAG=
-    fi
-
-    if ! builder_is_running_on_teamcity && ! builder_is_running_on_gha \
-      && [[ -z "${KEYMAN_PKG_BUILD-}" ]]; then
-        # Local dev machine, not TeamCity or GitHub Action and not .deb package build
-        KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-local"
-        KEYMAN_VERSION_ENVIRONMENT=local
-    elif [ -n "${TEAMCITY_PR_NUMBER-}" ]; then
-        # On TeamCity: are we running a pull request build or a master/beta/stable build?
-        KEYMAN_VERSION_ENVIRONMENT="test"
-        # Note TEAMCITY_PR_NUMBER can also be 'master', 'beta', or 'stable-x.y'
-        # This indicates we are running a Test build.
-        if [[ $TEAMCITY_PR_NUMBER =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
-            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test"
-        else
-            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test-$TEAMCITY_PR_NUMBER"
-        fi
-    elif builder_is_running_on_gha && ${GHA_TEST_BUILD-}; then
-        KEYMAN_VERSION_ENVIRONMENT="test"
-        # Note GHA_BRANCH can be 'master', 'beta', or 'stable-x.y'
-        # This indicates we are running a Test build.
-        if [[ ${GHA_BRANCH-} =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
-            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test"
-        else
-            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test-${GHA_BRANCH-unset}"
-        fi
-    else
-        KEYMAN_VERSION_ENVIRONMENT="$KEYMAN_TIER"
-    fi
-
-    KEYMAN_VERSION_WITH_TAG="$KEYMAN_VERSION$KEYMAN_VERSION_TAG"
-    KEYMAN_VERSION_GIT_TAG="release@$KEYMAN_VERSION_WITH_TAG"
-
-    readonly KEYMAN_VERSION
-    readonly KEYMAN_VERSION_MAJOR
-    readonly KEYMAN_VERSION_MINOR
-    readonly KEYMAN_VERSION_PATCH
-    readonly KEYMAN_VERSION_RELEASE
-    readonly KEYMAN_VERSION_WIN
-    readonly KEYMAN_VERSION_TAG
-    readonly KEYMAN_VERSION_WITH_TAG
-    readonly KEYMAN_VERSION_ENVIRONMENT
-    readonly KEYMAN_VERSION_GIT_TAG
-
-    # Export version strings so places like version.gradle can access them
-    export KEYMAN_VERSION
-    export KEYMAN_VERSION_MAJOR
-    export KEYMAN_VERSION_MINOR
-    export KEYMAN_VERSION_PATCH
-    export KEYMAN_VERSION_RELEASE
-    export KEYMAN_VERSION_WIN
-    export KEYMAN_VERSION_TAG
-    export KEYMAN_VERSION_WITH_TAG
-    export KEYMAN_VERSION_ENVIRONMENT
-    export KEYMAN_VERSION_GIT_TAG
-}
-
-function findTier() {
-  local KEYMAN_TIER_MD="$KEYMAN_ROOT/TIER.md"
-  KEYMAN_TIER=$(builder_trim $(<"$KEYMAN_TIER_MD"))
-  [[ "$KEYMAN_TIER" =~ ^(alpha|beta|stable)$ ]] || {
-      echo "Invalid TIER.md file: expected alpha, beta or stable."
-      exit 1;
-  }
-}
-
-function printBuildNumberForTeamCity() {
-    if [ ! -z "${TEAMCITY_VERSION-}" ]; then
-        if [ ! -z "${TEAMCITY_PR_NUMBER-}" ]; then
-            echo "##teamcity[buildNumber '$KEYMAN_VERSION_WITH_TAG']"
-        else
-            # For alpha/beta builds, for now we don't append the
-            # version tag as buildNumber is used in the delivery
-            # of the build version. We may improve this in the
-            # future.
-            echo "##teamcity[buildNumber '$KEYMAN_VERSION']"
-        fi
-    fi
-}
-
-function printVersionUtilsDebug() {
-    echo "KEYMAN_ROOT:                $KEYMAN_ROOT"
-    echo "KEYMAN_VERSION:             $KEYMAN_VERSION"
-    echo "KEYMAN_VERSION_WIN:         $KEYMAN_VERSION_WIN"
-    echo "KEYMAN_VERSION_RELEASE:     $KEYMAN_VERSION_RELEASE"
-    echo "KEYMAN_VERSION_MAJOR:       $KEYMAN_VERSION_MAJOR"
-    echo "KEYMAN_VERSION_MINOR:       $KEYMAN_VERSION_MINOR"
-    echo "KEYMAN_VERSION_PATCH:       $KEYMAN_VERSION_PATCH"
-    echo "KEYMAN_TIER:                $KEYMAN_TIER"
-    echo "KEYMAN_VERSION_TAG:         $KEYMAN_VERSION_TAG"
-    echo "KEYMAN_VERSION_WITH_TAG:    $KEYMAN_VERSION_WITH_TAG"
-    echo "KEYMAN_VERSION_GIT_TAG:     $KEYMAN_VERSION_GIT_TAG"
-    echo "KEYMAN_VERSION_ENVIRONMENT: $KEYMAN_VERSION_ENVIRONMENT"
-}
-
-function findShouldSentryRelease() {
-    # Default, for 'test' or 'local' environment, or in case
-    # $KEYMAN_VERSION_ENVIRONMENT is improperly specified.
-    # (May be overridden by -upload-sentry in supporting build scripts.)
-    UPLOAD_SENTRY=false
-
-    # Default: override to `true` for release builds.
-    case $KEYMAN_VERSION_ENVIRONMENT in
-    # Actual release tiers
-    alpha | beta | stable)
-        UPLOAD_SENTRY=true
-        ;;
-    esac
-}
-
-findKeymanRoot
-
-# Source builder_script
-. "$KEYMAN_ROOT/resources/builder.inc.sh"
-
-findTier
-findVersion
-
-# printVersionUtilsDebug
-printBuildNumberForTeamCity
-
-findShouldSentryRelease
-
-# Intended for use with macOS-based builds, as Xcode build phase "run script"s do not have access to important
-# environment variables.  Doesn't hurt to run it at other times as well.  The output file is .gitignore'd.
-function exportEnvironmentDefinitionScript() {
-    ENVIRONMENT_SH="$KEYMAN_ROOT/resources/environment.sh"
-
-    # Remove old copy if it exists
-    [ -f "$ENVIRONMENT_SH" ] && rm "$ENVIRONMENT_SH"
-
-    # Documentation about the script, within the script.
-    echo "# Do not edit - this is an autogenerated script.  See build/build-utils.sh for more details." >> "$ENVIRONMENT_SH"
-    echo "# This file redefines critical environment variables for import to Xcode build phases." >> "$ENVIRONMENT_SH"
-    echo "" >> "$ENVIRONMENT_SH"
-
-    # Defining variables for KEYMAN_VERSION here will leave static definitions that don't automatically update when a user
-    # changes branches; some branches are 'similar enough' to not require full command-line based rebuilds.
-    # We want that KEYMAN_VERSION number to properly mirror the state of its branch during development so that it matches
-    # any error reports that get logged to Sentry.
-    #
-    # As a result, we explicitly do NOT define KEYMAN_VERSION or KEYMAN_VERSION_TAG as part of ENVIRONMENT_SH.
-
-    echo "# Required for successful dSYM upload for Sentry error reporting" >> "$ENVIRONMENT_SH"
-    echo "export SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-}" >> "$ENVIRONMENT_SH"
-    echo "export SENTRY_URL=${SENTRY_URL:-}" >> "$ENVIRONMENT_SH"
-    echo "export SENTRY_ORG=${SENTRY_ORG:-}" >> "$ENVIRONMENT_SH"
-
-    # Ensure the autogenerated file may be successfully run/included by xcode-utils.sh.
-    chmod +x "$ENVIRONMENT_SH"
-}
-
-# Detect if this script is running from within Xcode.  Obviously, this assumes we don't have other definitions
-# for these variables... but they're set within Xcode during its runs.  As a result, they're not the wisest thing for
-# someone else to intentionally use, so this check seems reasonable.
-#
-# https://gist.github.com/gdavis/6670468 has a representative copy of a standard Xcode environment variable setup.
-# shellcheck disable=2310
-if builder_is_macos && [[ -z "${XCODE_VERSION_ACTUAL:-}" ]] && [[ -z "${XCODE_PRODUCT_BUILD_VERSION:-}" ]]; then
-    exportEnvironmentDefinitionScript
-fi
-
-
-replaceVersionStrings() {
-  local infile=$1
-  local outfile=$2
-
-  sed "
-    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
-    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
-    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
-    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
-    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
-    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
-    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
-    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
-    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
-    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
-    s/\$KEYMAN_VERSION/$KEYMAN_VERSION/g;
-    " "$infile" > "$outfile"
-}
-
-replaceVersionStrings_Mkver() {
-  # This is similar to replaceVersionStrings but supports all
-  # the old mkver strings as used by windows/src
-  local infile=$1
-  local outfile=$2
-
-  # Note that $KEYMAN_VERSION differs between the two functions!
-  # We should be deprecating all the mkver strings
-
-  sed "
-    s/\$VersionWin/$KEYMAN_VERSION_WIN/g;
-    s/\$VersionRelease/$KEYMAN_VERSION_RELEASE/g;
-    s/\$VersionMajor/$KEYMAN_VERSION_MAJOR/g;
-    s/\$VersionMinor/$KEYMAN_VERSION_MINOR/g;
-    s/\$VersionPatch/$KEYMAN_VERSION_PATCH/g;
-    s/\$Tier/$KEYMAN_TIER/g;
-    s/\$Tag/$KEYMAN_VERSION_TAG/g;
-    s/\$VersionWithTag/$KEYMAN_VERSION_WITH_TAG/g;
-    s/\$VersionGitTag/$KEYMAN_VERSION_GIT_TAG/g;
-    s/\$VersionRc/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
-    s/\$Environment/$KEYMAN_VERSION_ENVIRONMENT/g;
-    s/\$Version/$KEYMAN_VERSION/g;
-    s/\$KEYMAN_VERSIONNUM/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
-    s/\$RELEASE_MAJOR/$KEYMAN_VERSION_MAJOR/g;
-    s/\$RELEASE_MINOR/$KEYMAN_VERSION_MINOR/g;
-    s/\$RELEASE/$KEYMAN_VERSION_RELEASE/g;
-
-    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
-    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
-    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
-    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
-    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
-    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
-    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
-    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
-    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
-    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
-
-    s/\$KEYMAN_VERSION/$KEYMAN_VERSION_WIN/g;
-
-    " "$infile" > "$outfile"
-}
-
-set_keyman_standard_build_path() {
-  PATH="$KEYMAN_ROOT/node_modules/.bin:$PATH"
-}
-
-# For CI compatibility of building Keyman for Android 18.0 with OpenJDK 11,
-# this overrides JAVA_HOME for the builder script to use OpenJDK 21.
-set_java_home() {
-  set_java_home_21
-}
-
-set_java_home_21() {
-  if [[ ! -z ${JAVA_HOME_21+x} ]]; then
-    builder_echo "Setting JAVA_HOME to JAVA_HOME_21 (${JAVA_HOME_21})"
-    export JAVA_HOME="${JAVA_HOME_21}"
-  fi
-}
-
-set_java_home_11() {
-  if [[ ! -z ${JAVA_HOME_11+x} ]]; then
-    builder_echo "Setting JAVA_HOME to JAVA_HOME_11 (${JAVA_HOME_11})"
-    export JAVA_HOME="${JAVA_HOME_11}"
-  fi
-}
-
-#
-# printXCodeBuildScriptLogs: xcodebuild does not emit stdout from scripts in
-# PBXShellScriptBuildPhase phases. This is a real problem for us because if
-# there is an issue, we just can't see it. So we capture the output in a
-# separate logfile, and then call printXCodeBuildScriptLogs after any xcodebuild
-# call to get the output.
-#
-# This file is captured in xcode-utils.sh, logScriptsToFile function, and each
-# script phase will append to the log file, until funprintXCodeBuildScriptLogs
-# is called, at which point the logfile will be deleted.
-#
-# The logfile is placed in $KEYMAN_ROOT/xcodebuild-scripts.log. It is used for
-# both iOS and macOS builds.
-#
-# If there is no logfile, then this function will not emit anything.
-#
-printXCodeBuildScriptLogs() {
-  local SCRIPT_LOG="$KEYMAN_ROOT/xcodebuild-scripts.log"
-  if [ -f "$SCRIPT_LOG" ]; then
-    echo "printXCodeBuildScriptLogs: reporting script results from previous xcode build"
-    cat "$SCRIPT_LOG"
-    rm "$SCRIPT_LOG"
-    echo "printXCodeBuildScriptLogs: done"
-    echo
-  fi
-}
-
-#
-# Wraps xcodebuild with error handling and log printing
-#
-run_xcodebuild() {
-  typeset cmnd="$*"
-  typeset ret_code
-  local hasSetErrExit=false
-  if [ -o errexit ]; then
-    hasSetErrExit=true
-    set +e
-  fi
-  eval xcodebuild $cmnd
-  ret_code=$?
-  if $hasSetErrExit; then
-    set -e
-  fi
-
-  printXCodeBuildScriptLogs
-  if [ $ret_code != 0 ]; then
-    builder_die "Build failed! Error: [$ret_code] when executing command: 'xcodebuild $cmnd'"
-  fi
-}
-
-
-#
-# We always want to use tools out of node_modules/.bin to guarantee that we get the
-# correct version
-#
-set_keyman_standard_build_path
+# TODO: remove this file in v19.0. Used only by deb-packaging.yml
+echo "WARNING: build-utils.sh is deprecated. Use instead builder-basic.inc.sh"
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/builder-basic.inc.sh"
diff --git a/resources/build/builder-basic.inc.sh b/resources/build/builder-basic.inc.sh
new file mode 100644
index 0000000000..83f77c3134
--- /dev/null
+++ b/resources/build/builder-basic.inc.sh
@@ -0,0 +1,279 @@
+#!/usr/bin/env bash
+#
+# This script sets build environment variables. KEYMAN_VERSION vars are also exported:
+#   KEYMAN_VERSION:          Full current build version, e.g. "14.0.1"
+#   KEYMAN_VERSION_WIN:      Full current build version for Windows, e.g. "14.0.1.0"
+#   KEYMAN_VERSION_RELEASE:  Current release version, e.g. "14.0"
+#   KEYMAN_VERSION_MAJOR:    Major version, e.g. "14"
+#   KEYMAN_VERSION_MINOR:    Minor version, e.g. "0"
+#   KEYMAN_VERSION_PATCH:    Patch version, e.g. "1"
+#   KEYMAN_TIER:             Current tier, one of "alpha", "beta" or "stable"
+#   KEYMAN_VERSION_TAG:      Tier + Pull Request + Location of build [-alpha|-beta][-test[-1234]][-local]
+#   KEYMAN_VERSION_WITH_TAG: e.g. "14.0.1-alpha-test-1234" or "14.0.5-beta-local" or "14.0.1-alpha-test"
+#   KEYMAN_VERSION_GIT_TAG:  Git tag for the release, "release@$KEYMAN_VERSION_WITH_TAG", e.g. "release@14.0.1-alpha-test-1234"
+#   KEYMAN_ROOT:      fully resolved root path of Keyman repository
+#   KEYMAN_VERSION_ENVIRONMENT: One of: local, test, alpha, beta, stable
+#   UPLOAD_SENTRY:    true - if KEYMAN_VERSION_ENVIRONMENT is one of alpha, beta, stable
+#                     false - if local, test.  Indicates if debug artifacts should be uploaded to Sentry
+#   BUILDER_OS:       win|mac|linux -- current build environment
+#
+# On macOS, this script requires coreutils (`brew install coreutils`)
+#
+# Here is how to include this script reliably, cross-platform:
+#    ## START STANDARD BUILD SCRIPT INCLUDE
+#    # adjust relative paths as necessary
+#    THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+#    . "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
+#    # END STANDARD BUILD SCRIPT INCLUDE
+#
+# Note: keep changes to version, tier and tag determination in sync with mkver (windows/src/buildutils/mkver)
+#
+
+# Note: set -eu and SHLVL are deliberately set both here and in builder.inc.sh,
+#       because we want them set as early as possible, and because
+#       builder.inc.sh is shared to other repos, this keeps the usage consistent
+#       there as well.
+
+# Exit on command failure and when using unset variables:
+set -eu
+
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
+function _builder_basic_find_keyman_root() {
+  # We don't need readlink here because our standard script prolog does a
+  # readlink -f already so we will have already escaped from any symlinks but we
+  # still need to canonicalize paths to remove ../../..
+  #
+  # We only want to set KEYMAN_ROOT if it isn't already set and readonly
+  # (https://stackoverflow.com/a/4441178/1836776)
+  if (unset KEYMAN_ROOT 2>/dev/null); then
+    KEYMAN_ROOT="${BASH_SOURCE[0]%/*/*/*}"
+    KEYMAN_ROOT="$( cd "$KEYMAN_ROOT" && echo "$PWD" )"
+    readonly KEYMAN_ROOT
+  fi
+}
+
+function _builder_basic_find_version() {
+    local KEYMAN_VERSION_MD="$KEYMAN_ROOT/VERSION.md"
+    KEYMAN_VERSION=$(builder_trim $(<"$KEYMAN_VERSION_MD"))
+    [[ "$KEYMAN_VERSION" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] && {
+        KEYMAN_VERSION_MAJOR="${BASH_REMATCH[1]}"
+        KEYMAN_VERSION_MINOR="${BASH_REMATCH[2]}"
+        KEYMAN_VERSION_PATCH="${BASH_REMATCH[3]}"
+        KEYMAN_VERSION_RELEASE="$KEYMAN_VERSION_MAJOR.$KEYMAN_VERSION_MINOR"
+    } || {
+        echo "Invalid VERSION.md file: expected major.minor.patch";
+        exit 1;
+    }
+
+    # Used for Windows, which requires a four part version string
+    KEYMAN_VERSION_WIN="$KEYMAN_VERSION.0"
+
+    #
+    # Build a tag to append to the version string. This is not assigned
+    # to the version number used in the projects but may be used as a
+    # display string and in TeamCity configuration
+    #
+
+    if [ "$KEYMAN_TIER" == "alpha" ] || [ "$KEYMAN_TIER" == "beta" ]; then
+        KEYMAN_VERSION_TAG="-$KEYMAN_TIER"
+    else
+        KEYMAN_VERSION_TAG=
+    fi
+
+    if ! builder_is_running_on_teamcity && ! builder_is_running_on_gha \
+      && [[ -z "${KEYMAN_PKG_BUILD-}" ]]; then
+        # Local dev machine, not TeamCity or GitHub Action and not .deb package build
+        KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-local"
+        KEYMAN_VERSION_ENVIRONMENT=local
+    elif [ -n "${TEAMCITY_PR_NUMBER-}" ]; then
+        # On TeamCity: are we running a pull request build or a master/beta/stable build?
+        KEYMAN_VERSION_ENVIRONMENT="test"
+        # Note TEAMCITY_PR_NUMBER can also be 'master', 'beta', or 'stable-x.y'
+        # This indicates we are running a Test build.
+        if [[ $TEAMCITY_PR_NUMBER =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
+            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test"
+        else
+            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test-$TEAMCITY_PR_NUMBER"
+        fi
+    elif builder_is_running_on_gha && ${GHA_TEST_BUILD-}; then
+        KEYMAN_VERSION_ENVIRONMENT="test"
+        # Note GHA_BRANCH can be 'master', 'beta', or 'stable-x.y'
+        # This indicates we are running a Test build.
+        if [[ ${GHA_BRANCH-} =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
+            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test"
+        else
+            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test-${GHA_BRANCH-unset}"
+        fi
+    else
+        KEYMAN_VERSION_ENVIRONMENT="$KEYMAN_TIER"
+    fi
+
+    KEYMAN_VERSION_WITH_TAG="$KEYMAN_VERSION$KEYMAN_VERSION_TAG"
+    KEYMAN_VERSION_GIT_TAG="release@$KEYMAN_VERSION_WITH_TAG"
+
+    readonly KEYMAN_VERSION
+    readonly KEYMAN_VERSION_MAJOR
+    readonly KEYMAN_VERSION_MINOR
+    readonly KEYMAN_VERSION_PATCH
+    readonly KEYMAN_VERSION_RELEASE
+    readonly KEYMAN_VERSION_WIN
+    readonly KEYMAN_VERSION_TAG
+    readonly KEYMAN_VERSION_WITH_TAG
+    readonly KEYMAN_VERSION_ENVIRONMENT
+    readonly KEYMAN_VERSION_GIT_TAG
+
+    # Export version strings so places like version.gradle can access them
+    export KEYMAN_VERSION
+    export KEYMAN_VERSION_MAJOR
+    export KEYMAN_VERSION_MINOR
+    export KEYMAN_VERSION_PATCH
+    export KEYMAN_VERSION_RELEASE
+    export KEYMAN_VERSION_WIN
+    export KEYMAN_VERSION_TAG
+    export KEYMAN_VERSION_WITH_TAG
+    export KEYMAN_VERSION_ENVIRONMENT
+    export KEYMAN_VERSION_GIT_TAG
+}
+
+function _builder_basic_find_tier() {
+  local KEYMAN_TIER_MD="$KEYMAN_ROOT/TIER.md"
+  KEYMAN_TIER=$(builder_trim $(<"$KEYMAN_TIER_MD"))
+  [[ "$KEYMAN_TIER" =~ ^(alpha|beta|stable)$ ]] || {
+      echo "Invalid TIER.md file: expected alpha, beta or stable."
+      exit 1;
+  }
+}
+
+function _builder_basic_print_build_number_for_teamcity() {
+    if [ ! -z "${TEAMCITY_VERSION-}" ]; then
+        if [ ! -z "${TEAMCITY_PR_NUMBER-}" ]; then
+            echo "##teamcity[buildNumber '$KEYMAN_VERSION_WITH_TAG']"
+        else
+            # For alpha/beta builds, for now we don't append the
+            # version tag as buildNumber is used in the delivery
+            # of the build version. We may improve this in the
+            # future.
+            echo "##teamcity[buildNumber '$KEYMAN_VERSION']"
+        fi
+    fi
+}
+
+function _builder_basic_print_version_utils_debug() {
+    echo "KEYMAN_ROOT:                $KEYMAN_ROOT"
+    echo "KEYMAN_VERSION:             $KEYMAN_VERSION"
+    echo "KEYMAN_VERSION_WIN:         $KEYMAN_VERSION_WIN"
+    echo "KEYMAN_VERSION_RELEASE:     $KEYMAN_VERSION_RELEASE"
+    echo "KEYMAN_VERSION_MAJOR:       $KEYMAN_VERSION_MAJOR"
+    echo "KEYMAN_VERSION_MINOR:       $KEYMAN_VERSION_MINOR"
+    echo "KEYMAN_VERSION_PATCH:       $KEYMAN_VERSION_PATCH"
+    echo "KEYMAN_TIER:                $KEYMAN_TIER"
+    echo "KEYMAN_VERSION_TAG:         $KEYMAN_VERSION_TAG"
+    echo "KEYMAN_VERSION_WITH_TAG:    $KEYMAN_VERSION_WITH_TAG"
+    echo "KEYMAN_VERSION_GIT_TAG:     $KEYMAN_VERSION_GIT_TAG"
+    echo "KEYMAN_VERSION_ENVIRONMENT: $KEYMAN_VERSION_ENVIRONMENT"
+}
+
+# TODO: consolidate with buildLevel, see #14285
+function _builder_basic_find_should_sentry_release() {
+    # Default, for 'test' or 'local' environment, or in case
+    # $KEYMAN_VERSION_ENVIRONMENT is improperly specified.
+    # (May be overridden by -upload-sentry in supporting build scripts.)
+    UPLOAD_SENTRY=false
+
+    # Default: override to `true` for release builds.
+    case $KEYMAN_VERSION_ENVIRONMENT in
+    # Actual release tiers
+    alpha | beta | stable)
+        UPLOAD_SENTRY=true
+        ;;
+    esac
+}
+
+replaceVersionStrings() {
+  local infile=$1
+  local outfile=$2
+
+  sed "
+    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
+    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
+    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
+    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
+    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
+    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
+    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
+    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
+    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
+    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
+    s/\$KEYMAN_VERSION/$KEYMAN_VERSION/g;
+    " "$infile" > "$outfile"
+}
+
+replaceVersionStrings_Mkver() {
+  # This is similar to replaceVersionStrings but supports all
+  # the old mkver strings as used by windows/src
+  local infile=$1
+  local outfile=$2
+
+  # Note that $KEYMAN_VERSION differs between the two functions!
+  # We should be deprecating all the mkver strings
+
+  sed "
+    s/\$VersionWin/$KEYMAN_VERSION_WIN/g;
+    s/\$VersionRelease/$KEYMAN_VERSION_RELEASE/g;
+    s/\$VersionMajor/$KEYMAN_VERSION_MAJOR/g;
+    s/\$VersionMinor/$KEYMAN_VERSION_MINOR/g;
+    s/\$VersionPatch/$KEYMAN_VERSION_PATCH/g;
+    s/\$Tier/$KEYMAN_TIER/g;
+    s/\$Tag/$KEYMAN_VERSION_TAG/g;
+    s/\$VersionWithTag/$KEYMAN_VERSION_WITH_TAG/g;
+    s/\$VersionGitTag/$KEYMAN_VERSION_GIT_TAG/g;
+    s/\$VersionRc/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
+    s/\$Environment/$KEYMAN_VERSION_ENVIRONMENT/g;
+    s/\$Version/$KEYMAN_VERSION/g;
+    s/\$KEYMAN_VERSIONNUM/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
+    s/\$RELEASE_MAJOR/$KEYMAN_VERSION_MAJOR/g;
+    s/\$RELEASE_MINOR/$KEYMAN_VERSION_MINOR/g;
+    s/\$RELEASE/$KEYMAN_VERSION_RELEASE/g;
+
+    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
+    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
+    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
+    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
+    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
+    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
+    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
+    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
+    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
+    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
+
+    s/\$KEYMAN_VERSION/$KEYMAN_VERSION_WIN/g;
+
+    " "$infile" > "$outfile"
+}
+
+_builder_basic_set_keyman_standard_build_path() {
+  PATH="$KEYMAN_ROOT/node_modules/.bin:$PATH"
+}
+
+_builder_basic_find_keyman_root
+
+# Source builder_script
+. "$KEYMAN_ROOT/resources/builder.inc.sh"
+
+_builder_basic_find_tier
+_builder_basic_find_version
+
+# _builder_basic_print_version_utils_debug
+_builder_basic_print_build_number_for_teamcity
+
+_builder_basic_find_should_sentry_release
+
+#
+# We always want to use tools out of node_modules/.bin to guarantee that we get the
+# correct version
+#
+_builder_basic_set_keyman_standard_build_path
diff --git a/resources/build/builder.inc.sh b/resources/build/builder-full.inc.sh
similarity index 51%
rename from resources/build/builder.inc.sh
rename to resources/build/builder-full.inc.sh
index 70d7d07c16..e937582565 100644
--- a/resources/build/builder.inc.sh
+++ b/resources/build/builder-full.inc.sh
@@ -1,4 +1,5 @@
-# builder.inc.sh
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 #
 # Wrapper for Builder scripts. Do not confuse this with
 # /resources/builder.inc.sh which has the full implementation of builder scripts
@@ -7,28 +8,13 @@
 # report an error if builder_parse is never called.
 
 
-# Note: set -eu and SHLVL are deliberately set both here and in build-utils.sh
+# Note: set -eu and SHLVL are deliberately set both here and in builder-basic.inc.sh
 # Exit on command failure and when using unset variables:
 set -eu
 # Prevents 'clear' on exit of mingw64 bash shell
 SHLVL=0
 
-
-function __builder_find_keyman_root() {
-  # We don't need readlink here because our standard script prolog does a
-  # readlink -f already so we will have already escaped from any symlinks
-  # But we still need to canonicalize paths to remove ../../..
-  #
-  # We only want to set KEYMAN_ROOT if it isn't already set and readonly
-  # (https://stackoverflow.com/a/4441178/1836776)
-  if (unset KEYMAN_ROOT 2>/dev/null); then
-    KEYMAN_ROOT="${BASH_SOURCE[0]%/*/*/*}"
-    KEYMAN_ROOT="$( cd "$KEYMAN_ROOT" && echo "$PWD" )"
-    readonly KEYMAN_ROOT
-  fi
-}
-
-function __builder_not_a_builder_script() {
+function _builder_full_not_a_builder_script() {
   if ! _builder_has_function_been_called builder_describe; then
     builder_echo warning "builder_describe was never called; script is not a valid builder script"
     exit 1
@@ -39,13 +25,10 @@ function __builder_not_a_builder_script() {
   fi
 }
 
-__builder_find_keyman_root
-
-trap __builder_not_a_builder_script exit
+trap _builder_full_not_a_builder_script exit
 
 # This will also import /resources/builder.inc.sh
-# TODO: rename build-utils.sh to utils.sh
-. "$KEYMAN_ROOT/resources/build/build-utils.sh"
+. "${BASH_SOURCE[0]%/*}/builder-basic.inc.sh"
 
-# All builder scripts start in their own folder
+# All full builder scripts start in their own folder
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/builder-report.sh b/resources/build/builder-report.sh
index 6f2a21fa7f..931a47f660 100755
--- a/resources/build/builder-report.sh
+++ b/resources/build/builder-report.sh
@@ -11,7 +11,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$KEYMAN_ROOT"
diff --git a/resources/build/ci/test/test-pull-requests.sh b/resources/build/ci/test/test-pull-requests.sh
index cebf9e1b27..cd72343d37 100755
--- a/resources/build/ci/test/test-pull-requests.sh
+++ b/resources/build/ci/test/test-pull-requests.sh
@@ -8,7 +8,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/help-keyman-com.sh b/resources/build/help-keyman-com.sh
index 0bf4067bfa..8d851b0afe 100755
--- a/resources/build/help-keyman-com.sh
+++ b/resources/build/help-keyman-com.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/ci/pull-requests.inc.sh"
diff --git a/resources/build/history/history-utils.sh b/resources/build/history/history-utils.sh
index a7a8b3e837..9a1f8f6b5e 100755
--- a/resources/build/history/history-utils.sh
+++ b/resources/build/history/history-utils.sh
@@ -5,7 +5,7 @@
 
 _hu_base_dir=$(dirname "$BASH_SOURCE")/../../..
 
-. $_hu_base_dir/resources/shellHelperFunctions.sh
+. $_hu_base_dir/resources/build/utils.inc.sh
 
 _hu_debug() {
   if [[ ! -z ${DEBUG+x} ]] && [[ $DEBUG == 1 ]]; then echo "$1"; fi
diff --git a/resources/build/increment-version.sh b/resources/build/increment-version.sh
index d35f76b216..7116c6b917 100755
--- a/resources/build/increment-version.sh
+++ b/resources/build/increment-version.sh
@@ -19,7 +19,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
@@ -136,7 +136,7 @@ if [ "$action" == "commit" ]; then
   NEWVERSION=`cat $KEYMAN_VERSION_MD | tr -d "[:space:]"`
 
   pushd "$KEYMAN_ROOT" > /dev/null
-  message="auto: increment $base version to $NEWVERSION"
+  message="auto: increment $base version to $NEWVERSION"$'\n\nTest-bot: skip\nBuild-bot: skip'
   branch="auto/version-$base-$NEWVERSION"
   git tag -a "$KEYMAN_VERSION_GIT_TAG" -m "Keyman release $KEYMAN_VERSION_WITH_TAG"
   git checkout -b "$branch"
diff --git a/resources/build/jq.inc.sh b/resources/build/jq.inc.sh
index f1f996e61e..59490328d5 100644
--- a/resources/build/jq.inc.sh
+++ b/resources/build/jq.inc.sh
@@ -1,4 +1,5 @@
 # shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 #
 # Setup JQ environment variable according to the user's system
 #
@@ -10,7 +11,7 @@ if [[ -z "${JQ+x}" ]]; then
   ## START STANDARD BUILD SCRIPT INCLUDE
   # adjust relative paths as necessary
   JQ_THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-  # . "${THIS_SCRIPT%/*}/build-utils.sh"
+  # . "${THIS_SCRIPT%/*}/builder-basic.inc.sh"
   ## END STANDARD BUILD SCRIPT INCLUDE
 
   # Don't use 'builder_is_windows' here, because this script is also
diff --git a/resources/build/mac/mac.inc.sh b/resources/build/mac/mac.inc.sh
new file mode 100644
index 0000000000..e64dccbffa
--- /dev/null
+++ b/resources/build/mac/mac.inc.sh
@@ -0,0 +1,159 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+if [ -z "${DEVELOPMENT_TEAM+x}" ]; then
+    DEVELOPMENT_TEAM=3YE4W86L3G
+fi
+
+function mac_notarize() {
+  local TARGET_PATH="$1"
+  local TARGET_FILE="$2"
+
+  local NOTARYTOOL_LOG_PATH="$TARGET_PATH/notarytool.log"
+
+  xcrun notarytool submit \
+      --apple-id "$APPSTORECONNECT_USERNAME" \
+      --team-id "$DEVELOPMENT_TEAM" \
+      --password "$APPSTORECONNECT_PASSWORD" \
+      --output-format json \
+      --wait \
+      "$TARGET_FILE" > "$NOTARYTOOL_LOG_PATH"
+  # notarytool output: {"status":"Accepted","id":"ca62bba0-6c49-43c2-90d8-83a8ef306e0f","message":"Processing complete"}
+
+  cat "$NOTARYTOOL_LOG_PATH"
+  local NOTARYTOOL_STATUS=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .status`
+  local NOTARYTOOL_SUBMISSION_ID=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .id`
+  if [[ "$NOTARYTOOL_STATUS" != Accepted ]]; then
+      # We won't assume notarytool returns an error code if status != Accepted
+      builder_die "Notarization failed with $NOTARYTOOL_STATUS"
+  fi
+
+  builder_heading "Notarization completed successfully. Review logs below for any warnings."
+
+  xcrun notarytool log \
+        --apple-id "$APPSTORECONNECT_USERNAME" \
+        --team-id "$DEVELOPMENT_TEAM" \
+        --password "$APPSTORECONNECT_PASSWORD" \
+        "$NOTARYTOOL_SUBMISSION_ID"
+
+  rm -f "$NOTARYTOOL_LOG_PATH"
+}
+
+execCodeSign() {
+  # Allow the signing to fail up to 5 times (network transient error on timestamping)
+  local ret_code=0
+  local count=0
+  local method="$1"
+  shift
+  if [[ "$method" == direct ]]; then
+    method=
+  fi
+  while (( count <  5 )); do
+    $method codesign "$@" || ret_code=$?
+    if [ $ret_code == 0 ]; then
+      return 0
+    fi
+    (( count++ ))
+    builder_echo "codesign attempt $count failed with error $ret_code"
+    sleep 5
+  done
+
+  builder_echo "*** codesign parameters: $@"
+  builder_die "Unable to sign component after 5 attempts (exit code $ret_code)"
+}
+
+# Allows for a quick macOS check for those scripts requiring a macOS environment.
+verify_on_mac() {
+  if ! builder_is_macos; then
+    builder_die "This build script will only run in a Mac environment."
+    exit 1
+  fi
+}
+
+# Intended for use with macOS-based builds, as Xcode build phase "run script"s do not have access to important
+# environment variables.  Doesn't hurt to run it at other times as well.  The output file is .gitignore'd.
+function _mac_generate_xcode_environment_definition_script() {
+    ENVIRONMENT_SH="$KEYMAN_ROOT/resources/environment.sh"
+
+    # Remove old copy if it exists
+    [ -f "$ENVIRONMENT_SH" ] && rm "$ENVIRONMENT_SH"
+
+    # Documentation about the script, within the script.
+    echo "# Do not edit - this is an autogenerated script.  See build/builder-basic.inc.sh for more details." >> "$ENVIRONMENT_SH"
+    echo "# This file redefines critical environment variables for import to Xcode build phases." >> "$ENVIRONMENT_SH"
+    echo "" >> "$ENVIRONMENT_SH"
+
+    # Defining variables for KEYMAN_VERSION here will leave static definitions that don't automatically update when a user
+    # changes branches; some branches are 'similar enough' to not require full command-line based rebuilds.
+    # We want that KEYMAN_VERSION number to properly mirror the state of its branch during development so that it matches
+    # any error reports that get logged to Sentry.
+    #
+    # As a result, we explicitly do NOT define KEYMAN_VERSION or KEYMAN_VERSION_TAG as part of ENVIRONMENT_SH.
+
+    echo "# Required for successful dSYM upload for Sentry error reporting" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-}" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_URL=${SENTRY_URL:-}" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_ORG=${SENTRY_ORG:-}" >> "$ENVIRONMENT_SH"
+
+    # Ensure the autogenerated file may be successfully run/included by xcode-utils.inc.sh.
+    chmod +x "$ENVIRONMENT_SH"
+}
+
+#
+# printXCodeBuildScriptLogs: xcodebuild does not emit stdout from scripts in
+# PBXShellScriptBuildPhase phases. This is a real problem for us because if
+# there is an issue, we just can't see it. So we capture the output in a
+# separate logfile, and then call printXCodeBuildScriptLogs after any xcodebuild
+# call to get the output.
+#
+# This file is captured in xcode-utils.inc.sh, logScriptsToFile function, and
+# each script phase will append to the log file, until printXCodeBuildScriptLogs
+# is called, at which point the logfile will be deleted.
+#
+# The logfile is placed in $KEYMAN_ROOT/xcodebuild-scripts.log. It is used for
+# both iOS and macOS builds.
+#
+# If there is no logfile, then this function will not emit anything.
+#
+printXCodeBuildScriptLogs() {
+  local SCRIPT_LOG="$KEYMAN_ROOT/xcodebuild-scripts.log"
+  if [ -f "$SCRIPT_LOG" ]; then
+    echo "printXCodeBuildScriptLogs: reporting script results from previous xcode build"
+    cat "$SCRIPT_LOG"
+    rm "$SCRIPT_LOG"
+    echo "printXCodeBuildScriptLogs: done"
+    echo
+  fi
+}
+
+#
+# Wraps xcodebuild with error handling and log printing
+#
+run_xcodebuild() {
+  typeset cmnd="$*"
+  typeset ret_code
+  local hasSetErrExit=false
+  if [ -o errexit ]; then
+    hasSetErrExit=true
+    set +e
+  fi
+  eval xcodebuild $cmnd
+  ret_code=$?
+  if $hasSetErrExit; then
+    set -e
+  fi
+
+  printXCodeBuildScriptLogs
+  if [ $ret_code != 0 ]; then
+    builder_die "Build failed! Error: [$ret_code] when executing command: 'xcodebuild $cmnd'"
+  fi
+}
+
+# If this script is running on macOS but  not within xcode script calls, generate the
+# env script that will be used for xcode scripts
+# Reference: https://gist.github.com/gdavis/6670468
+# shellcheck disable=2310
+if builder_is_macos && [[ -z "${XCODE_VERSION_ACTUAL:-}" ]] && [[ -z "${XCODE_PRODUCT_BUILD_VERSION:-}" ]]; then
+  _mac_generate_xcode_environment_definition_script
+fi
+
diff --git a/resources/build/mac/sentry-dsym-upload.sh b/resources/build/mac/sentry-dsym-upload.sh
new file mode 100755
index 0000000000..6da9c944dc
--- /dev/null
+++ b/resources/build/mac/sentry-dsym-upload.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# Calls resource script to perform the dSYM upload
+
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
+phaseSentryDsymUpload "keyman-ios"
\ No newline at end of file
diff --git a/resources/build/set-bundle-versions-and-settings-tagged.sh b/resources/build/mac/set-bundle-versions-and-settings-tagged.sh
similarity index 71%
rename from resources/build/set-bundle-versions-and-settings-tagged.sh
rename to resources/build/mac/set-bundle-versions-and-settings-tagged.sh
index 6985ae3c3c..69b7a0ac45 100755
--- a/resources/build/set-bundle-versions-and-settings-tagged.sh
+++ b/resources/build/mac/set-bundle-versions-and-settings-tagged.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # Calls script in xcode-utils to update the version
 # true:  applies KEYMAN_VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display
 # updates the version string for Settings
 
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
 
 phaseSetBundleVersions true
 
diff --git a/resources/build/set-bundle-versions-and-settings-untagged.sh b/resources/build/mac/set-bundle-versions-and-settings-untagged.sh
similarity index 71%
rename from resources/build/set-bundle-versions-and-settings-untagged.sh
rename to resources/build/mac/set-bundle-versions-and-settings-untagged.sh
index 93cd8a7eab..2906cfa971 100755
--- a/resources/build/set-bundle-versions-and-settings-untagged.sh
+++ b/resources/build/mac/set-bundle-versions-and-settings-untagged.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # Calls script in xcode-utils to update the version
 # true:  applies KEYMAN_VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display
 # updates the version string for Settings
 
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
 
 phaseSetBundleVersions
 
diff --git a/resources/build/set-bundle-versions-tagged.sh b/resources/build/mac/set-bundle-versions-tagged.sh
similarity index 65%
rename from resources/build/set-bundle-versions-tagged.sh
rename to resources/build/mac/set-bundle-versions-tagged.sh
index a941d460fe..c3a91d055f 100755
--- a/resources/build/set-bundle-versions-tagged.sh
+++ b/resources/build/mac/set-bundle-versions-tagged.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # Calls script in xcode-utils to update the version
 # true:  applies KEYMAN_VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display
 
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
 phaseSetBundleVersions true
diff --git a/resources/build/mac/set-bundle-versions-untagged.sh b/resources/build/mac/set-bundle-versions-untagged.sh
new file mode 100755
index 0000000000..98f737e120
--- /dev/null
+++ b/resources/build/mac/set-bundle-versions-untagged.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# Calls script in xcode-utils to update the version
+
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
+phaseSetBundleVersions
\ No newline at end of file
diff --git a/resources/build/xcode-utils.sh b/resources/build/mac/xcode-utils.inc.sh
old mode 100755
new mode 100644
similarity index 92%
rename from resources/build/xcode-utils.sh
rename to resources/build/mac/xcode-utils.inc.sh
index b917b5d63f..9cdb85de2d
--- a/resources/build/xcode-utils.sh
+++ b/resources/build/mac/xcode-utils.inc.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # This script will automatically have Xcode's build environment (and variables),
 # so there's no need to do anything extra to fetch them.
@@ -24,7 +25,7 @@ function importEnvironment() {
     buildError "KEYMAN_ROOT is not defined.  Recommendation:  define it as a project-wide \"user-defined\" Build Setting for the \"$PROJECT_NAME\" project."
     exit 1
   else
-    # As defined within build-utils.sh, which this script does NOT call.  (It was already called externally.)
+    # As defined within builder-basic.inc.sh, which this script does NOT call.  (It was already called externally.)
     ENVIRONMENT_SH="$KEYMAN_ROOT/resources/environment.sh"
     . "$ENVIRONMENT_SH"
   fi
@@ -45,13 +46,13 @@ function phaseSetBundleVersions() {
   # For command-line builds, KEYMAN_VERSION and KEYMAN_VERSION_WITH_TAG) are forwarded through xcodebuild.
   if [ -z "${KEYMAN_VERSION:-}" ]; then
     # This is likely not a command-line build at the top level; it's been triggered through Xcode.
-    # The $KEYMAN_VERSION-loading code is in build-utils.sh, but we need $THIS_SCRIPT to be set
+    # The $KEYMAN_VERSION-loading code is in builder-basic.inc.sh, but we need $THIS_SCRIPT to be set
     # (in similar manner to the "standard build header") in order to avoid script errors therein.
     THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
     # Note that this script's process will not have access to TC environment variables, but that's fine for
     # local builds triggered through Xcode's UI, which aren't part of our CI processes.
-    . "$KEYMAN_ROOT/resources/build/build-utils.sh"
+    . "$KEYMAN_ROOT/resources/build/builder-basic.inc.sh"
     echo "phaseSetBundleVersions: UI build - fetching version from repository:"
     echo "  Plain:  $KEYMAN_VERSION"
     echo "  Tagged: $KEYMAN_VERSION_WITH_TAG"
@@ -102,10 +103,10 @@ function phaseSetBundleVersions() {
 function setSettingsBundleVersion() {
   # For command-line builds, KEYMAN_VERSION and KEYMAN_VERSION_WITH_TAG) are forwarded through xcodebuild.
   if [ -z "${KEYMAN_VERSION:-}" ]; then
-    # We're not a command-line build... so we'll need to retrieve these values ourselves with ./build-utils.sh.
+    # We're not a command-line build... so we'll need to retrieve these values ourselves with ./builder-basic.inc.sh.
     # Note that this script's process will not have access to TC environment variables, but that's fine for
     # local builds triggered through Xcode's UI, which aren't part of our CI processes.
-    . "$KEYMAN_ROOT/resources/build/build-utils.sh"
+    . "$KEYMAN_ROOT/resources/build/builder-basic.inc.sh"
     echo "setSettingsBundleVersion: UI build - fetching version from repository:"
     echo "  Plain:  $KEYMAN_VERSION"
     echo "  Tagged: $KEYMAN_VERSION_WITH_TAG"
@@ -163,12 +164,12 @@ function phaseSentryDsymUpload() {
 }
 
 #
-# All calls to xcode-utils.sh scripts will have their output redirected to
+# All calls to xcode-utils.inc.sh scripts will have their output redirected to
 # $KEYMAN_ROOT/xcodebuild-scripts.log. This will redirect both stdout and stderr
 # to this log file. See the corresponding printXCodeBuildScriptLogs function in
-# build-utils.sh to print the log after xcodebuild returns.
+# builder-basic.inc.sh to print the log after xcodebuild returns.
 #
-# More information in the build-utils.sh.
+# More information in the builder-basic.inc.sh.
 #
 function logScriptsToFile() {
   local SCRIPT_LOG="$KEYMAN_ROOT/xcodebuild-scripts.log"
diff --git a/resources/build/mac/xcode-wrap.sh b/resources/build/mac/xcode-wrap.sh
new file mode 100755
index 0000000000..3b97ab57fd
--- /dev/null
+++ b/resources/build/mac/xcode-wrap.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# Runs a script using the homebrew version of bash from within an xcode script;
+# we need this because xcode does not inherit paths from user's terminal
+# environment.
+
+echo "xcode-wrap: wrap script for arch $(arch)"
+if [[ $(arch) == i386 ]] && [[ -f /usr/local/bin/bash ]]; then
+  /usr/local/bin/bash -l "$@" || exit $?
+elif [[ $(arch) == arm64 ]] && [[ -f /opt/homebrew/bin/bash ]]; then
+  /opt/homebrew/bin/bash -l "$@" || exit $?
+else
+  >&2 echo "xcode-wrap: Could not start build due to missing homebrew bash"
+  exit 55
+fi
\ No newline at end of file
diff --git a/resources/build/meson/standard.meson.build b/resources/build/meson/standard.meson.build
index 300a00d8e9..6345e67fb2 100644
--- a/resources/build/meson/standard.meson.build
+++ b/resources/build/meson/standard.meson.build
@@ -16,12 +16,6 @@
 cpp_compiler = meson.get_compiler('cpp')
 c_compiler = meson.get_compiler('c')
 
-# Unfortunately this outputs a warning: 'Consider using the built-in option
-# for language standard version instead of using "-std=c++17".'
-# But that is not possible to do after creating the project...
-# See also https://github.com/mesonbuild/meson/issues/10685
-add_project_arguments('-std=c++17', language: 'cpp')
-
 #
 # Standard informational messages for our builds
 #
diff --git a/resources/build/node.inc.sh b/resources/build/node.inc.sh
new file mode 100644
index 0000000000..15e66da78c
--- /dev/null
+++ b/resources/build/node.inc.sh
@@ -0,0 +1,79 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+[[ -z ${_utils_inc_sh+x} ]] && source "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+
+# Verifies that node is installed, and installs npm packages, but only once per
+# build invocation
+node_select_version_and_npm_ci() {
+  # We'll piggy-back on the builder module dependency build state to determine
+  # if npm ci has been called in the current script invocation. Adding the
+  # prefix /external/ to module name in order to differentiate between this and
+  # internal modules (although it is unlikely to ever collide!); we will also
+  # use this pattern for other similar external dependencies in future. These
+  # functions are safe to call even in a non-builder context (they do nothing or
+  # return 1 -- not built)
+  if builder_has_module_been_built /external/npm-ci; then
+    return 0
+  fi
+  builder_set_module_has_been_built /external/npm-ci
+
+  # If we are on CI environment, automatically select a node version with nvm
+  # Also, a developer can set KEYMAN_USE_NVM variable to get this behaviour
+  # automatically too (see /docs/build/node.md)
+  if [[ "$KEYMAN_VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_NVM+x}" ]]; then
+    _node_select_version_with_nvm
+  fi
+
+  # Check if Node.JS/npm is installed.
+  type npm >/dev/null ||\
+    builder_die "Build environment setup error detected!  Please ensure Node.js is installed!"
+
+  pushd "$KEYMAN_ROOT" > /dev/null
+
+  offline_param=
+  if builder_try_offline; then
+    builder_echo "Trying offline build"
+    offline_param=--prefer-offline
+  fi
+  try_multiple_times npm ${offline_param} ci
+
+  popd > /dev/null
+}
+
+_node_print_expected_version() {
+  "$JQ" -r '.engines.node' "$KEYMAN_ROOT/package.json"
+}
+
+# Use nvm to select a node version according to package.json
+# see /docs/build/node.md
+_node_select_version_with_nvm() {
+  local REQUIRED_NODE_VERSION  CURRENT_NODE_VERSION
+
+  REQUIRED_NODE_VERSION="$(_node_print_expected_version)"
+  if [[ -z "$REQUIRED_NODE_VERSION" ]]; then
+    builder_die "Could not find expected Node.js version in $KEYMAN_ROOT/package.json"
+  fi
+
+  if builder_is_windows; then
+    CURRENT_NODE_VERSION="$(node --version)"
+    if [[ "${CURRENT_NODE_VERSION}" != "v${REQUIRED_NODE_VERSION}" ]]; then
+      start //wait //b nvm install "${REQUIRED_NODE_VERSION}"
+      start //wait //b nvm use "${REQUIRED_NODE_VERSION}"
+    fi
+  else
+    # launch nvm in a sub process, see _builder_nvm.sh for details
+    "${KEYMAN_ROOT}/resources/build/_builder_nvm.sh" "${REQUIRED_NODE_VERSION}"
+  fi
+
+  # Now, check that the node version is correct, on all systems
+
+  # Note: On windows, `nvm use` and `nvm install` always return success.
+  # https://github.com/coreybutler/nvm-windows/issues/738
+
+  # note the 'v' prefix that node emits (and npm doesn't!)
+  CURRENT_NODE_VERSION="$(node --version)"
+  if [[ "$CURRENT_NODE_VERSION" != "v$REQUIRED_NODE_VERSION" ]]; then
+    builder_die "Attempted to select node.js version $REQUIRED_NODE_VERSION but found $CURRENT_NODE_VERSION instead"
+  fi
+}
diff --git a/resources/build/pr-build-status/build.sh b/resources/build/pr-build-status/build.sh
index 1b0572b959..ca87de813d 100755
--- a/resources/build/pr-build-status/build.sh
+++ b/resources/build/pr-build-status/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build and test the pr-build-status.yml GHA" build test
diff --git a/resources/build/publish-minimum-versions.sh b/resources/build/publish-minimum-versions.sh
index 4a65c3352d..5da012737a 100755
--- a/resources/build/publish-minimum-versions.sh
+++ b/resources/build/publish-minimum-versions.sh
@@ -8,7 +8,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh"
diff --git a/resources/build/report-history.sh b/resources/build/report-history.sh
index 44eaa5843c..146c665542 100755
--- a/resources/build/report-history.sh
+++ b/resources/build/report-history.sh
@@ -9,10 +9,10 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 BUILD=false
 BASE=`git branch --show-current`
diff --git a/resources/build/run-required-test-builds.sh b/resources/build/run-required-test-builds.sh
index 0d4aa0704e..0ccffd69a2 100755
--- a/resources/build/run-required-test-builds.sh
+++ b/resources/build/run-required-test-builds.sh
@@ -9,7 +9,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
diff --git a/resources/build/sentry-dsym-upload.sh b/resources/build/sentry-dsym-upload.sh
deleted file mode 100755
index 47f73b7a77..0000000000
--- a/resources/build/sentry-dsym-upload.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Calls resource script to perform the dSYM upload
-
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
-phaseSentryDsymUpload "keyman-ios"
\ No newline at end of file
diff --git a/resources/build/set-bundle-versions-untagged.sh b/resources/build/set-bundle-versions-untagged.sh
deleted file mode 100755
index 85ea09f9c3..0000000000
--- a/resources/build/set-bundle-versions-untagged.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Calls script in xcode-utils to update the version
-
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
-phaseSetBundleVersions
\ No newline at end of file
diff --git a/resources/build/test/build-bot/pr-14013-commits.txt b/resources/build/test/build-bot/pr-14013-commits.txt
index abfb04a549..9573e23bcb 100644
--- a/resources/build/test/build-bot/pr-14013-commits.txt
+++ b/resources/build/test/build-bot/pr-14013-commits.txt
@@ -13,7 +13,7 @@
         "email": "marc@durdin.net",
         "date": "2025-04-30T01:59:27Z"
       },
-      "message": "maint(common): consolidate VC++ environment setup for meson\n\nUse the automated environment setup that we built for Windows and\nDeveloper builds in our meson build configurations, so we don't need to\ncall out to vsdevcmd.bat for every build step. This makes the build\nfaster, more consistent across the various ways we call VC++, and\nsimplifies the shell scripts. Removes the complicated build.bat wrappers.\n\nAlso removes the `cleanup_visual_studio_path` function which should no\nlonger be necessary, as our environment builder does the job for us.\n\nMinor complication in that `$TARGET_PATH` variable in kmcmplib/build.sh\nis also used in the Windows environment setup, so eliminated its use in\nkmcmplib/build.sh.\n\nFinally, removes the `$MESON_LOW_VERSION` variable as we know we are\nalways on Meson 1.0 or later now.\n\nBuild-bot: skip developer, windows, foo\nBuild-bot: bash windows",
+      "message": "maint(common): consolidate VC++ environment setup for meson\n\nUse the automated environment setup that we built for Windows and\nDeveloper builds in our meson build configurations, so we don't need to\ncall out to vsdevcmd.bat for every build step. This makes the build\nfaster, more consistent across the various ways we call VC++, and\nsimplifies the shell scripts. Removes the complicated build.bat wrappers.\n\nAlso removes the `cleanup_visual_studio_path` function which should no\nlonger be necessary, as our environment builder does the job for us.\n\nMinor complication in that `$TARGET_PATH` variable in kmcmplib/build.sh\nis also used in the Windows environment setup, so eliminated its use in\nkmcmplib/build.sh.\n\nFinally, removes the `$MESON_LOW_VERSION` variable as we know we are\nalways on Meson 1.0 or later now.\n\nBuild-bot: skip:developer skip:windows\nBuild-bot: build:windows",
       "tree": {
         "sha": "df937f0cb23e2e3736d92cf39b3b7f62ce20bcc1",
         "url": "https://api.github.com/repos/keymanapp/keyman/git/trees/df937f0cb23e2e3736d92cf39b3b7f62ce20bcc1"
@@ -95,7 +95,7 @@
         "email": "noreply@github.com",
         "date": "2025-04-30T02:18:26Z"
       },
-      "message": "Merge branch 'maint/meson-versioning-improvements' into maint/core-developer/12639-meson-no-batch-wrappers\n\nBuild-bot: skip all",
+      "message": "Merge branch 'maint/meson-versioning-improvements' into maint/core-developer/12639-meson-no-batch-wrappers\n\nBuild-bot: skip:all",
       "tree": {
         "sha": "47bb7ca6f52998e8a14e478f5e9f5d7ba415ace3",
         "url": "https://api.github.com/repos/keymanapp/keyman/git/trees/47bb7ca6f52998e8a14e478f5e9f5d7ba415ace3"
diff --git a/resources/build/test/build-bot/trigger-build-bot.test.sh b/resources/build/test/build-bot/trigger-build-bot.test.sh
index 3629cc3c6a..de2f3d5214 100755
--- a/resources/build/test/build-bot/trigger-build-bot.test.sh
+++ b/resources/build/test/build-bot/trigger-build-bot.test.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT_PATH}/../../trigger-definitions.inc.sh"
@@ -31,6 +31,8 @@ test_build_bot_check_messages() {
 
   # test another sequence of commands
   _do_test_build_bot_check_messages_inline 8 "[windows]=release" '[common]="release" [windows]="skip" [developer]="build"' '{ "body": "Build-bot: skip windows\nBuild-bot: build developer\nBuild-bot: release common" }' '[]'
+  _do_test_build_bot_check_messages_inline 9 "[windows]=release" '[common]="release" [windows]="skip" [developer]="build"' '{ "body": "Build-bot: skip:windows build:developer release:common" }' '[]'
+  _do_test_build_bot_check_messages_inline 10 "[windows]=release" '[common]="release" [windows]="build"' '{ "body": "Build-bot: skip:windows build release:common" }' '[]'
 
   # Test some bad inputs
   _do_test_build_bot_check_messages_inline 1 "[windows]=release" '[windows]="release"' '{}' '[{ "commit": { "message": "maint(common): test\nBuild-bot: foo windows\n" }}]'
@@ -63,10 +65,10 @@ _do_test_build_bot_check_messages_file() {
   build_bot_check_messages $prnum "$(cat ${THIS_SCRIPT_PATH}/pr-$prnum-data.txt)" "$(cat ${THIS_SCRIPT_PATH}/pr-$prnum-commits.txt)"
 
   for i in "${!expected_build_platforms[@]}"; do
-    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "PR #$prnum: build_platforms[$i]"
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
   done
   for i in "${!build_platforms[@]}"; do
-    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "PR #$prnum: build_platforms[$i]"
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
   done
 }
 
@@ -90,10 +92,10 @@ _do_test_build_bot_check_messages_inline() {
   build_bot_check_messages $prnum "$prinfo" "$prcommits"
 
   for i in "${!expected_build_platforms[@]}"; do
-    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "PR #$prnum: build_platforms[$i]"
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
   done
   for i in "${!build_platforms[@]}"; do
-    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "PR #$prnum: build_platforms[$i]"
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
   done
 }
 
@@ -103,13 +105,21 @@ _do_test_build_bot_check_messages_inline() {
 
 test_build_bot_update_commands() {
   builder_echo start test_build_bot_update_commands 'START TEST: build_bot_update_commands'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip:windows" '[windows]="skip"'
   _do_test_build_bot_update_commands '[windows]="release"' "skip windows" '[windows]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip:windows,developer" '[windows]="skip" [developer]="skip"'
   _do_test_build_bot_update_commands '[windows]="release"' "skip windows,developer" '[windows]="skip" [developer]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:developer" '[windows]="release" [developer]="build"'
   _do_test_build_bot_update_commands '[windows]="release"' "build developer" '[windows]="release" [developer]="build"'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip:windows" '[windows]="skip"'
   _do_test_build_bot_update_commands '[windows]="release"' "skip windows" '[windows]="skip"'
-  _do_test_build_bot_update_commands '[windows]="release"' "access foo" '[windows]="release"'
-  _do_test_build_bot_update_commands '[windows]="release"' "build foo" '[windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "access:foo" '[windows]="release"'
+  # not testing invalid legacy command: _do_test_build_bot_update_commands '[windows]="release"' "access foo" '[windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:foo" '[windows]="release"'
+  # not testing invalid legacy command: _do_test_build_bot_update_commands '[windows]="release"' "build foo" '[windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:common" '[common]="build" [windows]="release"'
   _do_test_build_bot_update_commands '[windows]="release"' "build common" '[common]="build" [windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:all" "$ALL_BUILD_PLATFORMS_BUILD_EXPECTED"
   _do_test_build_bot_update_commands '[windows]="release"' "build all" "$ALL_BUILD_PLATFORMS_BUILD_EXPECTED"
   builder_echo end test_build_bot_update_commands success 'SUCCESS: build_bot_update_commands'
 }
diff --git a/resources/build/test/build-utils-traps.test.sh b/resources/build/test/build-utils-traps.test.sh
index 3ed6d89a37..472990102b 100755
--- a/resources/build/test/build-utils-traps.test.sh
+++ b/resources/build/test/build-utils-traps.test.sh
@@ -5,10 +5,10 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ##############
 
@@ -16,7 +16,7 @@ CHECK="${COLOR_GREEN}✔${COLOR_RESET}" # ✔
 CROSS="${COLOR_RED}❌${COLOR_RESET}" # ❌
 
 builder_describe \
-  "Provides actions useful for build-utils.sh trap-functionality unit testing.\nOnly one action may be set at a time." \
+  "Provides actions useful for builder-basic.inc.sh trap-functionality unit testing.\nOnly one action may be set at a time." \
   "error" \
   "error-in-function" \
   "incomplete"
diff --git a/resources/build/test/build.sh b/resources/build/test/build.sh
index 68aa96f461..d1dec4a505 100755
--- a/resources/build/test/build.sh
+++ b/resources/build/test/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/resources/build/test/builder-deps.test.sh b/resources/build/test/builder-deps.test.sh
index 7be2d6a37c..f4d4fd949e 100755
--- a/resources/build/test/builder-deps.test.sh
+++ b/resources/build/test/builder-deps.test.sh
@@ -5,10 +5,10 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe \
   "Tests dependency builds" \
diff --git a/resources/build/test/builder-invalid-script-1.test.sh b/resources/build/test/builder-invalid-script-1.test.sh
index 098760ec63..e5b5c6c9d0 100755
--- a/resources/build/test/builder-invalid-script-1.test.sh
+++ b/resources/build/test/builder-invalid-script-1.test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test that missing builder_describe causes an error exit 1
diff --git a/resources/build/test/builder-invalid-script-2.test.sh b/resources/build/test/builder-invalid-script-2.test.sh
index 5b3886d2e0..f68f57d7de 100755
--- a/resources/build/test/builder-invalid-script-2.test.sh
+++ b/resources/build/test/builder-invalid-script-2.test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test that missing builder_parse causes an error exit 1
diff --git a/resources/build/test/builder-invalid-script-3.test.sh b/resources/build/test/builder-invalid-script-3.test.sh
index 811b4b43ef..40575cc4d8 100755
--- a/resources/build/test/builder-invalid-script-3.test.sh
+++ b/resources/build/test/builder-invalid-script-3.test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test that error exit does not occur, should exit 0
diff --git a/resources/build/test/debug-deps/child/build.sh b/resources/build/test/debug-deps/child/build.sh
index 6fc83b3fd9..36dce11e3c 100755
--- a/resources/build/test/debug-deps/child/build.sh
+++ b/resources/build/test/debug-deps/child/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/resources/build/test/debug-deps/child/dep/build.sh b/resources/build/test/debug-deps/child/dep/build.sh
index c5ad0216bb..8880752687 100755
--- a/resources/build/test/debug-deps/child/dep/build.sh
+++ b/resources/build/test/debug-deps/child/dep/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/resources/build/test/debug-deps/dep/build.sh b/resources/build/test/debug-deps/dep/build.sh
index e94839b61a..ad25f89ad0 100755
--- a/resources/build/test/debug-deps/dep/build.sh
+++ b/resources/build/test/debug-deps/dep/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/resources/build/test/debug-deps/dep/child/build.sh b/resources/build/test/debug-deps/dep/child/build.sh
index a1b405f512..334f715640 100755
--- a/resources/build/test/debug-deps/dep/child/build.sh
+++ b/resources/build/test/debug-deps/dep/child/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/resources/build/test/debug-deps/test.sh b/resources/build/test/debug-deps/test.sh
index 5465c35e77..1ccbd45641 100755
--- a/resources/build/test/debug-deps/test.sh
+++ b/resources/build/test/debug-deps/test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/resources/build/test/dependencies/basic/app/build.sh b/resources/build/test/dependencies/basic/app/build.sh
index a8995d072a..452f957e0a 100755
--- a/resources/build/test/dependencies/basic/app/build.sh
+++ b/resources/build/test/dependencies/basic/app/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/basic/library/build.sh b/resources/build/test/dependencies/basic/library/build.sh
index e0f5a58113..8d7aa9db37 100755
--- a/resources/build/test/dependencies/basic/library/build.sh
+++ b/resources/build/test/dependencies/basic/library/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/error/app/build.sh b/resources/build/test/dependencies/error/app/build.sh
index 916da067b8..244365e1fa 100755
--- a/resources/build/test/dependencies/error/app/build.sh
+++ b/resources/build/test/dependencies/error/app/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/error/error/build.sh b/resources/build/test/dependencies/error/error/build.sh
index d5ab14c44f..9c02a32888 100755
--- a/resources/build/test/dependencies/error/error/build.sh
+++ b/resources/build/test/dependencies/error/error/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/targets/app/build.sh b/resources/build/test/dependencies/targets/app/build.sh
index 123b878f9a..e01c40f34f 100755
--- a/resources/build/test/dependencies/targets/app/build.sh
+++ b/resources/build/test/dependencies/targets/app/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/targets/library/build.sh b/resources/build/test/dependencies/targets/library/build.sh
index 9239018258..7ad939a10b 100755
--- a/resources/build/test/dependencies/targets/library/build.sh
+++ b/resources/build/test/dependencies/targets/library/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/test.sh b/resources/build/test/dependencies/test.sh
index 059095b679..74a727721b 100755
--- a/resources/build/test/dependencies/test.sh
+++ b/resources/build/test/dependencies/test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/test/ignored-flags/build.sh b/resources/build/test/ignored-flags/build.sh
index 4202cb538d..a4c75443e9 100755
--- a/resources/build/test/ignored-flags/build.sh
+++ b/resources/build/test/ignored-flags/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/ignored-flags/child/build.sh b/resources/build/test/ignored-flags/child/build.sh
index b891c7cb20..aba203c03f 100755
--- a/resources/build/test/ignored-flags/child/build.sh
+++ b/resources/build/test/ignored-flags/child/build.sh
@@ -5,7 +5,7 @@ echo "Params: $@"
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test missing actions and options
diff --git a/resources/build/test/ignored-flags/test.sh b/resources/build/test/ignored-flags/test.sh
index bb4660f294..b84ba5cc89 100755
--- a/resources/build/test/ignored-flags/test.sh
+++ b/resources/build/test/ignored-flags/test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/test/locate_emscripten.tests.sh b/resources/build/test/locate_emscripten.tests.sh
index cae2f4e825..2914510756 100755
--- a/resources/build/test/locate_emscripten.tests.sh
+++ b/resources/build/test/locate_emscripten.tests.sh
@@ -8,7 +8,7 @@ shopt -s inherit_errexit
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
diff --git a/resources/build/test/test.sh b/resources/build/test/test.sh
index 788af8c338..12530335af 100755
--- a/resources/build/test/test.sh
+++ b/resources/build/test/test.sh
@@ -5,10 +5,10 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 cd "$THIS_SCRIPT_PATH"
 
@@ -109,7 +109,7 @@ builder_parse_test() {
 }
 
 builder_describe \
-  "Tests the build-utils.sh builder functions. This is merely an example." \
+  "Tests the builder-basic.inc.sh builder functions. This is merely an example." \
   "clean        Cleans up any build artifacts" \
   "build        Do some building" \
   "test         Does some test stuff" \
diff --git a/resources/build/test/testing-framework.tests.sh b/resources/build/test/testing-framework.tests.sh
index 540e540fe6..15d4597cba 100755
--- a/resources/build/test/testing-framework.tests.sh
+++ b/resources/build/test/testing-framework.tests.sh
@@ -10,7 +10,7 @@ shopt -s inherit_errexit
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
diff --git a/resources/build/test/trap-test-builds.test.sh b/resources/build/test/trap-test-builds.test.sh
index 97d9e28f94..0c4a2d6e34 100755
--- a/resources/build/test/trap-test-builds.test.sh
+++ b/resources/build/test/trap-test-builds.test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/resources/build/test/trees/build.sh b/resources/build/test/trees/build.sh
index 8dad297009..1a37d15032 100755
--- a/resources/build/test/trees/build.sh
+++ b/resources/build/test/trees/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/trees/child1/build.sh b/resources/build/test/trees/child1/build.sh
index 82cfc1d03d..e03a692db8 100755
--- a/resources/build/test/trees/child1/build.sh
+++ b/resources/build/test/trees/child1/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/trees/child2/build.sh b/resources/build/test/trees/child2/build.sh
index 240fbb42e7..50a76c2c4e 100755
--- a/resources/build/test/trees/child2/build.sh
+++ b/resources/build/test/trees/child2/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/trees/child3_renamed/src/build.sh b/resources/build/test/trees/child3_renamed/src/build.sh
index ab70161fb7..0dd5f63dec 100755
--- a/resources/build/test/trees/child3_renamed/src/build.sh
+++ b/resources/build/test/trees/child3_renamed/src/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/trees/dep/build.sh b/resources/build/test/trees/dep/build.sh
index 9ef0e9fe4e..7cb910dd4d 100755
--- a/resources/build/test/trees/dep/build.sh
+++ b/resources/build/test/trees/dep/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/trees/test.sh b/resources/build/test/trees/test.sh
index 1abfdd6cc6..7be2b868a9 100755
--- a/resources/build/test/trees/test.sh
+++ b/resources/build/test/trees/test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/test/verify-colors.test.sh b/resources/build/test/verify-colors.test.sh
index 1c818f04f2..7651e6c860 100755
--- a/resources/build/test/verify-colors.test.sh
+++ b/resources/build/test/verify-colors.test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_use_color true
diff --git a/resources/build/test/zip.inc.tests.sh b/resources/build/test/zip.inc.tests.sh
index 8c8a7be4b4..056ddc2ce1 100755
--- a/resources/build/test/zip.inc.tests.sh
+++ b/resources/build/test/zip.inc.tests.sh
@@ -4,7 +4,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=2154
diff --git a/resources/build/trigger-build-bot.inc.sh b/resources/build/trigger-build-bot.inc.sh
index f9b428be35..298981f6b7 100644
--- a/resources/build/trigger-build-bot.inc.sh
+++ b/resources/build/trigger-build-bot.inc.sh
@@ -66,8 +66,8 @@ function build_bot_check_messages() {
 
 
   IFS=$'\n'
-  local buildBotCommands=($(echo "$prcommits" | "${JQ}" -r '.[].commit.message' | grep 'Build-bot:' | cut -d: -f 2 -))
-  local prCommands=($(echo "$prinfo" | "${JQ}" -r '.body' | tr -d '\r' | grep 'Build-bot:' | cut -d: -f 2 -))
+  local buildBotCommands=($(echo "$prcommits" | "${JQ}" -r '.[].commit.message' | grep 'Build-bot:' | cut -c 11- -))
+  local prCommands=($(echo "$prinfo" | "${JQ}" -r '.body' | tr -d '\r' | grep 'Build-bot:' | cut -c 11- -))
   unset IFS
 
   # The PR body Build-bot comment will be read last, which allows it to override
@@ -79,13 +79,15 @@ function build_bot_check_messages() {
 
   for buildBotCommand in "${buildBotCommands[@]}"; do
     # Block illegal Build-bot: commands
-    if [[ ! "$buildBotCommand" =~ ^[a-z,\ ]+$ ]]; then
+    if [[ ! "$buildBotCommand" =~ ^[a-z,\ :]+$ ]]; then
       builder_echo warning "WARNING[Build-bot]: ignoring invalid command: '${buildBotCommand}'"
       continue
     fi
 
-    # We now know that our command has only a-z, comma and space, so we can
-    # parse without risking escaping our bash jail
+    # debug_echo "buildBotCommand:{$buildBotCommand}"
+
+    # We now know that our command has only a-z, comma, colon, and space, so we
+    # can parse without risking escaping our bash jail
 
     if [[ ! -z "${buildBotCommand// }" ]]; then
       build_bot_update_commands $buildBotCommand
@@ -96,7 +98,7 @@ function build_bot_check_messages() {
 }
 
 #
-# parses a 'Build-bot: <level> [platform...]' command and modifies
+# parses a 'Build-bot: <level>[[:| ]platform,...]' command and modifies
 # the global build_platforms associative array with new levels.
 #
 # Note that this function assumes that inputs are sanitized, see
@@ -107,34 +109,71 @@ function build_bot_update_commands() {
   local platforms=
   local command="$*"
 
-  if [[ $# == 1 ]]; then
-    level=$1
-    platforms=all
+  local re='^(build|skip|release)( [a-z,]+)?$'
+  if [[ "$command" =~ $re ]]; then
+    # legacy (until aug 2025) format is "level [platform]" (comma format never used)
+    if [[ $# == 1 ]]; then
+      level=$1
+      platforms="${!build_platforms[@]}"
+    else
+      level=$1
+      shift
+
+      # remaining parameters are comma/space separated platforms
+      IFS=','
+      read -r -a platforms <<< "$*"
+      unset IFS
+    fi
+
+    if [[ ! $level =~ ^$valid_build_levels$ ]]; then
+      # Just skip this build command
+      builder_echo warning "WARNING[Build-bot]: ignoring invalid build level '$level' in command '$command'"
+      return 0
+    fi
+
+    build_bot_verify_platforms platforms
+
+    local platform
+    for platform in "${platforms[@]}"; do
+      builder_echo "Build-bot: Updating build level for $platform to $level"
+      build_platforms[$platform]=$level
+    done
   else
-    level=$1
-    shift
-
-    # remaining parameters are comma/space separated platforms
-    IFS=', '
-    read -r -a platforms <<< "$*"
+    # modern format is "level[:platform[,platform...]][ level[:platform[,platform...]]...]"
+    declare -a commands
+    IFS=' '
+    read -r -a commands <<< "$command"
     unset IFS
+
+    for command in "${commands[@]}"; do
+      declare -a params
+      IFS=:
+      read -r -a params <<< "$command"
+      level=${params[0]}
+      if [[ ! $level =~ ^$valid_build_levels$ ]]; then
+        # Just skip this build command
+        builder_echo warning "WARNING[Build-bot]: ignoring invalid build level '$level' in command '$command'"
+        continue
+      fi
+
+      if [[ ${#params[@]} == 1 ]]; then
+        platforms="${!build_platforms[@]}"
+      else
+        # remaining parameters are comma separated platforms
+        IFS=','
+        read -r -a platforms <<< "${params[1]}"
+        unset IFS
+      fi
+
+      build_bot_verify_platforms platforms
+
+      local platform
+      for platform in "${platforms[@]}"; do
+        builder_echo "Build-bot: Updating build level for $platform to $level"
+        build_platforms[$platform]=$level
+      done
+    done
   fi
-
-  if [[ ! $level =~ ^$valid_build_levels$ ]]; then
-    # Just skip this build command
-    builder_echo warning "WARNING[Build-bot]: ignoring invalid build level '$level' in command '$command'"
-    return 0
-  fi
-
-  build_bot_verify_platforms platforms
-
-  # a build command should be <level> [platform[, platform...]]
-
-  local platform
-  for platform in "${platforms[@]}"; do
-    builder_echo "Build-bot: Updating build level for $platform to $level"
-    build_platforms[$platform]=$level
-  done
 }
 
 #
diff --git a/resources/build/typescript.inc.sh b/resources/build/typescript.inc.sh
new file mode 100644
index 0000000000..54e3956951
--- /dev/null
+++ b/resources/build/typescript.inc.sh
@@ -0,0 +1,43 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+#
+# Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
+#
+# Usage:
+#   builder_run_action  test    typescript_run_eslint_mocha_tests [coverage_threshold]
+# Parameters:
+#   1: coverage_threshold   optional, minimum coverage for c8 to pass tests,
+#                           defaults to 90 (percent)
+typescript_run_eslint_mocha_tests() {
+  local MOCHA_FLAGS=
+
+  if builder_is_running_on_teamcity; then
+    # we're running in TeamCity
+    MOCHA_FLAGS="-reporter mocha-teamcity-reporter"
+  fi
+
+  eslint .
+  tsc --build test/
+
+  local THRESHOLD_PARAMS=
+  local C8_THRESHOLD=
+  if [[ $# -gt 0 ]]; then
+    C8_THRESHOLD=$1
+    THRESHOLD_PARAMS="--lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD"
+  else
+    # Seems like a bug in TeamCity reporter if we don't list default thresholds,
+    # see #13418.
+    #
+    # Making branch and function thresholds slightly lower, because the default
+    # for c8 is 0 for these anyway.
+    THRESHOLD_PARAMS="--lines 90 --statements 90 --branches 80 --functions 80"
+  fi
+
+  c8 --reporter=lcov --reporter=text --exclude-after-remap --check-coverage $THRESHOLD_PARAMS mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
+
+  if [[ ! -z "$C8_THRESHOLD" ]]; then
+    builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
+    builder_echo warning "Please increase threshold in build.sh as test coverage improves."
+  fi
+}
diff --git a/resources/build/utils.inc.sh b/resources/build/utils.inc.sh
new file mode 100644
index 0000000000..d8b0e6fa7f
--- /dev/null
+++ b/resources/build/utils.inc.sh
@@ -0,0 +1,132 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/jq.inc.sh"
+
+_utils_inc_sh=1
+
+#
+# Write ${UPLOAD_DIR}/${ARTIFACT_FILENAME}.download_info file for the target
+# artifact
+#
+# Parameters:
+#   1: UPLOAD_DIR          Directory where artifact can be found
+#   2: ARTIFACT_FILENAME   Filename (without path) of artifact
+#   3: ARTIFACT_NAME       Descriptive name of artifact
+#   4: ARTIFACT_TYPE       File extension of artifact, without initial period (e.g. tar.gz)
+#   5: PLATFORM            Target platform for artifact
+#
+# TODO: Move to CI include?
+write_download_info() {
+  local UPLOAD_DIR="$1"
+  local ARTIFACT_FILENAME="$2"
+  local ARTFIACT_NAME="$3"
+  local ARTIFACT_TYPE="$4"
+  local PLATFORM="$5"
+
+  local DATE HASH SIZE DOWNLOAD_INFO STAT_FLAGS
+
+  if [[ ! "${PLATFORM}" =~ ^(android|ios|linux|mac|web|win)$ ]]; then
+    builder_die "Invalid project ${PLATFORM}"
+  fi
+
+  # shellcheck disable=SC2312
+  if builder_is_macos && [[ $(command -v stat) == /usr/bin/stat ]]; then
+    # /usr/bin/stat on mac is BSD
+    STAT_FLAGS="-f%z"
+  else
+    # GNU (coreutils)
+    STAT_FLAGS="--print=%s"
+  fi
+
+  # Construct .download_info
+  DATE=$(date +%F)
+  # shellcheck disable=SC2312
+  HASH=$(md5sum "${UPLOAD_DIR}/${ARTIFACT_FILENAME}" | cut -d ' ' -f 1)
+  # shellcheck disable=SC2248
+  SIZE=$(stat ${STAT_FLAGS} "${UPLOAD_DIR}/${ARTIFACT_FILENAME}")
+
+  # shellcheck disable=SC2016,SC2154
+  DOWNLOAD_INFO=$(
+    "${JQ}" -n \
+    --arg NAME "${ARTFIACT_NAME}" \
+    --arg BUILD_NUMBER "${KEYMAN_VERSION}" \
+    --arg DATE "${DATE}" \
+    --arg PLATFORM "${PLATFORM}" \
+    --arg KEYMAN_TIER "${KEYMAN_TIER}" \
+    --arg FILENAME "${ARTIFACT_FILENAME}" \
+    --arg ARTIFACT_TYPE "${ARTIFACT_TYPE}" \
+    --arg HASH "${HASH}" \
+    --arg BUILD_COUNTER "${KEYMAN_VERSION_PATCH}" \
+    --arg SIZE "${SIZE}" \
+    '{
+      name: $NAME, version: $BUILD_NUMBER, date: $DATE, platform: $PLATFORM,
+      stability: $KEYMAN_TIER, file: $FILENAME, md5: $HASH, type: $ARTIFACT_TYPE,
+      build: $BUILD_COUNTER, size: $SIZE
+    }'
+  )
+  echo "${DOWNLOAD_INFO}" | "${JQ}" . >> "${UPLOAD_DIR}/${ARTIFACT_FILENAME}.download_info"
+}
+
+#
+# Re-runs the specified command-line instruction up to 5 times should it fail, waiting a
+# random delay between each attempt.  No re-runs are attempted after successful commands.
+#
+# ### Usage
+#   try_multiple_times command [param1 param2...]
+#
+# ### Parameters
+#   1: $@         command-line arguments
+try_multiple_times ( ) {
+  _try_multiple_times 0 "$@"
+}
+
+# $1  The current retry count
+# $2+ (everything else) the command to retry should it fail
+_try_multiple_times ( ) {
+  local RETRY_MAX=5
+
+  # Configuration:  wait between 10 sec and 120 sec.
+
+  # in seconds.
+  local RETRY_MAX_WAIT_RANGE=111
+  # in seconds
+  local RETRY_MIN_WAIT=10
+
+  local retryCount=$1
+  shift
+
+  if (( "$retryCount" == "$RETRY_MAX" )); then
+    builder_die "Retry limit of $RETRY_MAX attempts reached."
+  fi
+
+  retryCount=$(( $retryCount + 1 ))
+
+  if (( $retryCount != 1 )); then
+    local wait_length=$(( RANDOM % RETRY_MAX_WAIT_RANGE + RETRY_MIN_WAIT ))
+    builder_echo "Delaying $wait_length seconds before attempt $retryCount: \`$@\`"
+    sleep $wait_length
+  fi
+
+  local code=0
+  "$@" || code=$?
+  if (( $code != 0 )); then
+    builder_echo "Command failed with error $code"
+    _try_multiple_times $retryCount "$@"
+  fi
+}
+
+#
+# Wrapper for check-markdown tool to verify links within and validity of all .md
+# files in a folder and its sub-folders
+#
+# Usage:
+#   check-markdown path_root
+# Parameters:
+#   1: path_root    path to base folder containing .md files to be checked
+#
+check-markdown() {
+  node "$KEYMAN_ROOT/resources/tools/check-markdown" --root "$1"
+}
+
diff --git a/resources/build/version/build.sh b/resources/build/version/build.sh
index f6e01bcec3..ccf97a2a19 100755
--- a/resources/build/version/build.sh
+++ b/resources/build/version/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -17,5 +18,5 @@ builder_describe_outputs \
 builder_parse "$@"
 
 builder_run_action clean      rm -rf build/ node_modules/ dist/ lib/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
diff --git a/resources/build/xcode-wrap.sh b/resources/build/xcode-wrap.sh
deleted file mode 100755
index 61d79ca24e..0000000000
--- a/resources/build/xcode-wrap.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-echo "wrap script for arch $(arch)"
-if [[ $(arch) == i386 ]] && [[ -f /usr/local/bin/bash ]]; then
-  /usr/local/bin/bash -l "$@" || exit $?
-elif [[ $(arch) == arm64 ]] && [[ -f /opt/homebrew/bin/bash ]]; then
-  /opt/homebrew/bin/bash -l "$@" || exit $?
-else
-  >&2 echo "Could not start build due to missing homebrew bash"
-  exit 55
-fi 
\ No newline at end of file
diff --git a/resources/builder.inc.sh b/resources/builder.inc.sh
index ae6d9ff105..249b3d585b 100755
--- a/resources/builder.inc.sh
+++ b/resources/builder.inc.sh
@@ -19,7 +19,7 @@
 # * _builder_ functions and variables are internal use only for builder.inc.sh, and
 #   subject to change at any time. Do not use them in other scripts.
 # * Note: the running script is the top-level script that includes either
-#   builder.inc.sh directly, or, just in the Keyman repo, via build-utils.sh.
+#   builder.inc.sh directly, or, just in the Keyman repo, via builder-basic.inc.sh.
 #
 
 # Exit on command failure and when using unset variables:
@@ -627,7 +627,7 @@ builder_has_action() {
 #   }
 #
 #   builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-#   builder_run_action configure    verify_npm_setup
+#   builder_run_action configure    node_select_version_and_npm_ci
 #   builder_run_action build        do_build
 # ```
 #
@@ -1542,7 +1542,7 @@ _builder_parse_expanded_parameters() {
 
     # Per #11106, local builds use --debug by default.
     # Second condition prevents the block (and message) from executing when --debug is already specified explicitly.
-    if [[ $KEYMAN_VERSION_ENVIRONMENT == "local" ]] && [[ $builder_debug != --debug ]] && ! $is_release; then
+    if [[ ${KEYMAN_VERSION_ENVIRONMENT:-} == "local" ]] && [[ $builder_debug != --debug ]] && ! $is_release; then
       builder_echo grey "Local build environment detected:  setting --debug"
       _params+=(--debug)
       _builder_chosen_options+=(--debug)
@@ -2208,7 +2208,7 @@ builder_is_ci_build() {
 # Returns 0 if current build is running as a release build in CI
 #
 builder_is_ci_release_build() {
-  if [[ "$KEYMAN_VERSION_ENVIRONMENT" =~ ^alpha|beta|stable$ ]]; then
+  if [[ "${KEYMAN_VERSION_ENVIRONMENT:-}" =~ ^alpha|beta|stable$ ]]; then
     return 0
   fi
   return 1
@@ -2219,7 +2219,7 @@ builder_is_ci_release_build() {
 # mainline branch test
 #
 builder_is_ci_test_build() {
-  if [[ "$KEYMAN_VERSION_ENVIRONMENT" == test ]]; then
+  if [[ "${KEYMAN_VERSION_ENVIRONMENT:-}" == test ]]; then
     return 0
   fi
   return 1
@@ -2233,7 +2233,7 @@ builder_is_ci_build_level_release() {
   if builder_is_ci_release_build; then
     return 0
   fi
-  if [[ "$KEYMAN_BUILD_LEVEL" == release ]]; then
+  if [[ "${KEYMAN_BUILD_LEVEL:-}" == release ]]; then
     return 0
   fi
   return 1
diff --git a/resources/docker-images/build.sh b/resources/docker-images/build.sh
index b650b9ce55..07223787cd 100755
--- a/resources/docker-images/build.sh
+++ b/resources/docker-images/build.sh
@@ -3,13 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
 
 . "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/docker-images/docker-build.inc.sh"
 
 builder_describe \
diff --git a/resources/docker-images/docker-build.inc.sh b/resources/docker-images/docker-build.inc.sh
index 9685116955..44c129ac20 100644
--- a/resources/docker-images/docker-build.inc.sh
+++ b/resources/docker-images/docker-build.inc.sh
@@ -1,7 +1,7 @@
 # shellcheck shell=bash
 # no hashbang for .inc.sh
 
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 
 _add_build_args() {
   local var=$1
diff --git a/resources/docker-images/run.sh b/resources/docker-images/run.sh
index 2c8cd3e51d..6603745c83 100755
--- a/resources/docker-images/run.sh
+++ b/resources/docker-images/run.sh
@@ -3,12 +3,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh"
 . "${KEYMAN_ROOT}/resources/docker-images/docker-build.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/resources/shellHelperFunctions.sh b/resources/shellHelperFunctions.sh
deleted file mode 100755
index 4e22f2ee55..0000000000
--- a/resources/shellHelperFunctions.sh
+++ /dev/null
@@ -1,334 +0,0 @@
-#!/usr/bin/env bash
-# Keyman is copyright (C) SIL Global. MIT License.
-
-# shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/build/jq.inc.sh"
-
-# Allows for a quick macOS check for those scripts requiring a macOS environment.
-verify_on_mac() {
-  if ! builder_is_macos; then
-    builder_die "This build script will only run in a Mac environment."
-    exit 1
-  fi
-}
-
-# The list of valid platforms that our build scripts ought expect.
-platforms=("android" "ios" "linux" "lmlayer" "mac" "web" "win")
-
-# Used to validate a specified 'platform' parameter.
-_verify_platform() {
-  match=false
-  for proj in "${platforms[@]}"
-  do
-    if [[ "${proj}" = "$1" ]]; then
-      match=true
-    fi
-  done
-
-  if [[ ${match} = false ]]; then
-    builder_die "Invalid project specified!"
-  fi
-}
-
-displayInfo() {
-  # TODO: can we replace this function with builder_debug?
-  if [[ "${QUIET}" != true ]]; then
-    while [[ $# -gt 0 ]] ; do
-      echo "$1"
-      shift # past argument
-    done
-  fi
-}
-
-assertFileExists() {
-  if ! [[ -f $1 ]]; then
-    builder_die "Build failed:  missing $1"
-  fi
-}
-
-assertDirExists() {
-  if ! [[ -d $1 ]]; then
-    builder_die "Build failed:  missing $1"
-  fi
-}
-
-assertValidVersionNbr()
-{
-  # REVIEW: this function doesn't seem to be used anywhere in the codebase.
-  if [[ "$1" == "" || ! "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-    builder_die "Specified version not valid: '$1'. Version should be in the form Major.Minor.BuildCounter"
-  fi
-}
-
-assertValidPRVersionNbr()
-{
-  # REVIEW: this function doesn't seem to be used anywhere in the codebase.
-  if [[ "$1" == "" || ! "$1" =~ ^[0-9]+\.[0-9]+\.pull\.[0-9]+$ ]]; then
-    builder_die "Specified version not valid: '$1'. Version should be in the form Major.Minor.pull.BuildCounter"
-  fi
-}
-
-#
-# Write ${UPLOAD_DIR}/${ARTIFACT_FILENAME}.download_info file for the target
-# artifact
-#
-# Parameters:
-#   1: UPLOAD_DIR          Directory where artifact can be found
-#   2: ARTIFACT_FILENAME   Filename (without path) of artifact
-#   3: ARTIFACT_NAME       Descriptive name of artifact
-#   4: ARTIFACT_TYPE       File extension of artifact, without initial period (e.g. tar.gz)
-#   5: PLATFORM            Target platform for artifact
-#
-write_download_info() {
-  local UPLOAD_DIR="$1"
-  local ARTIFACT_FILENAME="$2"
-  local ARTFIACT_NAME="$3"
-  local ARTIFACT_TYPE="$4"
-  local PLATFORM="$5"
-
-  local DATE HASH SIZE DOWNLOAD_INFO STAT_FLAGS
-
-  _verify_platform "${PLATFORM}"
-
-  # shellcheck disable=SC2312
-  if builder_is_macos && [[ $(command -v stat) == /usr/bin/stat ]]; then
-    # /usr/bin/stat on mac is BSD
-    STAT_FLAGS="-f%z"
-  else
-    # GNU (coreutils)
-    STAT_FLAGS="--print=%s"
-  fi
-
-  # Construct .download_info
-  DATE=$(date +%F)
-  # shellcheck disable=SC2312
-  HASH=$(md5sum "${UPLOAD_DIR}/${ARTIFACT_FILENAME}" | cut -d ' ' -f 1)
-  # shellcheck disable=SC2248
-  SIZE=$(stat ${STAT_FLAGS} "${UPLOAD_DIR}/${ARTIFACT_FILENAME}")
-
-  # shellcheck disable=SC2016,SC2154
-  DOWNLOAD_INFO=$(
-    "${JQ}" -n \
-    --arg NAME "${ARTFIACT_NAME}" \
-    --arg BUILD_NUMBER "${KEYMAN_VERSION}" \
-    --arg DATE "${DATE}" \
-    --arg PLATFORM "${PLATFORM}" \
-    --arg KEYMAN_TIER "${KEYMAN_TIER}" \
-    --arg FILENAME "${ARTIFACT_FILENAME}" \
-    --arg ARTIFACT_TYPE "${ARTIFACT_TYPE}" \
-    --arg HASH "${HASH}" \
-    --arg BUILD_COUNTER "${KEYMAN_VERSION_PATCH}" \
-    --arg SIZE "${SIZE}" \
-    '{
-      name: $NAME, version: $BUILD_NUMBER, date: $DATE, platform: $PLATFORM,
-      stability: $KEYMAN_TIER, file: $FILENAME, md5: $HASH, type: $ARTIFACT_TYPE,
-      build: $BUILD_COUNTER, size: $SIZE
-    }'
-  )
-  echo "${DOWNLOAD_INFO}" | "${JQ}" . >> "${UPLOAD_DIR}/${ARTIFACT_FILENAME}.download_info"
-}
-
-# set_version sets the file version on mac/ios projects
-set_version ( ) {
-  # REVIEW: this function doesn't seem to be used anywhere in the codebase.
-  PRODUCT_PATH=$1
-
-  if [ $KEYMAN_VERSION ]; then
-    if [ $2 ]; then  # $2 = product name.
-      echo "Setting version numbers in $2 to $KEYMAN_VERSION."
-    fi
-    /usr/libexec/Plistbuddy -c "Set CFBundleVersion $KEYMAN_VERSION" "$PRODUCT_PATH/Info.plist"
-    /usr/libexec/Plistbuddy -c "Set CFBundleShortVersionString $KEYMAN_VERSION" "$PRODUCT_PATH/Info.plist"
-  fi
-}
-
-
-# Uses npm to set the current package version (package.json).
-#
-# This sets the version according to the current KEYMAN_VERSION_WITH_TAG.
-#
-# Usage:
-#
-#   set_npm_version
-#
-set_npm_version () {
-  # REVIEW: this function doesn't seem to be used anywhere in the codebase.
-
-  # We use --no-git-tag-version because our CI system controls version numbering and
-  # already tags releases. We also want to have the version of this match the
-  # release of Keyman Developer -- these two versions should be in sync. Because this
-  # is a large repo with multiple projects and build systems, it's better for us that
-  # individual build systems don't take too much ownership of git tagging. :)
-  npm version --allow-same-version --no-git-tag-version --no-commit-hooks "$KEYMAN_VERSION_WITH_TAG"
-}
-
-#
-# Re-runs the specified command-line instruction up to 5 times should it fail, waiting a
-# random delay between each attempt.  No re-runs are attempted after successful commands.
-#
-# ### Usage
-#   try_multiple_times command [param1 param2...]
-#
-# ### Parameters
-#   1: $@         command-line arguments
-try_multiple_times ( ) {
-  _try_multiple_times 0 "$@"
-}
-
-# $1  The current retry count
-# $2+ (everything else) the command to retry should it fail
-_try_multiple_times ( ) {
-  local RETRY_MAX=5
-
-  # Configuration:  wait between 10 sec and 120 sec.
-
-  # in seconds.
-  local RETRY_MAX_WAIT_RANGE=111
-  # in seconds
-  local RETRY_MIN_WAIT=10
-
-  local retryCount=$1
-  shift
-
-  if (( "$retryCount" == "$RETRY_MAX" )); then
-    builder_die "Retry limit of $RETRY_MAX attempts reached."
-  fi
-
-  retryCount=$(( $retryCount + 1 ))
-
-  if (( $retryCount != 1 )); then
-    local wait_length=$(( RANDOM % RETRY_MAX_WAIT_RANGE + RETRY_MIN_WAIT ))
-    builder_echo "Delaying $wait_length seconds before attempt $retryCount: \`$@\`"
-    sleep $wait_length
-  fi
-
-  local code=0
-  "$@" || code=$?
-  if (( $code != 0 )); then
-    builder_echo "Command failed with error $code"
-    _try_multiple_times $retryCount "$@"
-  fi
-}
-
-#
-# Verifies that node is installed, and installs npm packages, but only once per
-# build invocation
-#
-verify_npm_setup() {
-  # We'll piggy-back on the builder module dependency build state to determine
-  # if npm ci has been called in the current script invocation. Adding the
-  # prefix /external/ to module name in order to differentiate between this and
-  # internal modules (although it is unlikely to ever collide!); we will also
-  # use this pattern for other similar external dependencies in future. These
-  # functions are safe to call even in a non-builder context (they do nothing or
-  # return 1 -- not built)
-  if builder_has_module_been_built /external/npm-ci; then
-    return 0
-  fi
-  builder_set_module_has_been_built /external/npm-ci
-
-  # If we are on CI environment, automatically select a node version with nvm
-  # Also, a developer can set KEYMAN_USE_NVM variable to get this behaviour
-  # automatically too (see /docs/build/node.md)
-  if [[ "$KEYMAN_VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_NVM+x}" ]]; then
-    _select_node_version_with_nvm
-  fi
-
-  # Check if Node.JS/npm is installed.
-  type npm >/dev/null ||\
-    builder_die "Build environment setup error detected!  Please ensure Node.js is installed!"
-
-  pushd "$KEYMAN_ROOT" > /dev/null
-
-  offline_param=
-  if builder_try_offline; then
-    builder_echo "Trying offline build"
-    offline_param=--prefer-offline
-  fi
-  try_multiple_times npm ${offline_param} ci
-
-  popd > /dev/null
-}
-
-_print_expected_node_version() {
-  "$JQ" -r '.engines.node' "$KEYMAN_ROOT/package.json"
-}
-
-# Use nvm to select a node version according to package.json
-# see /docs/build/node.md
-_select_node_version_with_nvm() {
-  local REQUIRED_NODE_VERSION  CURRENT_NODE_VERSION
-
-  REQUIRED_NODE_VERSION="$(_print_expected_node_version)"
-
-  if builder_is_windows; then
-    CURRENT_NODE_VERSION="$(node --version)"
-    if [[ "${CURRENT_NODE_VERSION}" != "v${REQUIRED_NODE_VERSION}" ]]; then
-      start //wait //b nvm install "${REQUIRED_NODE_VERSION}"
-      start //wait //b nvm use "${REQUIRED_NODE_VERSION}"
-    fi
-  else
-    # launch nvm in a sub process, see _builder_nvm.sh for details
-    "${KEYMAN_ROOT}/resources/build/_builder_nvm.sh" "${REQUIRED_NODE_VERSION}"
-  fi
-
-  # Now, check that the node version is correct, on all systems
-
-  # Note: On windows, `nvm use` and `nvm install` always return success.
-  # https://github.com/coreybutler/nvm-windows/issues/738
-
-  # note the 'v' prefix that node emits (and npm doesn't!)
-  CURRENT_NODE_VERSION="$(node --version)"
-  if [[ "$CURRENT_NODE_VERSION" != "v$REQUIRED_NODE_VERSION" ]]; then
-    builder_die "Attempted to select node.js version $REQUIRED_NODE_VERSION but found $CURRENT_NODE_VERSION instead"
-  fi
-}
-
-check-markdown() {
-  node "$KEYMAN_ROOT/resources/tools/check-markdown" --root "$1"
-}
-
-#
-# Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
-#
-# Usage:
-#   builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
-# Parameters:
-#   1: coverage_threshold   optional, minimum coverage for c8 to pass tests,
-#                           defaults to 90 (percent)
-#
-# Todo:
-#   Move to builder.typescript.inc.sh when this is established
-#
-builder_do_typescript_tests() {
-  local MOCHA_FLAGS=
-
-  if builder_is_running_on_teamcity; then
-    # we're running in TeamCity
-    MOCHA_FLAGS="-reporter mocha-teamcity-reporter"
-  fi
-
-  eslint .
-  tsc --build test/
-
-  local THRESHOLD_PARAMS=
-  local C8_THRESHOLD=
-  if [[ $# -gt 0 ]]; then
-    C8_THRESHOLD=$1
-    THRESHOLD_PARAMS="--lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD"
-  else
-    # Seems like a bug in TeamCity reporter if we don't list default thresholds,
-    # see #13418.
-    #
-    # Making branch and function thresholds slightly lower, because the default
-    # for c8 is 0 for these anyway.
-    THRESHOLD_PARAMS="--lines 90 --statements 90 --branches 80 --functions 80"
-  fi
-
-  c8 --reporter=lcov --reporter=text --exclude-after-remap --check-coverage $THRESHOLD_PARAMS mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
-
-  if [[ ! -z "$C8_THRESHOLD" ]]; then
-    builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
-    builder_echo warning "Please increase threshold in build.sh as test coverage improves."
-  fi
-}
diff --git a/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh b/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh
index 13037eed84..e9226250f2 100755
--- a/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh
+++ b/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh
@@ -16,7 +16,7 @@ fi
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
diff --git a/resources/standards-data/unicode-character-database/download.sh b/resources/standards-data/unicode-character-database/download.sh
index a6675d2874..020c032a87 100755
--- a/resources/standards-data/unicode-character-database/download.sh
+++ b/resources/standards-data/unicode-character-database/download.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/minimum-versions.inc.sh"
diff --git a/resources/stats/stats.sh b/resources/stats/stats.sh
index 949d137e4b..c3aabb2cb5 100755
--- a/resources/stats/stats.sh
+++ b/resources/stats/stats.sh
@@ -6,10 +6,10 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 cd "$THIS_SCRIPT_PATH"
 
diff --git a/resources/teamcity/android/keyman-android-release.sh b/resources/teamcity/android/keyman-android-release.sh
index 248988fc12..3886c8de78 100755
--- a/resources/teamcity/android/keyman-android-release.sh
+++ b/resources/teamcity/android/keyman-android-release.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/android/android-actions.inc.sh"
@@ -94,7 +94,7 @@ function do_publish() {
   _create_zip_archive
   _publish_to_downloads_keyman_com
   _publish_to_playstore "${PUBTARGETS}"
-  upload_help "Keyman for Android" android
+  tc_upload_help "Keyman for Android" android
 }
 
 if builder_has_option --fv; then
diff --git a/resources/teamcity/android/keyman-android-test-samples.sh b/resources/teamcity/android/keyman-android-test-samples.sh
index 1faa1b6c66..58e1a7a1d8 100755
--- a/resources/teamcity/android/keyman-android-test-samples.sh
+++ b/resources/teamcity/android/keyman-android-test-samples.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/android/android-actions.inc.sh"
 
 ################################ Main script ################################
diff --git a/resources/teamcity/android/keyman-android-test.sh b/resources/teamcity/android/keyman-android-test.sh
index ca856e1ff4..d9ed2a7f48 100755
--- a/resources/teamcity/android/keyman-android-test.sh
+++ b/resources/teamcity/android/keyman-android-test.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/android/android-actions.inc.sh"
 
 ################################ Main script ################################
diff --git a/resources/teamcity/common/common-test-common-web.sh b/resources/teamcity/common/common-test-common-web.sh
index ea1994337e..31961f4aea 100755
--- a/resources/teamcity/common/common-test-common-web.sh
+++ b/resources/teamcity/common/common-test-common-web.sh
@@ -7,7 +7,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/resources/teamcity/common/common-test-common.sh b/resources/teamcity/common/common-test-common.sh
index b5fef4018b..e238236c66 100755
--- a/resources/teamcity/common/common-test-common.sh
+++ b/resources/teamcity/common/common-test-common.sh
@@ -7,7 +7,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/resources/teamcity/common/common-test-core-wasm.sh b/resources/teamcity/common/common-test-core-wasm.sh
index 5108bcf3a9..2764aaa247 100755
--- a/resources/teamcity/common/common-test-core-wasm.sh
+++ b/resources/teamcity/common/common-test-core-wasm.sh
@@ -7,7 +7,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 
diff --git a/resources/teamcity/common/common-test-core.sh b/resources/teamcity/common/common-test-core.sh
index 6801967c67..6d061ec4c0 100755
--- a/resources/teamcity/common/common-test-core.sh
+++ b/resources/teamcity/common/common-test-core.sh
@@ -8,7 +8,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
diff --git a/resources/teamcity/developer/developer-actions.inc.sh b/resources/teamcity/developer/developer-actions.inc.sh
index cca98fc26f..4a96e1d3bd 100644
--- a/resources/teamcity/developer/developer-actions.inc.sh
+++ b/resources/teamcity/developer/developer-actions.inc.sh
@@ -9,8 +9,8 @@ developer_install_dependencies_on_linux_action() {
   builder_echo start "install dependencies" "Installing dependencies"
 
   ba_linux_check_and_install_packages devscripts jq meson
-  install_nvm
-  install_emscripten
+  ba_linux_install_nvm
+  ba_linux_install_emscripten
 
   builder_echo end "install dependencies" success "Finished installing dependencies"
 }
diff --git a/resources/teamcity/developer/keyman-developer-release.sh b/resources/teamcity/developer/keyman-developer-release.sh
index 030a9afafd..b24978de0d 100755
--- a/resources/teamcity/developer/keyman-developer-release.sh
+++ b/resources/teamcity/developer/keyman-developer-release.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-windows.inc.sh"
 
@@ -62,30 +62,6 @@ function _publish_sentry() {
   builder_echo end "publish sentry" success "Finished publishing debug information files to Sentry"
 }
 
-function _download_symbol_server_index() {
-  # Download symbol server index from symbol server
-  builder_echo start "download symbol server index" "Downloading symbol server index"
-  (
-    mkdir -p "${LOCAL_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}"
-    cd "${LOCAL_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}"
-
-    tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/lastid.txt" "."
-    tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/history.txt" "."
-    tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/server.txt" "."
-  )
-  builder_echo end "download symbol server index" success "Finished downloading symbol server index"
-}
-
-function _publish_new_symbols() {
-  # Publish new symbols to symbol server
-  builder_echo start "publish new symbols" "Publishing new symbols to symbol server"
-  (
-    cd "${LOCAL_SYMBOLS_PATH}"
-    tc_rsync_upload "." "${REMOTE_SYMBOLS_PATH}"
-  )
-  builder_echo end "publish new symbols" success "Finished publishing new symbols to symbol server"
-}
-
 function _publish_to_downloads_keyman_com() {
   # Publish to downloads.keyman.com
   builder_echo start "publish to downloads.keyman.com" "Publishing release to downloads.keyman.com"
@@ -144,10 +120,10 @@ function publish_action() {
   export RSYNC_ROOT
 
   _publish_sentry
-  download_symbol_server_index
-  publish_new_symbols
+  ba_win_download_symbol_server_index
+  ba_win_publish_new_symbols
   _publish_to_downloads_keyman_com
-  upload_help "api documentation" developer
+  tc_upload_help "api documentation" developer
 }
 
 if builder_has_action all; then
diff --git a/resources/teamcity/developer/keyman-developer-test-linux-macos.sh b/resources/teamcity/developer/keyman-developer-test-linux-macos.sh
index 5b75299600..90fa341021 100755
--- a/resources/teamcity/developer/keyman-developer-test-linux-macos.sh
+++ b/resources/teamcity/developer/keyman-developer-test-linux-macos.sh
@@ -9,12 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
 . "${KEYMAN_ROOT}/resources/teamcity/developer/developer-actions.inc.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
 
@@ -46,15 +45,15 @@ fi
 if builder_has_action all; then
   developer_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
-  set_variables_for_emscripten
+  tc_set_variables_for_nvm
+  tc_set_variables_for_emscripten
 
   build_developer_action
 else
   builder_run_action  configure   developer_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
-  set_variables_for_emscripten
+  tc_set_variables_for_nvm
+  tc_set_variables_for_emscripten
 
   builder_run_action  build       build_developer_action
 fi
diff --git a/resources/teamcity/developer/keyman-developer-test-windows.sh b/resources/teamcity/developer/keyman-developer-test-windows.sh
index b0643f54bd..668e7a9c04 100755
--- a/resources/teamcity/developer/keyman-developer-test-windows.sh
+++ b/resources/teamcity/developer/keyman-developer-test-windows.sh
@@ -9,7 +9,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
diff --git a/resources/teamcity/includes/tc-helpers.inc.sh b/resources/teamcity/includes/tc-helpers.inc.sh
index 43ad9c1ba9..17776033fe 100644
--- a/resources/teamcity/includes/tc-helpers.inc.sh
+++ b/resources/teamcity/includes/tc-helpers.inc.sh
@@ -1,18 +1,10 @@
 # shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
 
-install_nvm() {
-  if ! builder_is_linux; then
-    # on Windows and macOS build agents are configured manually
-    return 0
-  fi
-  ba_linux_install_nvm
-}
-
 # Set the environment variables required to use node/nvm and set the
 # `KEYMAN_USE_NVM` variable so that the build can automatically install
 # the required node version.
-set_variables_for_nvm() {
+tc_set_variables_for_nvm() {
   if [[ -f "${HOME}/.nvm/nvm.sh" ]] && [[ -d "${HOME}/.keyman/node" ]]; then
     # nvm.sh uses some variables that might not be initialized, so we
     # disable the "unbound variable" check temporarily
@@ -26,20 +18,12 @@ set_variables_for_nvm() {
   fi
 }
 
-install_emscripten() {
-  if ! builder_is_linux; then
-    # on Windows and macOS build agents are configured manually
-    return 0
-  fi
-  ba_linux_install_emscripten
-}
-
-set_variables_for_emscripten() {
+tc_set_variables_for_emscripten() {
   export EMSCRIPTEN_BASE="${EMSCRIPTEN_BASE:-${HOME}/emsdk/upstream/emscripten}"
   export KEYMAN_USE_EMSDK=1
 }
 
-upload_help() {
+tc_upload_help() {
   local PRODUCT=$1
   local PRODUCT_PATH=$2
   builder_echo start "upload help" "Uploading new ${PRODUCT} help to help.keyman.com"
diff --git a/resources/teamcity/includes/tc-linux.inc.sh b/resources/teamcity/includes/tc-linux.inc.sh
index 7f5f3ce4c4..362873189d 100644
--- a/resources/teamcity/includes/tc-linux.inc.sh
+++ b/resources/teamcity/includes/tc-linux.inc.sh
@@ -1,16 +1,8 @@
 # shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
-
-# Returns 0 if the OS version is greater than or equal to the specified version.
-# Parameter:
-#   $1 - OS version to compare against (e.g., "20.04")
-is_os_version_or_higher() {
-  local OS_VERSION=$1
-
-  # we use `dpkg --compare-versions` to compare the current Ubuntu version
-  # shellcheck disable=SC2312
-  dpkg --compare-versions "$(lsb_release -r -s)" ge "${OS_VERSION}"
-}
+#
+# Shared functions for any builds that run on Linux agents,
+# e.g. linux, android, web, ...
 
 # Returns 0 if the specified package is installed.
 # Parameter:
@@ -59,7 +51,7 @@ ba_linux_install_nvm() {
     NVM_RELEASE=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | grep tag_name | cut -d : -f 2 | cut -d '"' -f 2)
     # shellcheck disable=SC2312
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_RELEASE}/install.sh | bash
-    set_variables_for_nvm
+    tc_set_variables_for_nvm
     nvm install --lts --default --save
     nvm use --lts
   fi
@@ -85,7 +77,7 @@ ba_linux_install_emscripten() {
     ./emsdk install "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
     ./emsdk activate "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
   fi
-  set_variables_for_emscripten
+  tc_set_variables_for_emscripten
   builder_echo end "install emscripten" success "Finished checking and installing emscripten"
 }
 
@@ -123,3 +115,18 @@ ba_linux_stop_xvfb() {
     rm -f "${PID_FILE}"
   fi
 }
+
+# Returns 0 if the OS version is greater than or equal to the specified version.
+# Parameter:
+#   $1 - OS version to compare against (e.g., "20.04")
+ba_linux_is_os_version_or_higher() {
+  if ! builder_is_linux; then
+     builder_die "ba_linux_is_os_version_or_higher() is only implemented for Ubuntu"
+  fi
+
+  local OS_VERSION=$1
+
+  # we use `dpkg --compare-versions` to compare the current Ubuntu version
+  # shellcheck disable=SC2312
+  dpkg --compare-versions "$(lsb_release -r -s)" ge "${OS_VERSION}"
+}
diff --git a/resources/teamcity/includes/tc-mac.inc.sh b/resources/teamcity/includes/tc-mac.inc.sh
index b5d2f23368..0e9c18013c 100644
--- a/resources/teamcity/includes/tc-mac.inc.sh
+++ b/resources/teamcity/includes/tc-mac.inc.sh
@@ -1,5 +1,7 @@
 # shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
+#
+# Shared functions for any builds that run on Mac agents
 
 ba_mac_unlock_keychain() {
   if [[ -z "${MAC_BUILDAGENT_PASSWORD}" ]]; then
diff --git a/resources/teamcity/includes/tc-windows.inc.sh b/resources/teamcity/includes/tc-windows.inc.sh
index 9d7a637025..7b64e052fb 100644
--- a/resources/teamcity/includes/tc-windows.inc.sh
+++ b/resources/teamcity/includes/tc-windows.inc.sh
@@ -1,8 +1,13 @@
 # shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
+#
+# Shared functions for any builds that run on Windows agents
+
+ba_win_download_symbol_server_index() {
+  if ! builder_is_windows; then
+    builder_die "ba_win_download_symbol_server_index should only be run on Windows agents"
+  fi
 
-download_symbol_server_index() {
-  # Download symbol server index from symbol server
   builder_echo start "download symbol server index" "Downloading symbol server index"
   (
     # shellcheck disable=SC2154
@@ -18,8 +23,11 @@ download_symbol_server_index() {
   builder_echo end "download symbol server index" success "Finished downloading symbol server index"
 }
 
-publish_new_symbols() {
-  # Publish new symbols to symbol server
+ba_win_publish_new_symbols() {
+  if ! builder_is_windows; then
+    builder_die "ba_win_publish_new_symbols should only be run on Windows agents"
+  fi
+
   builder_echo start "publish new symbols" "Publishing new symbols to symbol server"
   (
     # shellcheck disable=SC2164
diff --git a/resources/teamcity/ios/keyman-ios-release.sh b/resources/teamcity/ios/keyman-ios-release.sh
index 933a275424..8942a9f135 100755
--- a/resources/teamcity/ios/keyman-ios-release.sh
+++ b/resources/teamcity/ios/keyman-ios-release.sh
@@ -11,11 +11,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/ios/ios-actions.inc.sh"
@@ -243,7 +243,7 @@ function do_build() {
 
 function do_publish() {
   _publish_to_downloads_keyman_com
-  upload_help "Keyman for iOS" ios
+  tc_upload_help "Keyman for iOS" ios
 
   if [[ "${KEYMAN_TIER}" == "stable" ]]; then
     _publish_to_appstore
diff --git a/resources/teamcity/ios/keyman-ios-test-samples.sh b/resources/teamcity/ios/keyman-ios-test-samples.sh
index 0146c7498f..fb109f3a2a 100755
--- a/resources/teamcity/ios/keyman-ios-test-samples.sh
+++ b/resources/teamcity/ios/keyman-ios-test-samples.sh
@@ -9,7 +9,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/resources/teamcity/ios/keyman-ios-test.sh b/resources/teamcity/ios/keyman-ios-test.sh
index 9f918b8d8f..1c6f156238 100755
--- a/resources/teamcity/ios/keyman-ios-test.sh
+++ b/resources/teamcity/ios/keyman-ios-test.sh
@@ -11,16 +11,23 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/ios/ios-actions.inc.sh"
 
 ################################ Main script ################################
 
+# TODO: remove unused `--pr-number` option. Unfortunately, the mechanism we
+# designed to skip this, `--builder-ignore-unknown-options`, does not work for
+# options with values. We need another one, for example, something like
+# `--builder-ignore-unknown-value-options=pr-number[,...]`, so for now I will
+# leave it alone. The option ultimately needs to be removed from the TC build
+# configuration also. (Unused as of #14466)
+
 builder_describe \
   "Build KeymanEngine and Keyman for iOS" \
   "all            run all actions" \
@@ -70,12 +77,6 @@ function __do_upload_to_testflight() {
 }
 
 function _upload_to_testflight_pr_area() {
-  # shellcheck disable=SC2154
-  if ! [[ "${PR_NUMBER}" =~ ^[0-9]+$ ]]; then
-    builder_echo "Ignoring TestFlight upload for non-PR build"
-    return
-  fi
-
   builder_echo start "upload to testflight" "Uploading build to TestFlight (PR area)"
   # shellcheck disable=SC2154
   __do_upload_to_testflight "${SIL_ITC_PROVIDER}" "${SIL_API_KEY_ID}" "${SIL_ITC_TEAM_ID}"  keyman
@@ -83,12 +84,6 @@ function _upload_to_testflight_pr_area() {
 }
 
 function _upload_to_testflight_pr_area_fv() {
-  # shellcheck disable=SC2154
-  if ! [[ "${PR_NUMBER}" =~ ^[0-9]+$ ]]; then
-    builder_echo "Ignoring TestFlight upload for non-PR build"
-    return
-  fi
-
   if ! builder_has_option --fv; then
     builder_echo "Skipping FirstVoices upload to TestFlight as --fv option is not set"
     return
@@ -103,8 +98,8 @@ function _upload_to_testflight_pr_area_fv() {
 function do_build() {
   ios_build
   ios_capture_build_artifacts
-  _upload_to_testflight_pr_area
-  _upload_to_testflight_pr_area_fv
+  builder_if_release_build_level _upload_to_testflight_pr_area
+  builder_if_release_build_level _upload_to_testflight_pr_area_fv
 }
 
 ba_mac_unlock_keychain
diff --git a/resources/teamcity/linux/keyman-linux-release.sh b/resources/teamcity/linux/keyman-linux-release.sh
index 9d94e8034d..78369686f9 100755
--- a/resources/teamcity/linux/keyman-linux-release.sh
+++ b/resources/teamcity/linux/keyman-linux-release.sh
@@ -5,14 +5,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/linux/linux-actions.inc.sh"
 
 ################################ Main script ################################
 
@@ -140,7 +140,7 @@ if builder_has_action all; then
   linux_install_dependencies_action
   _install_additional_dependencies
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   linux_build_action
   linux_unit_tests_action --no-integration
@@ -149,7 +149,7 @@ else
   builder_run_action  configure   linux_install_dependencies_action
   builder_run_action  configure   _install_additional_dependencies
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       linux_build_action
   builder_run_action  test        linux_unit_tests_action --no-integration
diff --git a/resources/teamcity/linux/keyman-linux-test-integration.sh b/resources/teamcity/linux/keyman-linux-test-integration.sh
index 0868cbb835..4a19ebcb97 100755
--- a/resources/teamcity/linux/keyman-linux-test-integration.sh
+++ b/resources/teamcity/linux/keyman-linux-test-integration.sh
@@ -6,14 +6,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/linux/linux-actions.inc.sh"
 
 ################################ Main script ################################
 
@@ -29,19 +29,26 @@ builder_parse "$@"
 
 cd "${KEYMAN_ROOT}/linux"
 
+# Run the clean action in the `linux` directory.`
+function clean_action() {
+  builder_heading "Cleaning up"
+  # shellcheck disable=SC2154
+  "${KEYMAN_ROOT}/linux/build.sh" clean
+}
+
 if builder_has_action all; then
-  linux_clean_action
+  clean_action
   linux_install_dependencies_action
   linux_additional_test_dependencies_action
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
   linux_build_action
   linux_unit_tests_action
 else
-  builder_run_action  clean       linux_clean_action
+  builder_run_action  clean       clean_action
   builder_run_action  configure   linux_install_dependencies_action
   builder_run_action  configure   linux_additional_test_dependencies_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       linux_build_action
   builder_run_action  test        linux_unit_tests_action
diff --git a/resources/teamcity/linux/keyman-linux-test.sh b/resources/teamcity/linux/keyman-linux-test.sh
index 7c8387d153..2779e0f803 100755
--- a/resources/teamcity/linux/keyman-linux-test.sh
+++ b/resources/teamcity/linux/keyman-linux-test.sh
@@ -6,14 +6,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/linux/linux-actions.inc.sh"
 
 ################################ Main script ################################
 
@@ -40,7 +40,7 @@ if builder_has_action all; then
   linux_install_dependencies_action
   linux_additional_test_dependencies_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   linux_build_action --coverage
   linux_unit_tests_action --coverage --report --no-integration
@@ -49,7 +49,7 @@ else
   builder_run_action  configure   linux_install_dependencies_action
   builder_run_action  configure   linux_additional_test_dependencies_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       linux_build_action --coverage
   builder_run_action  test        linux_unit_tests_action --coverage --report --no-integration
diff --git a/resources/teamcity/includes/tc-actions.inc.sh b/resources/teamcity/linux/linux-actions.inc.sh
similarity index 88%
rename from resources/teamcity/includes/tc-actions.inc.sh
rename to resources/teamcity/linux/linux-actions.inc.sh
index ed06865178..0b96f4c07c 100644
--- a/resources/teamcity/includes/tc-actions.inc.sh
+++ b/resources/teamcity/linux/linux-actions.inc.sh
@@ -1,16 +1,11 @@
 # shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
 
-# Run the clean action in the `linux` directory.`
-linux_clean_action() {
-  builder_heading "Cleaning up"
-  # shellcheck disable=SC2154
-  "${KEYMAN_ROOT}/linux/build.sh" clean
-}
-
 # Install required dependencies for building Keyman on Linux.
 linux_install_dependencies_action() {
   builder_echo start "install dependencies" "Installing dependencies"
+
+  # shellcheck disable=SC2154
   . "${KEYMAN_ROOT}/linux/scripts/package-build.inc.sh"
   checkAndInstallRequirements
   builder_echo end "install dependencies" success "Finished installing dependencies"
@@ -21,14 +16,14 @@ linux_additional_test_dependencies_action() {
   builder_echo start additional_dependencies "Installing additional dependencies"
   local TOINSTALL="lcov libdatetime-perl gcovr python3-venv jq"
 
-  if is_os_version_or_higher 24.04; then
+  if ba_linux_is_os_version_or_higher 24.04; then
     TOINSTALL="${TOINSTALL} libgirepository-2.0-dev python3-coverage"
   fi
 
   # shellcheck disable=SC2086
   ba_linux_check_and_install_packages ${TOINSTALL}
 
-  if ! is_os_version_or_higher 24.04; then
+  if ! ba_linux_is_os_version_or_higher 24.04; then
     builder_heading "Installing python3-coverage from pip"
     pip3 install --user coverage
   fi
diff --git a/resources/teamcity/macos/keyman-macos-release.sh b/resources/teamcity/macos/keyman-macos-release.sh
index d9e9e09c19..57ddaa082c 100755
--- a/resources/teamcity/macos/keyman-macos-release.sh
+++ b/resources/teamcity/macos/keyman-macos-release.sh
@@ -11,11 +11,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/macos/macos-actions.inc.sh"
@@ -64,7 +64,7 @@ function _publish_to_downloads_keyman_com() {
 
 function do_publish() {
   _publish_to_downloads_keyman_com
-  upload_help "Keyman for macOS" mac
+  tc_upload_help "Keyman for macOS" mac
 }
 
 ba_mac_unlock_keychain
diff --git a/resources/teamcity/macos/keyman-macos-test.sh b/resources/teamcity/macos/keyman-macos-test.sh
index cea4e8ab86..1c6297d1af 100755
--- a/resources/teamcity/macos/keyman-macos-test.sh
+++ b/resources/teamcity/macos/keyman-macos-test.sh
@@ -11,11 +11,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/macos/macos-actions.inc.sh"
 
diff --git a/resources/teamcity/web/keyman-web-release.sh b/resources/teamcity/web/keyman-web-release.sh
index 88fada4947..0aa5b2fbe8 100755
--- a/resources/teamcity/web/keyman-web-release.sh
+++ b/resources/teamcity/web/keyman-web-release.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/web/web-actions.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
@@ -88,7 +88,7 @@ function publish_web_action() {
   _push_release_to_skeymancom
 
   _zip_and_upload_artifacts
-  upload_help "Keyman for Web" web
+  tc_upload_help "Keyman for Web" web
 
   builder_echo end publish success "Finished publishing KeymanWeb release"
 }
@@ -96,14 +96,14 @@ function publish_web_action() {
 if builder_has_action all; then
   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   web_build_action
   publish_web_action
 else
   builder_run_action  configure   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       web_build_action
   builder_run_action  publish     publish_web_action
diff --git a/resources/teamcity/web/keyman-web-test.sh b/resources/teamcity/web/keyman-web-test.sh
index 0996ab7ec3..2fc841a16d 100755
--- a/resources/teamcity/web/keyman-web-test.sh
+++ b/resources/teamcity/web/keyman-web-test.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/web/web-actions.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
@@ -40,7 +40,7 @@ function check_build_size_action() {
 if builder_has_action all; then
   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   web_build_action
   web_test_action
@@ -48,7 +48,7 @@ if builder_has_action all; then
 else
   builder_run_action  configure   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       web_build_action
   builder_run_action  test        web_test_action
diff --git a/resources/teamcity/web/web-actions.inc.sh b/resources/teamcity/web/web-actions.inc.sh
index bb54f38cb5..437254b975 100644
--- a/resources/teamcity/web/web-actions.inc.sh
+++ b/resources/teamcity/web/web-actions.inc.sh
@@ -18,7 +18,7 @@ web_install_dependencies_on_linux_action() {
 }
 
 _install_playwright_dependencies() {
-  if ! builder_is_linux || ! is_os_version_or_higher 24.04; then
+  if ! builder_is_linux || ! ba_linux_is_os_version_or_higher 24.04; then
     return 0
   fi
 
diff --git a/resources/teamcity/windows/keyman-windows-release.sh b/resources/teamcity/windows/keyman-windows-release.sh
index 155d5137d3..51d95a6082 100755
--- a/resources/teamcity/windows/keyman-windows-release.sh
+++ b/resources/teamcity/windows/keyman-windows-release.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-windows.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/windows/windows-actions.inc.sh"
@@ -104,10 +104,10 @@ function windows_publish_action() {
 
   "${KEYMAN_ROOT}/windows/build.sh" publish
   windows_upload_symbols_to_sentry
-  download_symbol_server_index
-  publish_new_symbols
+  ba_win_download_symbol_server_index
+  ba_win_publish_new_symbols
   _publish_to_downloads_keyman_com
-  upload_help "Keyman for Windows" windows
+  tc_upload_help "Keyman for Windows" windows
   builder_echo end "publish windows" success "Finished publishing Keyman for Windows"
 }
 
diff --git a/resources/teamcity/windows/keyman-windows-test.sh b/resources/teamcity/windows/keyman-windows-test.sh
index 8685fff4e3..fc83b5c362 100755
--- a/resources/teamcity/windows/keyman-windows-test.sh
+++ b/resources/teamcity/windows/keyman-windows-test.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/windows/windows-actions.inc.sh"
 
diff --git a/resources/tools/check-markdown/build.sh b/resources/tools/check-markdown/build.sh
index c288b9a6be..01dd9d81c9 100755
--- a/resources/tools/check-markdown/build.sh
+++ b/resources/tools/check-markdown/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -21,6 +22,6 @@ builder_describe_outputs \
 builder_parse "$@"
 
 builder_run_action clean      rm -rf build/ tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 # builder_run_action test       mocha
diff --git a/web/build.sh b/web/build.sh
index 51301682ca..4cb01f840e 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 # ################################ Main script ################################
diff --git a/web/ci.sh b/web/ci.sh
index 77210ae224..02545cf447 100755
--- a/web/ci.sh
+++ b/web/ci.sh
@@ -4,15 +4,15 @@
 # building the Keyman Engine for Web.
 #
 
-# set -x
+# TODO: merge this with resources/teamcity/web scripts
 
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/ci/pull-requests.inc.sh"
 
@@ -66,16 +66,18 @@ function build_action() {
   # one option:
   ./build.sh configure clean build
 
-  # Upload the sentry-configuration engine used by the mobile apps to sentry
-  # Also, clean 'em first.
-  for sourcemap in "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"*.map; do
-    node "${KEYMAN_ROOT}/web/build/tools/building/sourcemap-root/index.js" null "${sourcemap}" --clean
-  done
-  web_sentry_upload "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"
+  if builder_is_ci_build && builder_is_ci_build_level_release; then
+    # Upload the sentry-configuration engine used by the mobile apps to sentry
+    # Also, clean 'em first.
+    for sourcemap in "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"*.map; do
+      node "${KEYMAN_ROOT}/web/build/tools/building/sourcemap-root/index.js" null "${sourcemap}" --clean
+    done
+    web_sentry_upload "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"
 
-  # And, of course, the main build-products too
-  web_sentry_upload "${KEYMAN_ROOT}/web/build/app/webview/release/"
-  web_sentry_upload "${KEYMAN_ROOT}/web/build/publish/release/"
+    # And, of course, the main build-products too
+    web_sentry_upload "${KEYMAN_ROOT}/web/build/app/webview/release/"
+    web_sentry_upload "${KEYMAN_ROOT}/web/build/publish/release/"
+  fi
 }
 
 function test_action() {
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index 85c696ba4a..a61ce1517c 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=app/browser
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -80,7 +81,7 @@ compile_and_copy() {
   cp "$KEYMAN_ROOT/web/src/engine/predictive-text/worker-thread/build/filesize-profile.log"     "$PROFILE_DEST/lm-worker-filesize.log"
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean do_clean
 builder_run_action build compile_and_copy
 builder_run_action test test-headless-typescript $SUBPROJECT_NAME
diff --git a/web/src/app/ui/build.sh b/web/src/app/ui/build.sh
index 3a431f9a0a..045cdac8d0 100755
--- a/web/src/app/ui/build.sh
+++ b/web/src/app/ui/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=app/ui
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -67,7 +68,7 @@ compile_and_copy() {
   prepare
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean do_clean
 builder_run_action build compile_and_copy
 
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index 1c2b2fe7dd..403aaec4e4 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=app/webview
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -80,6 +81,6 @@ compile_and_copy() {
   "$KEYMAN_ROOT/web/src/test/manual/embed/android-harness/build.sh"
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build compile_and_copy
\ No newline at end of file
diff --git a/web/src/engine/attachment/build.sh b/web/src/engine/attachment/build.sh
index 497e65e9a1..042c5aa83e 100755
--- a/web/src/engine/attachment/build.sh
+++ b/web/src/engine/attachment/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Imports common Web build-script definitions & functions
 SUBPROJECT_NAME=engine/attachment
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/web/common.inc.sh"
 
 # ################################ Main script ################################
@@ -40,7 +41,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build do_build
 builder_run_action test test-headless-typescript "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/common/web-utils/build.sh b/web/src/engine/common/web-utils/build.sh
index c487e22c91..2ff9a03b06 100755
--- a/web/src/engine/common/web-utils/build.sh
+++ b/web/src/engine/common/web-utils/build.sh
@@ -5,11 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 SUBPROJECT_NAME=engine/common/web-utils
 BUILD_DIR="/web/src/engine/common/web-utils/build"
@@ -56,7 +57,7 @@ function do_test() {
   c8 mocha --recursive $FLAGS ./src/tests/
 }
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
 builder_run_action build      do_build
 builder_run_action test       do_test
diff --git a/web/src/engine/dom-utils/build.sh b/web/src/engine/dom-utils/build.sh
index 10cf2b660c..df6180e2ed 100755
--- a/web/src/engine/dom-utils/build.sh
+++ b/web/src/engine/dom-utils/build.sh
@@ -3,10 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # Imports common Web build-script definitions & functions
 SUBPROJECT_NAME=engine/dom-utils
@@ -33,7 +34,7 @@ builder_parse "$@"
 
 #### Build action definitions ####
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build compile $SUBPROJECT_NAME
 
diff --git a/web/src/engine/element-wrappers/build.sh b/web/src/engine/element-wrappers/build.sh
index aeee72241a..055c93b00e 100755
--- a/web/src/engine/element-wrappers/build.sh
+++ b/web/src/engine/element-wrappers/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/element-wrappers
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -38,7 +39,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build do_build
 
diff --git a/web/src/engine/events/build.sh b/web/src/engine/events/build.sh
index e1f804908f..eeeb144949 100755
--- a/web/src/engine/events/build.sh
+++ b/web/src/engine/events/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/events
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -39,7 +40,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/interfaces/build.sh b/web/src/engine/interfaces/build.sh
index 502e1f7172..3ea80fdc7a 100755
--- a/web/src/engine/interfaces/build.sh
+++ b/web/src/engine/interfaces/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/interfaces
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -40,7 +41,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/js-processor/build.sh b/web/src/engine/js-processor/build.sh
index 620670276b..0fc0ef7e7a 100755
--- a/web/src/engine/js-processor/build.sh
+++ b/web/src/engine/js-processor/build.sh
@@ -3,13 +3,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/js-processor
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -35,7 +36,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build      do_build
 builder_run_action test       test-headless "${SUBPROJECT_NAME}" ""
diff --git a/web/src/engine/keyboard-storage/build.sh b/web/src/engine/keyboard-storage/build.sh
index 86755c613a..a6a233bfd8 100755
--- a/web/src/engine/keyboard-storage/build.sh
+++ b/web/src/engine/keyboard-storage/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/keyboard-storage
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -47,7 +48,7 @@ do_build () {
     --platform node
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/keyboard/build.sh b/web/src/engine/keyboard/build.sh
index dc1283a7f2..7260bc5cc6 100755
--- a/web/src/engine/keyboard/build.sh
+++ b/web/src/engine/keyboard/build.sh
@@ -5,13 +5,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/keyboard
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -34,7 +35,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # Configure Web browser-engine testing environments.  As is, this should only
   # make changes when we update the dependency, even on our CI build agents.
diff --git a/web/src/engine/main/build.sh b/web/src/engine/main/build.sh
index a90e9f7660..6cca867d88 100755
--- a/web/src/engine/main/build.sh
+++ b/web/src/engine/main/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/main
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -45,7 +46,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
\ No newline at end of file
diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh
index 307d5b7a08..8c82560f4e 100755
--- a/web/src/engine/osk/build.sh
+++ b/web/src/engine/osk/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/osk
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -41,7 +42,7 @@ do_clean() {
 }
 
 do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$KEYMAN_ROOT/web/src/resources/osk/"
 }
 
diff --git a/web/src/engine/osk/gesture-processor/build.sh b/web/src/engine/osk/gesture-processor/build.sh
index 5bee378fca..53c50c3d39 100755
--- a/web/src/engine/osk/gesture-processor/build.sh
+++ b/web/src/engine/osk/gesture-processor/build.sh
@@ -3,13 +3,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/osk/gesture-processor
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
 
@@ -38,7 +39,7 @@ builder_parse "$@"
 # TODO: configure if npm has not been run, and build is specified
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 }
 
 function do_build_module() {
diff --git a/web/src/engine/osk/gesture-processor/src/tools/build.sh b/web/src/engine/osk/gesture-processor/src/tools/build.sh
index 343d90a117..735e943ecc 100755
--- a/web/src/engine/osk/gesture-processor/src/tools/build.sh
+++ b/web/src/engine/osk/gesture-processor/src/tools/build.sh
@@ -3,11 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
 
diff --git a/web/src/engine/predictive-text/build.sh b/web/src/engine/predictive-text/build.sh
index ff0029ec40..f4872bcd7f 100755
--- a/web/src/engine/predictive-text/build.sh
+++ b/web/src/engine/predictive-text/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # ################################ Main script ################################
 
diff --git a/web/src/engine/predictive-text/templates/build.sh b/web/src/engine/predictive-text/templates/build.sh
index 2dda929d27..7a3b98148c 100755
--- a/web/src/engine/predictive-text/templates/build.sh
+++ b/web/src/engine/predictive-text/templates/build.sh
@@ -5,14 +5,18 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 ################################ Main script ################################
 
+SUBPROJECT_NAME=engine/predictive-text/templates
+
 builder_describe "Builds the predictive-text model template implementation module" \
   "@/common/web/keyman-version" \
   "@/web/src/tools/es-bundling" \
@@ -36,16 +40,7 @@ function do_build() {
   tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts
 }
 
-function do_test() {
-  local FLAGS=
-  if builder_is_ci_build; then
-    FLAGS="-reporter mocha-teamcity-reporter"
-  fi
-
-  c8 mocha $FLAGS --require tests/helpers.js --recursive tests
-}
-
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
 builder_run_action build      do_build
-builder_run_action test       do_test
\ No newline at end of file
+builder_run_action test       test-headless-typescript $SUBPROJECT_NAME
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/wordbreakers/build.sh b/web/src/engine/predictive-text/wordbreakers/build.sh
index 9e449030d8..dcedb94e79 100755
--- a/web/src/engine/predictive-text/wordbreakers/build.sh
+++ b/web/src/engine/predictive-text/wordbreakers/build.sh
@@ -5,14 +5,18 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 ################################ Main script ################################
 
+SUBPROJECT_NAME=engine/predictive-text/wordbreakers
+
 # Note:  the raw text files used for data.inc.ts are found within
 # /resources/standards-data/unicode-character-database.
 builder_describe "Builds the predictive-text wordbreaker implementation module" \
@@ -28,7 +32,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # This is a script used to build the data.inc.ts file needed by the
   # default wordbreaker.  We rarely update the backing data, but it
@@ -57,4 +61,4 @@ function do_test() {
 builder_run_action configure  do_configure
 builder_run_action clean      rm -rf build/
 builder_run_action build      do_build
-builder_run_action test       do_test
\ No newline at end of file
+builder_run_action test       test-headless-typescript $SUBPROJECT_NAME
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
index 7f1682fca2..79cba5d83a 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
@@ -2,4 +2,5 @@ import placeholder from "./placeholder.js";
 import ascii from "./ascii.js";
 import default_ from "./default/index.js";
 
-export { placeholder, ascii, default_ as default, default_ as defaultWordbreaker };
\ No newline at end of file
+export { placeholder, ascii, default_ as default, default_ as defaultWordbreaker };
+export { type BreakerContext } from "./default/index.js";
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts
index 6ea7b04532..b2034cf326 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts
@@ -2,4 +2,5 @@
 export * from './index.js';
 
 // Exposes some internal properties for unit-test accessibility
-export { WordBreakProperty } from './default/data.inc.js';
+export { propertyMap, WordBreakProperty } from './default/data.inc.js';
+export { searchForProperty } from './default/searchForProperty.js';
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/build.sh b/web/src/engine/predictive-text/worker-main/build.sh
index 6642e18b86..d6ddebc697 100755
--- a/web/src/engine/predictive-text/worker-main/build.sh
+++ b/web/src/engine/predictive-text/worker-main/build.sh
@@ -8,10 +8,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
@@ -35,7 +36,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # Configure Web browser-engine testing environments.  As is, this should only
   # make changes when we update the dependency, even on our CI build agents.
diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
index 4732ac6167..292f5d2442 100755
--- a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
+++ b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
@@ -3,11 +3,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # This script runs from its own folder
 cd "$THIS_SCRIPT_PATH"
@@ -29,7 +30,7 @@ builder_describe "Runs all tests for the language-modeling / predictive-text lay
 builder_parse "$@"
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/engine/predictive-text/worker-thread/build.sh b/web/src/engine/predictive-text/worker-thread/build.sh
index d72d5f2d22..5bb1a51f85 100755
--- a/web/src/engine/predictive-text/worker-thread/build.sh
+++ b/web/src/engine/predictive-text/worker-thread/build.sh
@@ -6,11 +6,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 WORKER_OUTPUT=build/obj
 WORKER_OUTPUT_FILENAME=build/lib/worker-main.js
@@ -24,6 +26,8 @@ SRCMAP_CLEANER="node $KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.
 
 ################################ Main script ################################
 
+SUBPROJECT_NAME=engine/predictive-text/worker-thread
+
 builder_describe \
   "Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications." \
   "@/common/web/keyman-version" \
@@ -41,7 +45,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # Configure Web browser-engine testing environments.  As is, this should only
   # make changes when we update the dependency, even on our CI build agents.
@@ -91,12 +95,10 @@ function do_build() {
 }
 
 function do_test() {
-  local MOCHA_FLAGS=
   local WTR_CONFIG=
   local WTR_INSPECT=
 
   if builder_is_ci_build; then
-    MOCHA_FLAGS="$MOCHA_FLAGS --reporter mocha-teamcity-reporter"
     WTR_CONFIG=.CI
   fi
 
@@ -104,7 +106,7 @@ function do_test() {
     WTR_INSPECT=" --manual"
   fi
 
-  c8 mocha --recursive $MOCHA_FLAGS ./src/tests/mocha/cases/
+  test-headless-typescript $SUBPROJECT_NAME
 
   web-test-runner --config ./src/tests/test-runner/web-test-runner${WTR_CONFIG}.config.mjs ${WTR_INSPECT}
 }
diff --git a/web/src/engine/predictive-text/worker-thread/package.json b/web/src/engine/predictive-text/worker-thread/package.json
index c410cf4654..f210f51000 100644
--- a/web/src/engine/predictive-text/worker-thread/package.json
+++ b/web/src/engine/predictive-text/worker-thread/package.json
@@ -10,6 +10,9 @@
     "./worker-main.wrapped.min.js": {
       "types": "./build/lib/worker-main.wrapped.d.ts",
       "default": "./build/lib/worker-main.wrapped.min.js"
+    },
+    "./test-index": {
+      "default": "./build/obj/test-index.js"
     }
   },
   "imports": {
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
index 516ac779fb..375e414b1b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts
@@ -629,7 +629,7 @@ export class ContextTracker extends CircularArray<TrackedContextState> {
     };
   }
 
-  private static modelContextState(
+  static modelContextState(
     tokenizedContext: Token[],
     lexicalModel: LexicalModel
   ): TrackedContextState {
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
index 30a2d8cea3..421d22ab44 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
@@ -100,8 +100,8 @@ export default class LMLayerWorker {
   private _currentModelSource: ModelSourceSpec;
 
   constructor(options: {
-    importScripts: typeof importScripts,
-    postMessage: typeof postMessage
+    importScripts: (...urls: string[]) => void,
+    postMessage: (message: any, extra?: any) => void
   } = {
     importScripts: null,
     postMessage: null
@@ -114,6 +114,11 @@ export default class LMLayerWorker {
     this.setupConfigState();
   }
 
+  /** @internal */
+  public readonly unitTestEndPoints = {
+    getStateName: () => this.state.name
+  }
+
   public error(message: string, error?: any) {
     // error isn't a fan of being cloned across the worker boundary.
     this.cast('error', {
@@ -403,7 +408,7 @@ export default class LMLayerWorker {
    *
    * @param scope A global scope to install upon.
    */
-  static install(scope: DedicatedWorkerGlobalScope): LMLayerWorker {
+  static install(scope: any /*DedicatedWorkerGlobalScope*/): LMLayerWorker {
     let worker = new LMLayerWorker({ postMessage: scope.postMessage, importScripts: scope.importScripts.bind(scope) });
     scope.onmessage = worker.onMessage.bind(worker);
     worker.self = scope;
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
index 05da67ec98..2a5a4ef60b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
@@ -1,24 +1,34 @@
 import * as models from '@keymanapp/models-templates';
-import * as correction from './correction/index.js'
-
 import { KMWString } from '@keymanapp/web-utils';
-
-import TransformUtils from './transformUtils.js';
-import { correctAndEnumerate, dedupeSuggestions, finalizeSuggestions, predictionAutoSelect, processSimilarity, toAnnotatedSuggestion, tupleDisplayOrderSort } from './predict-helpers.js';
-import { detectCurrentCasing, determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
 import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import * as correction from './correction/index.js'
+import TransformUtils from './transformUtils.js';
+import { applySuggestionCasing, correctAndEnumerate, dedupeSuggestions, finalizeSuggestions, predictionAutoSelect, processSimilarity, toAnnotatedSuggestion, tupleDisplayOrderSort } from './predict-helpers.js';
+import { detectCurrentCasing, determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
+
 import CasingForm = LexicalModelTypes.CasingForm;
 import Context = LexicalModelTypes.Context;
 import Distribution = LexicalModelTypes.Distribution;
+import Keep = LexicalModelTypes.Keep;
 import LexicalModel = LexicalModelTypes.LexicalModel;
 import LexicalModelPunctuation = LexicalModelTypes.LexicalModelPunctuation;
+import Outcome = LexicalModelTypes.Outcome;
 import Reversion = LexicalModelTypes.Reversion;
 import Suggestion = LexicalModelTypes.Suggestion;
 import Transform = LexicalModelTypes.Transform;
 
 export class ModelCompositor {
   private lexicalModel: LexicalModel;
-  private contextTracker?: correction.ContextTracker;
+  private _contextTracker?: correction.ContextTracker;
+
+  /**
+   * Returns the context-caching store used to store intermediate
+   * correction-search and context-tokenization calculations.
+   */
+  public get contextTracker() {
+    return this._contextTracker;
+  }
 
   static readonly MAX_SUGGESTIONS = 12;
   readonly punctuation: LexicalModelPunctuation;
@@ -60,13 +70,13 @@ export class ModelCompositor {
   ) {
     this.lexicalModel = lexicalModel;
     if(lexicalModel.traverseFromRoot) {
-      this.contextTracker = new correction.ContextTracker();
+      this._contextTracker = new correction.ContextTracker();
     }
     this.punctuation = determinePunctuationFromModel(lexicalModel);
     this.testMode = !!testMode;
   }
 
-  async predict(transformDistribution: Transform | Distribution<Transform>, context: Context): Promise<Suggestion[]> {
+  async predict(transformDistribution: Transform | Distribution<Transform>, context: Context): Promise<Outcome<Suggestion|Keep>[]> {
     const lexicalModel = this.lexicalModel;
 
     // If a prior prediction is still processing, signal to terminate it; we have a new
@@ -142,7 +152,7 @@ export class ModelCompositor {
     // lexicon for a word.  (Example:  "Apple" the company vs "apple" the fruit.)
     for(let tuple of rawPredictions) {
       if(currentCasing && currentCasing != 'lower') {
-        this.applySuggestionCasing(tuple.prediction.sample, basePrefix, currentCasing);
+        applySuggestionCasing(tuple.prediction.sample, basePrefix, this.lexicalModel, currentCasing);
       }
     }
 
@@ -192,21 +202,6 @@ export class ModelCompositor {
     return suggestions;
   }
 
-  // Responsible for applying casing rules to suggestions.
-  private applySuggestionCasing(suggestion: Suggestion, baseWord: string, casingForm: CasingForm) {
-    // Step 1:  does the suggestion replace the whole word?  If not, we should extend the suggestion to do so.
-    let unchangedLength  = KMWString.length(baseWord) - suggestion.transform.deleteLeft;
-
-    if(unchangedLength > 0) {
-      suggestion.transform.deleteLeft += unchangedLength;
-      suggestion.transform.insert = KMWString.substr(baseWord, 0, unchangedLength) + suggestion.transform.insert;
-    }
-
-    // Step 2: Now that the transform affects the whole word, we may safely apply casing rules.
-    suggestion.transform.insert = this.lexicalModel.applyCasing(casingForm, suggestion.transform.insert);
-    suggestion.displayAs = this.lexicalModel.applyCasing(casingForm, suggestion.displayAs);
-  }
-
   acceptSuggestion(suggestion: Suggestion, context: Context, postTransform?: Transform): Reversion {
     // Step 1:  generate and save the reversion's Transform.
     let sourceTransform = suggestion.transform;
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
index 14f77edc49..4a6f20da15 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
@@ -1,2 +1,2 @@
 export * from '@keymanapp/models-templates';
-export { default as DummyModel } from './dummy-model.js';
+export { default as DummyModel, DummyOptions } from './dummy-model.js';
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
index 87e6abf189..8bd8dda359 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
@@ -1,12 +1,13 @@
 import * as models from '@keymanapp/models-templates';
 import { KMWString } from '@keymanapp/web-utils';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
 import TransformUtils from './transformUtils.js';
 import { determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
 import { ContextTracker, TrackedContextState } from './correction/context-tracker.js';
 import { ExecutionTimer } from './correction/execution-timer.js';
 import ModelCompositor from './model-compositor.js';
-import { LexicalModelTypes } from '@keymanapp/common-types';
+import CasingForm = LexicalModelTypes.CasingForm;
 import Context = LexicalModelTypes.Context;
 import Distribution = LexicalModelTypes.Distribution;
 import Keep = LexicalModelTypes.Keep;
@@ -25,6 +26,12 @@ import Transform = LexicalModelTypes.Transform;
 
 export const AUTOSELECT_PROPORTION_THRESHOLD = .66;
 
+/**
+ * Standard probability rules - the maximum probability something can
+ * have is 100%, or a simple '1'.
+ */
+const MAX_PROB = 1;
+
 /**
  * Defines thresholds used to determine when it is appropriate to stop searching
  * for more prediction-roots.
@@ -58,24 +65,77 @@ export const CORRECTION_SEARCH_THRESHOLDS = {
   REPLACEMENT_SEARCH_THRESHOLD: 4 as const // e^-4 = 0.0183156388.  Allows "80%" of an extra edit.
 }
 
+/**
+ * Collates information related to suggestions during the suggestion generation
+ * process.
+ */
 export type CorrectionPredictionTuple = {
-  prediction: ProbabilityMass<Suggestion>,
+  /**
+   * The potential Suggestion (or Keep)
+   */
+  prediction: ProbabilityMass<Suggestion | Keep>,
+  /**
+   * The correction upon which the Suggestion (or Keep) is based
+   */
   correction: ProbabilityMass<string>,
+  /**
+   * The likelihood of the prediction - its lexical-model likelihood multiplied
+   * by the keystroke-sequence + correction likelihood.
+   */
   totalProb: number;
-  matchLevel: SuggestionSimilarity;
+  /**
+   * How directly the prediction matches the current token in the context.
+   *
+   * This is determined later in the suggestion-analysis project and is not
+   * available upon initial construction of this type.
+   */
+  matchLevel?: SuggestionSimilarity;
+  /**
+   * Text from the triggering input that should _not_ be affected by the
+   * prediction.
+   */
   preservationTransform?: Transform;
 };
 
+/**
+ * An enum to be used when categorizing the level of similarity between
+ * generated Suggestions and the actual text upon which a Suggestion is
+ * based.
+ *
+ * Note that Suggestions require .exact matching to stand-in as the Keep
+ * option.
+ */
 export enum SuggestionSimilarity {
+  /**
+   * The keyed form for the current token / word does not match
+   * the keyed form of the suggestion.
+   */
   none = 0,
+
+  /**
+   * The keyed form for the current token / word matches the
+   * the keyed form of the suggestion, but they do not match
+   * in a case-insensitive manner.
+   */
   sameKey = 1,
+
+  /**
+   * The current token / word has a case-insensitive match with
+   * the suggestion, but not a case-sensitive match.  Both share
+   * the same keyed form.
+   */
   sameText = 2,
+
+  /**
+   * The current token / word has a case-sensitive match with
+   * the suggestion in addition to sharing the same keyed form.
+   */
   exact = 3
 }
 
 export function tupleDisplayOrderSort(a: CorrectionPredictionTuple, b: CorrectionPredictionTuple) {
   // Similarity distance
-  const simDist = b.matchLevel - a.matchLevel;
+  const simDist = (b.matchLevel ?? 0) - (a.matchLevel ?? 0);
   if(simDist != 0) {
     return simDist;
   }
@@ -452,6 +512,28 @@ export function predictFromCorrections(
   return returnedPredictions;
 }
 
+/**
+ * Applies the specified casing-form to generated suggestions, leveraging the model's
+ * defined casing behaviors to do so.
+ * @param suggestion
+ * @param baseWord
+ * @param lexicalModel
+ * @param casingForm
+ */
+export function applySuggestionCasing(suggestion: Suggestion, baseWord: string, lexicalModel: LexicalModel, casingForm: CasingForm) {
+  // Step 1:  does the suggestion replace the whole word?  If not, we should extend the suggestion to do so.
+  let unchangedLength  = KMWString.length(baseWord) - suggestion.transform.deleteLeft;
+
+  if(unchangedLength > 0) {
+    suggestion.transform.deleteLeft += unchangedLength;
+    suggestion.transform.insert = KMWString.substr(baseWord, 0, unchangedLength) + suggestion.transform.insert;
+  }
+
+  // Step 2: Now that the transform affects the whole word, we may safely apply casing rules.
+  suggestion.transform.insert = lexicalModel.applyCasing(casingForm, suggestion.transform.insert);
+  suggestion.displayAs = lexicalModel.applyCasing(casingForm, suggestion.displayAs);
+}
+
 /**
  * Given an array of suggestions output from the correction and model-lookup processes,
  * this function checks for any duplicate suggestions and merges them.
@@ -590,8 +672,7 @@ export function processSimilarity(
     deleteLeft: basePrefixLength
   };
 
-  // 1 is a filler value; goes unused b/c is for a 'keep'.
-  let keepSuggestion = models.transformToSuggestion(keepTransform, 1);
+  let keepSuggestion = models.transformToSuggestion(keepTransform);
   // This is the one case where the transform doesn't insert the full word; we need to override the displayAs param.
   keepSuggestion.displayAs = truePrefix;
 
@@ -603,14 +684,17 @@ export function processSimilarity(
 
   // Insert our synthetic keepOption as a prediction.
   suggestionDistribution.unshift({
-    totalProb: keepOption.p,
+    // Product of the two p's below.
+    totalProb: inputTransformProb * MAX_PROB,
     prediction: {
       sample: keepOption,
-      p: keepOption.p,
+      // We always show the keep option if it doesn't directly match,
+      // so max probability is fine.
+      p: MAX_PROB,
     },
     correction: {
       sample: truePrefix,
-      p: inputTransformProb
+      p: inputTransformProb * MAX_PROB
     },
     matchLevel: SuggestionSimilarity.exact
   });
@@ -705,7 +789,7 @@ export function finalizeSuggestions(
   context: Context,
   inputTransform: Transform,
   verbose?: boolean
-) {
+): Outcome<Suggestion | Keep>[] {
   const punctuation = determinePunctuationFromModel(lexicalModel);
   const tokenize = determineModelTokenizer(lexicalModel);
 
@@ -734,11 +818,7 @@ export function finalizeSuggestions(
         p: tuple.totalProb
       };
     } else {
-      const sample: Suggestion & {
-        p?: number,
-        "lexical-p"?: number,
-        "correction-p"?: number
-      } = {
+      const sample: Outcome<Suggestion | Keep> = {
         ...prediction.sample,
         p: tuple.totalProb,
         "lexical-p": prediction.p,
@@ -781,28 +861,28 @@ export function finalizeSuggestions(
 
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: SuggestionTag,
   quoteBehavior?: models.QuoteBehavior
-): Outcome<Suggestion>;
+): Suggestion;
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: 'keep',
   quoteBehavior?: models.QuoteBehavior
-): Outcome<Keep>;
+): Keep;
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: 'revert',
   quoteBehavior?: models.QuoteBehavior
-): Outcome<Reversion>;
+): Reversion;
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: SuggestionTag,
   quoteBehavior: models.QuoteBehavior = models.QuoteBehavior.default
-): Outcome<Suggestion> {
+): Suggestion | Keep | Reversion {
   // A method-internal 'import' of the enum.
   let QuoteBehavior = models.QuoteBehavior;
   const punctuation = determinePunctuationFromModel(lexicalModel);
@@ -812,11 +892,10 @@ export function toAnnotatedSuggestion(
     defaultQuoteBehavior = QuoteBehavior.useQuotes;
   }
 
-  const result: Outcome<Suggestion> = {
+  const result: Suggestion = {
     transform: suggestion.transform,
     displayAs: QuoteBehavior.apply(quoteBehavior, suggestion.displayAs, punctuation, defaultQuoteBehavior),
     tag: annotationType,
-    p: suggestion.p
   };
 
   if(suggestion.transformId !== undefined) {
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts b/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts
new file mode 100644
index 0000000000..51001ef69d
--- /dev/null
+++ b/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts
@@ -0,0 +1,10 @@
+export { ClassicalDistanceCalculation } from './correction/classical-calculation.js';
+export { ContextTracker } from './correction/context-tracker.js';
+export * as correction from './correction/index.js';
+export * from './model-helpers.js';
+export * as models from './models/index.js';
+export { ModelCompositor } from './model-compositor.js';
+export { tokenizeTransform, tokenizeTransformDistribution } from './correction/transform-tokenization.js';
+export * from './predict-helpers.js';
+export { default as TransformUtils } from './transformUtils.js'
+export { default as LMLayerWorker } from './index.js'
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
index f627345cb9..9a0865094f 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
@@ -42,8 +42,8 @@ import { Token } from '@keymanapp/models-templates';
 /**
  * The signature of self.postMessage(), so that unit tests can mock it.
  */
-export type PostMessage = typeof DedicatedWorkerGlobalScope.prototype.postMessage;
-export type ImportScripts = typeof DedicatedWorkerGlobalScope.prototype.importScripts;
+export type PostMessage = (message: any, extra?: any) => void;
+export type ImportScripts = (...urls: string[]) => void;
 
 
 /**
diff --git a/web/src/engine/sentry-manager/build.sh b/web/src/engine/sentry-manager/build.sh
index e91b78ce7e..1054e152bc 100755
--- a/web/src/engine/sentry-manager/build.sh
+++ b/web/src/engine/sentry-manager/build.sh
@@ -5,11 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 builder_describe "Builds the Sentry-reporting module used with Keyman Engine for Web" \
   "@/common/web/keyman-version" \
@@ -31,7 +32,7 @@ fi
 ### CONFIGURE ACTIONS
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/samples/build.sh b/web/src/samples/build.sh
index fe5817e6e5..66533e40ff 100755
--- a/web/src/samples/build.sh
+++ b/web/src/samples/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # Imports common Web build-script definitions & functions
 . "$KEYMAN_ROOT/web/common.inc.sh"
diff --git a/web/src/engine/predictive-text/templates/tests/common.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/common.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/common.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/common.tests.ts
diff --git a/web/src/engine/predictive-text/templates/tests/custom-breakers.def.js b/web/src/test/auto/headless/engine/predictive-text/templates/custom-breakers.def.ts
similarity index 96%
rename from web/src/engine/predictive-text/templates/tests/custom-breakers.def.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/custom-breakers.def.ts
index c907467ce0..d80776ee5f 100644
--- a/web/src/engine/predictive-text/templates/tests/custom-breakers.def.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/custom-breakers.def.ts
@@ -3,7 +3,7 @@
  * https://github.com/keymanapp/lexical-models/pull/265.
  * @type {WordBreakingFunction}
  * */
-export function customWordBreakerProper(str) {
+export function customWordBreakerProper(str: string) {
   const whitespaceRegex = /\s|\u200b|\n|\r/;
   const tokens = str.split(whitespaceRegex);
 
@@ -74,7 +74,7 @@ export function customWordBreakerProper(str) {
  * triggered #12200.
  * @type {WordBreakingFunction}
  * */
-export function customWordBreakerFormer (str) {
+export function customWordBreakerFormer (str: string) {
   const tokens = str.split(/\s|\u200b/);
 
   for(let i=0; i < tokens.length; i++) {
@@ -122,7 +122,8 @@ export function customWordBreakerFormer (str) {
       start: str.indexOf(token),
       right: str.indexOf(token) + token.length,
       end: str.indexOf(token) + token.length,
-      text: token
+      text: token,
+      length: token.length
     }
   });
 }
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/templates/tests/helpers.js b/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
similarity index 67%
rename from web/src/engine/predictive-text/templates/tests/helpers.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
index 94ca5ed1b2..9ac77233d2 100644
--- a/web/src/engine/predictive-text/templates/tests/helpers.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
@@ -1,7 +1,8 @@
-import path from 'path';
-import { assert } from 'chai';
+import path from 'node:path';
+import { createRequire } from "node:module";
+import { fileURLToPath } from 'node:url';
 
-var _ = global;
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
 // TODO: move this to its own package; e.g., @keymanapp/models-test-helpers
 // TODO: then mocha invocation is as follows:
@@ -12,20 +13,18 @@ import { KMWString } from '@keymanapp/web-utils';
 // The predictive-text engine always keeps these enabled.
 KMWString.enableSupplementaryPlane(true);
 
-import { createRequire } from "module";
-import { fileURLToPath } from 'url';
-
 /**
  * Load JSON fixtures from a well-known place.
  */
-_.jsonFixture = function (name) {
+export function jsonFixture(name: string): any {
   // The most straight-forward way... is to use CommonJS-style require to load JSON.
   // Fortunately, Node provides the tools needed to recreate it.
   const require = createRequire(import.meta.url);
 
   // ES-module mode also leaves out `__dirname`, so we rebuild that too.
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
+  const __dirname = fileURLToPath(import.meta.url + '../../../../../../../../src/test/auto/resources/');
+
+  // Lands in /web/build/test/headless/engine/predictive-text/templates.
   return require(path.join(__dirname, 'fixtures', `${name}.json`));
 }
 
@@ -35,7 +34,7 @@ _.jsonFixture = function (name) {
  *
  * @returns {Context}
  */
-_.emptyContext = function emptyContext() {
+export function emptyContext(): LexicalModelTypes.Context {
   return {
     left: '',
     startOfBuffer: true,
@@ -48,7 +47,7 @@ _.emptyContext = function emptyContext() {
  *
  * @returns {Transform}
  */
-_.zeroTransform = function zeroTransform() {
+export function zeroTransform(): LexicalModelTypes.Transform {
   return {
     insert: '',
     deleteLeft: 0,
diff --git a/web/src/engine/predictive-text/templates/tests/quote-behavior.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/quote-behavior.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/quote-behavior.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/quote-behavior.tests.ts
diff --git a/web/src/engine/predictive-text/templates/tests/tokenization.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/tokenization.tests.ts
similarity index 97%
rename from web/src/engine/predictive-text/templates/tests/tokenization.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/tokenization.tests.ts
index d8f27197a2..3bc636c412 100644
--- a/web/src/engine/predictive-text/templates/tests/tokenization.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/tokenization.tests.ts
@@ -3,11 +3,15 @@
  */
 
 import { assert } from 'chai';
+
 import * as models from "@keymanapp/models-templates";
 import * as wordBreakers from "@keymanapp/models-wordbreakers";
-import { customWordBreakerFormer, customWordBreakerProper } from './custom-breakers.def.js';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-function asProcessedToken(text) {
+import { customWordBreakerFormer, customWordBreakerProper } from './custom-breakers.def.js';
+import { BreakerContext } from '@keymanapp/models-wordbreakers';
+
+function asProcessedToken(text: string) {
   // default wordbreaker emits these at the end of each context half if ending with whitespace.
   // Indicates a new spot for non-whitespace text.
   if(text == '') {
@@ -179,7 +183,7 @@ describe('Tokenization functions', function() {
 
       let tokenization = models.tokenize(wordBreakers.default, context);
 
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: [],
         right: [],
         caretSplitsToken: false
@@ -192,7 +196,7 @@ describe('Tokenization functions', function() {
       // Wordbreaking on a empty space => no word.
       let tokenization = models.tokenize(wordBreakers.default, null);
 
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: [],
         right: [],
         caretSplitsToken: false
@@ -210,7 +214,7 @@ describe('Tokenization functions', function() {
 
       let tokenization = models.tokenize(wordBreakers.default, context);
 
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: [' ', ''].map(asProcessedToken),
         right: [],
         caretSplitsToken: false
@@ -231,7 +235,7 @@ describe('Tokenization functions', function() {
 
       // Technically, we're editing the start of the first token on the right
       // when in this context.
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: ['I', ' ', 'can\''].map(asProcessedToken),
         right: [].map(asProcessedToken),
         caretSplitsToken: false
@@ -300,7 +304,7 @@ describe('Tokenization functions', function() {
 
     // For the next few tests:  a mocked wordbreaker for Khmer, a language
     // without whitespace between words.
-    let mockedKhmerBreaker = function(text) {
+    let mockedKhmerBreaker = function(text: string) {
       // Step 1:  Build constants for spans that a real wordbreaker would return.
       let srok = { // Khmer romanization of 'ស្រុក'
         text: 'ស្រុក',
@@ -331,7 +335,7 @@ describe('Tokenization functions', function() {
       }
 
       // Step 2: Allow shifting a defined 'constant' span without mutating the definition.
-      let shiftSpan = function(span, delta) {
+      let shiftSpan = function(span: LexicalModelTypes.Span, delta: number) {
         // Avoid mutating the parameter!
         let shiftedSpan = {
           text: span.text,
@@ -413,10 +417,10 @@ describe('Tokenization functions', function() {
       assert.deepEqual(tokenization, expectedResult);
     });
 
-    let midLetterNonbreaker = (text) => {
+    let midLetterNonbreaker = (text: string) => {
       let customization = {
         rules: [{
-          match: (context) => {
+          match: (context: BreakerContext) => {
             if(context.propertyMatch(null, ["ALetter"], ["MidLetter"], ["eot"])) {
               return true;
             } else {
@@ -425,7 +429,7 @@ describe('Tokenization functions', function() {
           },
           breakIfMatch: false
         }],
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           let hyphens = ['\u002d', '\u2010', '\u058a', '\u30a0'];
           if(hyphens.includes(char)) {
               return "MidLetter";
diff --git a/web/src/engine/predictive-text/templates/tests/trie-model.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/trie-model.tests.ts
similarity index 95%
rename from web/src/engine/predictive-text/templates/tests/trie-model.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/trie-model.tests.ts
index e63c66148b..25cb5adfae 100644
--- a/web/src/engine/predictive-text/templates/tests/trie-model.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/trie-model.tests.ts
@@ -3,8 +3,12 @@
  */
 
 import { assert } from 'chai';
+
 import { TrieModel } from '@keymanapp/models-templates';
 
+import { emptyContext, jsonFixture, zeroTransform } from './helpers.js';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
 describe('LMLayerWorker trie model for word lists', function() {
   describe('instantiation', function () {
     it('should expose the punctuation object', function () {
@@ -171,8 +175,8 @@ describe('LMLayerWorker trie model for word lists', function() {
 
       // the SAME results should be suggested (made the same query)
       assert.deepEqual(
-        otherResults.map(s => s.displayAs),
-        firstResults.map(s => s.displayAs)
+        otherResults.map(s => s.sample.displayAs),
+        firstResults.map(s => s.sample.displayAs)
       );
     });
   });
@@ -231,7 +235,7 @@ describe('LMLayerWorker trie model for word lists', function() {
       assert.strictEqual(newBuffer, 'the');
   });
 
-  function applyTransform(context, transform) {
+  function applyTransform(context: LexicalModelTypes.Context, transform: LexicalModelTypes.Transform) {
     assert.isTrue(context.endOfBuffer, "cannot only apply transform to end of buffer");
     var buffer = context.left;
     buffer = buffer.substr(0, buffer.length - transform.deleteLeft) + transform.insert;
@@ -242,7 +246,7 @@ describe('LMLayerWorker trie model for word lists', function() {
    * For use in predict().map(FUNC) to get the underlying suggestion.
    * @param {ProbabilityMass<T>} pm
    */
-  function getSample(pm) {
-    return pm.sample
+  function getSample<T>(pm: LexicalModelTypes.ProbabilityMass<T>) {
+    return pm.sample;
   }
 });
diff --git a/web/src/engine/predictive-text/templates/tests/trie-traversal.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/trie-traversal.tests.ts
similarity index 99%
rename from web/src/engine/predictive-text/templates/tests/trie-traversal.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/trie-traversal.tests.ts
index 09237ee9a0..6c3239f884 100644
--- a/web/src/engine/predictive-text/templates/tests/trie-traversal.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/trie-traversal.tests.ts
@@ -4,9 +4,10 @@
 
 import { assert } from 'chai';
 import { TrieModel } from '@keymanapp/models-templates';
+import { jsonFixture } from './helpers.js';
 
 // Useful for tests related to strings with supplementary pairs.
-var smpForUnicode = function(code){
+var smpForUnicode = function(code: number){
   var H = Math.floor((code - 0x10000) / 0x400) + 0xD800;
   var L = (code - 0x10000) % 0x400 + 0xDC00;
 
@@ -337,9 +338,6 @@ describe('Trie traversal abstractions', function() {
     // Just to be sure our utility function is working right.
     assert.equal(smpA + smpP + 'pl' + smpE, "𝖺𝗉pl𝖾");
 
-    let pKeys = ['p', smpP];
-    let leafChildSequence = ['l', smpE];
-
     const aNode = rootTraversal.child(smpA);
     assert.isOk(aNode);
     assert.isNotOk(rootTraversal.child('a'));
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/ascii-word-breaker.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/ascii-word-breaker.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/wordbreakers/tests/ascii-word-breaker.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/ascii-word-breaker.tests.ts
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/default-word-breaker.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/default-word-breaker.tests.ts
similarity index 96%
rename from web/src/engine/predictive-text/wordbreakers/tests/default-word-breaker.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/default-word-breaker.tests.ts
index 17c03cc4b8..192385ba10 100644
--- a/web/src/engine/predictive-text/wordbreakers/tests/default-word-breaker.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/default-word-breaker.tests.ts
@@ -3,7 +3,7 @@
  */
 
 import { assert } from 'chai';
-import { default as breakWords } from '@keymanapp/models-wordbreakers';
+import { default as breakWords, type BreakerContext } from '@keymanapp/models-wordbreakers';
 
 const SHY = '\u00AD'; // Other, Format.  The "Soft HYphen" - usually invisible unless needed for word-wrapping.
 
@@ -203,7 +203,7 @@ describe('The default word breaker', function () {
     it('custom prop, rule:  do not break on letter-adjacent hyphens', function() {
       let customization = {
         rules: [{
-          match: (context) => {
+          match: (context: BreakerContext) => {
             if(context.propertyMatch(null, ["ALetter"], ["Hyphen"], ["ALetter"])) {
               return true;
             } else if(context.propertyMatch(["ALetter"], ["Hyphen"], ["ALetter"], null)) {
@@ -214,7 +214,7 @@ describe('The default word breaker', function () {
           },
           breakIfMatch: false
         }],
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           const validHyphenCodes = [
             '\u002d', '\u2010', '\u058a', '\u30a0'
           ];
@@ -235,7 +235,7 @@ describe('The default word breaker', function () {
 
     it('mid-word hyphen via reassignment to MidLetter', function() {
       let customization = {
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           const validHyphenCodes = [
             '\u002d', '\u2010', '\u058a', '\u30a0'
           ];
@@ -256,7 +256,7 @@ describe('The default word breaker', function () {
     // Useful for some regional minority languages that prefer word-breaking spaces.
     it('character reassignment:  Khmer letters as ALetter', function() {
       let customization = {
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           if(char >= '\u1780' && char <= '\u17b3') {
             return "ALetter";
           } else {
@@ -279,7 +279,7 @@ describe('The default word breaker', function () {
         rules: [
           // WB5, but with differentiated consonants (ALetter) and vowels (AVowel)
           {
-            match: (context) => {
+            match: (context: BreakerContext) => {
               if(context.propertyMatch(null, ["ALetter", "AVowel"], ["ALetter", "AVowel"], null)) {
                 return true;
               } else {
@@ -290,7 +290,7 @@ describe('The default word breaker', function () {
           },
           // Proposed WB5a
           {
-            match: (context) => {
+            match: (context: BreakerContext) => {
               if(context.propertyMatch(null, ["Single_Quote"], ["AVowel"], null)) {
                 return true;
               } else {
@@ -301,7 +301,7 @@ describe('The default word breaker', function () {
           },
           // WB6, 7
           {
-            match: (context) => {
+            match: (context: BreakerContext) => {
               if(context.propertyMatch(null,
                                        ["ALetter", "AVowel"],
                                        ["MidLetter", "MidNumLet", "Single_Quote"],
@@ -321,7 +321,7 @@ describe('The default word breaker', function () {
           // Similar extensions to WB9, 10, 13a, and 13b would also be needed for robustness.
           // And I kind of left the Hebrew_Letter out of the WB5, 6, and 7 rewrites.
         ],
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           const vowels = ['a', 'e', 'i', 'o', 'u'];
           if(vowels.includes(char)) {
             return "AVowel";
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/placeholder-word-breaker.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/placeholder-word-breaker.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/wordbreakers/tests/placeholder-word-breaker.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/placeholder-word-breaker.tests.ts
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/search-property.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/search-property.tests.ts
similarity index 91%
rename from web/src/engine/predictive-text/wordbreakers/tests/search-property.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/search-property.tests.ts
index 9f33e4cc0c..e345154fa0 100644
--- a/web/src/engine/predictive-text/wordbreakers/tests/search-property.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/search-property.tests.ts
@@ -3,8 +3,7 @@
  */
 
 import { assert } from 'chai';
-import { searchForProperty } from '../build/main/obj/default/searchForProperty.js';
-import { propertyMap } from '../build/main/obj/default/data.inc.js';
+import { propertyMap, searchForProperty } from '@keymanapp/models-wordbreakers/test-index';
 
 describe('searchForProperty', () => {
   it('correctly finds character classes for standard ASCII characters', () => {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tracker.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
similarity index 90%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tracker.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
index 65298a2dd3..22171c92a1 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tracker.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
@@ -1,20 +1,23 @@
 import { assert } from 'chai';
 
-import { ContextTracker } from '#./correction/context-tracker.js';
-import { tokenizeTransformDistribution } from '#./correction/transform-tokenization.js';
-import ModelCompositor from '#./model-compositor.js';
-import * as models from '#./models/index.js';
-import { determineModelTokenizer } from '#./model-helpers.js';
-
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
 import { deepCopy } from '@keymanapp/web-utils';
-
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { ContextTracker, determineModelTokenizer, ModelCompositor, models, tokenizeTransformDistribution } from '@keymanapp/lm-worker/test-index';
+
+import Transform = LexicalModelTypes.Transform;
+import TrieModel = models.TrieModel;
+
+const plainModel = new TrieModel(jsonFixture('models/tries/english-1000'),
+  {wordBreaker: defaultBreaker}
+);
 
 const tokenizer = determineModelTokenizer(new models.DummyModel({wordbreaker: defaultBreaker}));
 
 describe('ContextTracker', function() {
-  function toWrapperDistribution(transforms) {
+  function toWrapperDistribution(transforms: Transform | Transform[]) {
     transforms = Array.isArray(transforms) ? transforms : [transforms];
     return [{
       sample: transforms,
@@ -27,7 +30,7 @@ describe('ContextTracker', function() {
       let existingContext = models.tokenize(defaultBreaker, {
         left: "an apple a day keeps the doctor"
       });
-      let transform = {
+      let transform: Transform = {
         insert: '',
         deleteLeft: 0
       }
@@ -35,7 +38,7 @@ describe('ContextTracker', function() {
       newContext.left.splice(0, 1);
       let rawTokens = [" ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(newContext.left, baseContextMatch, toWrapperDistribution(transform));
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -55,7 +58,7 @@ describe('ContextTracker', function() {
       newContext.left.splice(0, 2);
       let rawTokens = ["apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(newContext.left, baseContextMatch, toWrapperDistribution(transform));
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -67,7 +70,7 @@ describe('ContextTracker', function() {
       let existingContext = models.tokenize(defaultBreaker, {
         left: "an apple a day keeps the docto"
       });
-      let transform = {
+      let transform: Transform = {
         insert: 'r',
         deleteLeft: 0
       }
@@ -76,7 +79,7 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(newContext.left, baseContextMatch, toWrapperDistribution(transform));
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -98,7 +101,7 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(newContext.left, baseContextMatch, toWrapperDistribution(transform));
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -126,7 +129,7 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(newContext.left, baseContextMatch, toWrapperDistribution(transform));
       assert.isOk(newContextMatch?.state);
       assert.deepEqual(newContextMatch?.state.tokens.map(token => token.raw), rawTokens);
@@ -149,7 +152,7 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["'", "a"];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(newContext.left, baseContextMatch, toWrapperDistribution(transform));
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -178,7 +181,7 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(newContext.left, baseContextMatch, toWrapperDistribution(transform));
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -207,11 +210,11 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["and", " ", ""];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(
-        newContext.left, 
-        baseContextMatch, 
-        tokenizeTransformDistribution(tokenizer, {left: "an"}, [{sample: transform, p: 1}])
+        newContext.left,
+        baseContextMatch,
+        tokenizeTransformDistribution(tokenizer, {left: "an", startOfBuffer: true, endOfBuffer: true}, [{sample: transform, p: 1}])
       );
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -240,11 +243,11 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
-      let baseContextMatch = ContextTracker.modelContextState(existingContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(existingContext.left, plainModel);
       let newContextMatch = ContextTracker.attemptMatchContext(
-        newContext.left, 
-        baseContextMatch, 
-        tokenizeTransformDistribution(tokenizer, {left: "apple a day keeps the doc"}, [{sample: transform, p: 1}])
+        newContext.left,
+        baseContextMatch,
+        tokenizeTransformDistribution(tokenizer, {left: "apple a day keeps the doc", startOfBuffer: true, endOfBuffer: true}, [{sample: transform, p: 1}])
       );
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokens.map(token => token.raw), rawTokens);
@@ -265,13 +268,13 @@ describe('ContextTracker', function() {
         left: "text'"
       });
       assert.equal(baseContext.left.length, 1);
-      let baseContextMatch = ContextTracker.modelContextState(baseContext.left);
+      let baseContextMatch = ContextTracker.modelContextState(baseContext.left, plainModel);
 
       // Now the actual check.
       let newContext = models.tokenize(defaultBreaker, {
         left: "text'\""
       });
-      // The reason it's a problem - current internal logic isn't prepared to shift 
+      // The reason it's a problem - current internal logic isn't prepared to shift
       // from 1 to 3 tokens in a single step.
       assert.equal(newContext.left.length, 3);
 
@@ -280,9 +283,9 @@ describe('ContextTracker', function() {
         deleteLeft: 0
       }
       let problemContextMatch = ContextTracker.attemptMatchContext(
-        newContext.left, 
-        baseContextMatch, 
-        tokenizeTransformDistribution(tokenizer, {left: "text'"}, [{sample: transform, p: 1}])
+        newContext.left,
+        baseContextMatch,
+        tokenizeTransformDistribution(tokenizer, {left: "text'", startOfBuffer: true, endOfBuffer: true}, [{sample: transform, p: 1}])
       );
       assert.isNull(problemContextMatch);
     });
@@ -298,7 +301,7 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
-      let state = ContextTracker.modelContextState(tokenized);
+      let state = ContextTracker.modelContextState(tokenized, plainModel);
       assert.deepEqual(state.tokens.map(token => token.raw), rawTokens);
     });
 
@@ -311,7 +314,7 @@ describe('ContextTracker', function() {
       });
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
-      let state = ContextTracker.modelContextState(tokenized);
+      let state = ContextTracker.modelContextState(tokenized, plainModel);
       assert.deepEqual(state.tokens.map(token => token.raw), rawTokens);
     });
   });
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/classical-calculation.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/classical-calculation.tests.ts
similarity index 98%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/classical-calculation.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/classical-calculation.tests.ts
index 07a86b2bbb..998a8b2ec7 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/classical-calculation.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/classical-calculation.tests.ts
@@ -1,7 +1,9 @@
 import { assert } from 'chai';
-import { ClassicalDistanceCalculation } from '#./correction/classical-calculation.js';
+import { ClassicalDistanceCalculation } from '@keymanapp/lm-worker/test-index';
 
-function prettyPrintMatrix(matrix) {
+// Very useful for diagnosing unit test issues when path inspection is needed.
+// Not currently used ('cause that's noisy during test runs).
+export function prettyPrintMatrix(matrix: number[][]) {
   for(let r = 0; r < matrix.length; r++) {
     console.log(JSON.stringify(matrix[r], function(key, value) {
       if(value == Number.MAX_VALUE) {
@@ -15,7 +17,7 @@ function prettyPrintMatrix(matrix) {
   }
 }
 
-function compute(input, match, mode, bandSize) {
+function compute(input: string, match: string, mode?: string, bandSize?: number) {
   let buffer = new ClassicalDistanceCalculation();
 
   /* SUPPORTED MODES:
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/distance-modeler.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
similarity index 93%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/distance-modeler.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
index b49b511e37..deb8d03d16 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/distance-modeler.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
@@ -1,19 +1,21 @@
 import { assert } from 'chai';
-import * as models from '#./models/index.js';
-import * as correction from '#./correction/index.js';
 
 import { PriorityQueue } from '@keymanapp/web-utils';
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
+import { correction, models } from '@keymanapp/lm-worker/test-index';
+
+import TrieModel = models.TrieModel;
+
 function buildTestTimer() {
   return new correction.ExecutionTimer(Number.MAX_VALUE, Number.MAX_VALUE);
 }
 
-function assertEdgeChars(edge, input, match) {
+function assertEdgeChars(edge: correction.SearchNode, input: string, match: string) {
   assert.isTrue(edgeHasChars(edge, input, match));
 }
 
-function edgeHasChars(edge, input, match) {
+function edgeHasChars(edge: correction.SearchNode, input: string, match: string) {
   if(edge.priorInput[edge.priorInput.length - 1].sample.insert != input) {
     return false;
   }
@@ -21,7 +23,7 @@ function edgeHasChars(edge, input, match) {
   return edge.calculation.lastMatchEntry.key == match;
 }
 
-function findEdgeWithChars(edgeArray, input, match) {
+function findEdgeWithChars(edgeArray: correction.SearchNode[], input: string, match: string) {
   let results = edgeArray.filter(function(value) {
     return value.calculation.lastMatchEntry.key == match && value.priorInput[value.priorInput.length - 1].sample.insert == input;
   });
@@ -32,10 +34,10 @@ function findEdgeWithChars(edgeArray, input, match) {
 
 describe('Correction Distance Modeler', function() {
   describe('SearchNode + SearchEdge', function() {
-    var testModel;
+    var testModel: TrieModel;
 
     before(function() {
-      testModel = new models.TrieModel(jsonFixture('models/tries/english-1000'));
+      testModel = new TrieModel(jsonFixture('models/tries/english-1000'));
     });
 
     it('SearchNode.buildInsertionEdges() - from root', function() {
@@ -247,17 +249,17 @@ describe('Correction Distance Modeler', function() {
   });
 
   describe('SearchSpaceTier + SearchSpace', function() {
-    var testModel;
+    var testModel: TrieModel;
 
     before(function() {
-      testModel = new models.TrieModel(jsonFixture('models/tries/english-1000'));
+      testModel = new TrieModel(jsonFixture('models/tries/english-1000'));
     });
 
-    let checkResults_teh = async function(iter) {
-      let firstResult = await iter.next();  // {value: <actual value>, done: <iteration complete?>}
-      assert.isFalse(firstResult.done);
+    let checkResults_teh = async function(iter: AsyncGenerator<correction.SearchResult, any, any>) {
+      let firstIterResult = await iter.next();  // {value: <actual value>, done: <iteration complete?>}
+      assert.isFalse(firstIterResult.done);
 
-      firstResult = firstResult.value; // Retrieves <actual value>
+      const firstResult: correction.SearchResult = firstIterResult.value; // Retrieves <actual value>
       // No checks on the first set's cost.
       assert.equal(firstResult.matchString, "ten");
 
@@ -268,9 +270,8 @@ describe('Correction Distance Modeler', function() {
         'the'
       ];
 
-      async function checkBatch(batch, prevCost) {
+      async function checkBatch(batch: string[], prevCost: number) {
         let cost;
-        firstResult = firstResult;
         while(batch.length > 0) {
           const iter_result = await iter.next();
           assert.isFalse(iter_result.done);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/early-correction-search-stopping.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/early-correction-search-stopping.tests.ts
similarity index 87%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/early-correction-search-stopping.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/early-correction-search-stopping.tests.ts
index 299f5069d4..bf45e3b94e 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/early-correction-search-stopping.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/early-correction-search-stopping.tests.ts
@@ -1,7 +1,6 @@
 import { assert } from 'chai';
 
-import { CORRECTION_SEARCH_THRESHOLDS, shouldStopSearchingEarly } from "#./predict-helpers.js";
-import { ModelCompositor } from '#./model-compositor.js';
+import { CORRECTION_SEARCH_THRESHOLDS, CorrectionPredictionTuple, ModelCompositor, shouldStopSearchingEarly } from "@keymanapp/lm-worker/test-index";
 
 describe('correction-search: shouldStopSearchingEarly', () => {
   it('stops early once new corrections are less likely than currently discovered predictions', () => {
@@ -17,7 +16,7 @@ describe('correction-search: shouldStopSearchingEarly', () => {
     const predictions = predictionProbs.map((entry) => {
       return {
         totalProb: entry
-      }
+      } as CorrectionPredictionTuple
     });
 
     // Thresholding is performed in log-space.
@@ -34,8 +33,8 @@ describe('correction-search: shouldStopSearchingEarly', () => {
     //
     // Can technically run the method with an empty array, but the actual scenario would have
     // at least one prediction present in the "found predictions" array.
-    assert.isFalse(shouldStopSearchingEarly(baseCost, baseCost + expectedThreshold - 0.01, [{ totalProb: Math.exp(-1) }]));
-    assert.isTrue(shouldStopSearchingEarly( baseCost, baseCost + expectedThreshold + 0.01, [{ totalProb: Math.exp(-1) }]));
+    assert.isFalse(shouldStopSearchingEarly(baseCost, baseCost + expectedThreshold - 0.01, [{ totalProb: Math.exp(-1) } as CorrectionPredictionTuple]));
+    assert.isTrue(shouldStopSearchingEarly( baseCost, baseCost + expectedThreshold + 0.01, [{ totalProb: Math.exp(-1) } as CorrectionPredictionTuple]));
   });
 
   it('stops checking corrections earlier when enough predictions have been found', () => {
@@ -47,7 +46,7 @@ describe('correction-search: shouldStopSearchingEarly', () => {
     const predictions = predictionProbs.map((entry) => {
       return {
         totalProb: entry
-      }
+      } as CorrectionPredictionTuple
     });
 
     const baseCost = 1;
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/execution-timer.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/execution-timer.tests.ts
similarity index 97%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/execution-timer.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/execution-timer.tests.ts
index dcabec6f49..dfccaf684b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/execution-timer.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/execution-timer.tests.ts
@@ -1,11 +1,12 @@
 import { assert } from 'chai';
-import { useFakeTimers } from 'sinon';
+import { useFakeTimers, type SinonFakeTimers } from 'sinon';
 
-import { ExecutionBucket, ExecutionTimer } from '#./correction/index.js';
+import { correction } from '@keymanapp/lm-worker/test-index';
+import ExecutionBucket = correction.ExecutionBucket;
+import ExecutionTimer = correction.ExecutionTimer;
 
 describe('ExecutionTimer', () => {
-  /** @type {import('sinon').SinonFakeTimers} */
-  let timeControl;
+  let timeControl: SinonFakeTimers;
 
   beforeEach(() => {
     timeControl = useFakeTimers();
@@ -92,7 +93,7 @@ describe('ExecutionTimer', () => {
   it('defer() - alternate setup', async () => {
     const timer = new ExecutionTimer(50, 100);
 
-    const delaySetup = new Promise(async (resolve) => {
+    const delaySetup = new Promise<void>(async (resolve) => {
       // The passed-in function does not delay by default; this will wait for
       // one microtask delay before proceeding.
       //
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/auto-correct.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/auto-correct.tests.ts
similarity index 83%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/auto-correct.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/auto-correct.tests.ts
index d1e4d377a1..d1ba7b9dee 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/auto-correct.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/auto-correct.tests.ts
@@ -1,6 +1,6 @@
-import { AUTOSELECT_PROPORTION_THRESHOLD, SuggestionSimilarity, predictionAutoSelect, tupleDisplayOrderSort } from "#./predict-helpers.js";
 import { assert } from 'chai';
 
+import { AUTOSELECT_PROPORTION_THRESHOLD, CorrectionPredictionTuple, predictionAutoSelect, SuggestionSimilarity, tupleDisplayOrderSort } from "@keymanapp/lm-worker/test-index";
 /*
   * Preconditions:
   * - there should always be a 'keep' option.  Now, whether or not that option
@@ -9,10 +9,7 @@ import { assert } from 'chai';
   */
 describe('predictionAutoSelect', () => {
   it(`does not throw when no suggestions are available`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [];
+    const predictions: CorrectionPredictionTuple[] = [];
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
 
@@ -20,10 +17,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`selects solitary 'keep' suggestion that does match the model`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       {
         correction: {
           sample: 'apple', // can be null / "mocked out"
@@ -36,7 +30,8 @@ describe('predictionAutoSelect', () => {
               insert: 'e',
               deleteLeft: 0
             },
-            matchesModel: true
+            matchesModel: true,
+            displayAs: 'apple'
           },
           p: 1
         },
@@ -53,10 +48,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`does not select solitary 'keep' suggestion that doesn't match the model`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       {
         correction: {
           sample: 'appl', // can be null / "mocked out"
@@ -69,7 +61,8 @@ describe('predictionAutoSelect', () => {
               insert: 'l',
               deleteLeft: 0
             },
-            matchesModel: false
+            matchesModel: false,
+            displayAs: '"appl"'
           },
           p: 1
         },
@@ -86,10 +79,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`selects 'keep' suggestion that does match the model over any alternatives`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .8
@@ -101,14 +91,15 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
-          matchesModel: true
+          matchesModel: true,
+          displayAs: 'thin'
         },
         p: .05
       },
       totalProb: .04
     }
 
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .8
@@ -119,16 +110,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .55
       },
       totalProb: .44
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       {
@@ -142,6 +131,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ng',
               deleteLeft: 0
             },
+            displayAs: 'thing'
           },
           p: .4
         },
@@ -158,6 +148,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ck',
               deleteLeft: 0
             },
+            displayAs: 'thick'
           },
           p: 1
         },
@@ -165,21 +156,16 @@ describe('predictionAutoSelect', () => {
       }
     ];
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.equal(autoselected, keepSuggestion);
   });
 
   it(`selects solitary non-'keep' suggestion when 'keep' does not match model`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .8
@@ -191,6 +177,7 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
+          displayAs: '"thin"',
           matchesModel: false
         },
         p: .05
@@ -202,7 +189,7 @@ describe('predictionAutoSelect', () => {
     // This threshold may be subject to change.
     //
     // Refer to AUTOSELECT_PROPORTION_THRESHOLD in predict-helpers.ts.
-    const onlyNonKeepSuggestion = {
+    const onlyNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .8
@@ -213,16 +200,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .01
       },
       totalProb: .008
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       onlyNonKeepSuggestion
     ];
@@ -241,10 +226,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`does not select non-'keep' without sufficient winning probability`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .8
@@ -256,6 +238,7 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
+          displayAs: '"thin"',
           matchesModel: false
         },
         p: .05
@@ -267,7 +250,7 @@ describe('predictionAutoSelect', () => {
     // This threshold may be subject to change.
     //
     // Refer to AUTOSELECT_PROPORTION_THRESHOLD in predict-helpers.ts.
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .8
@@ -278,16 +261,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .55
       },
       totalProb: .44
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       {
@@ -301,6 +282,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ng',
               deleteLeft: 0
             },
+            displayAs: 'thing'
           },
           p: .4
         },
@@ -317,6 +299,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ck',
               deleteLeft: 0
             },
+            displayAs: 'thick'
           },
           p: 1
         },
@@ -338,10 +321,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`does select non-'keep' with sufficient winning probability`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .8
@@ -353,6 +333,7 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
+          displayAs: '"thin"',
           matchesModel: false
         },
         p: .05
@@ -360,7 +341,7 @@ describe('predictionAutoSelect', () => {
       totalProb: .04
     }
 
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin', // can be null / "mocked out"
         p: .9
@@ -371,16 +352,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .75
       },
       totalProb: .675
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       {
@@ -394,6 +373,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ng',
               deleteLeft: 0
             },
+            displayAs: 'thing'
           },
           p: .2
         },
@@ -410,6 +390,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ck',
               deleteLeft: 0
             },
+            displayAs: 'thick'
           },
           p: 1
         },
@@ -420,21 +401,16 @@ describe('predictionAutoSelect', () => {
     const totalProb = predictions.reduce((accum, current) => accum + current.totalProb, 0);
     assert.isAbove(highestNonKeepSuggestion.totalProb, totalProb * AUTOSELECT_PROPORTION_THRESHOLD, 'test setup is no longer valid');
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.equal(autoselected, highestNonKeepSuggestion);
   });
 
   it('ignores non key-matched suggestions when key-matched suggestions exist', () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'cant', // can be null / "mocked out"
         p: 1
@@ -446,6 +422,7 @@ describe('predictionAutoSelect', () => {
             insert: 't',
             deleteLeft: 0
           },
+          displayAs: '"cant"',
           matchesModel: false
         },
         p: 1
@@ -454,7 +431,7 @@ describe('predictionAutoSelect', () => {
       matchLevel: SuggestionSimilarity.exact
     }
 
-    const expectedSuggestion = {
+    const expectedSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'cant', // can be null / "mocked out"
         p: 1
@@ -465,6 +442,7 @@ describe('predictionAutoSelect', () => {
             insert: '\'t',
             deleteLeft: 0
           },
+          displayAs: "can't"
         },
         p: .2
       },
@@ -472,10 +450,7 @@ describe('predictionAutoSelect', () => {
       matchLevel: SuggestionSimilarity.sameKey
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       expectedSuggestion,
       {
@@ -489,6 +464,7 @@ describe('predictionAutoSelect', () => {
               insert: 'teen',
               deleteLeft: 0
             },
+            displayAs: 'canteen'
           },
           p: .8
         },
@@ -497,11 +473,10 @@ describe('predictionAutoSelect', () => {
       }
     ];
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.equal(autoselected, expectedSuggestion);
@@ -510,10 +485,7 @@ describe('predictionAutoSelect', () => {
   // The idea:  avoid "over-correcting" when a potential correction has a
   // super-high-frequency word.
   it('does not auto-select suggestion if its root correction is not most likely', () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thi', // can be null / "mocked out"
         p: .7
@@ -525,6 +497,7 @@ describe('predictionAutoSelect', () => {
             insert: 'i',
             deleteLeft: 0
           },
+          displayAs: '"thi"',
           matchesModel: false
         },
         p: .05
@@ -532,7 +505,7 @@ describe('predictionAutoSelect', () => {
       totalProb: .035
     }
 
-    const highestCorrectionSuggestion = {
+    const highestCorrectionSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thi', // can be null / "mocked out"
         p: .7
@@ -543,13 +516,14 @@ describe('predictionAutoSelect', () => {
             insert: 'in',
             deleteLeft: 0
           },
+          displayAs: 'thin'
         },
         p: .1
       },
       totalProb: .07
     };
 
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'the', // can be null / "mocked out"
         p: .3
@@ -560,16 +534,14 @@ describe('predictionAutoSelect', () => {
             insert: 'e',
             deleteLeft: 0
           },
+          displayAs: 'the'
         },
         p: 1
       },
       totalProb: .3
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       highestCorrectionSuggestion
@@ -578,11 +550,9 @@ describe('predictionAutoSelect', () => {
     const totalProb = predictions.reduce((accum, current) => accum + current.totalProb, 0);
     assert.isAbove(highestNonKeepSuggestion.totalProb, totalProb * AUTOSELECT_PROPORTION_THRESHOLD, 'test setup is no longer valid');
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.isNotOk(autoselected);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/casing-detection.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/casing-detection.tests.ts
similarity index 97%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/casing-detection.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/casing-detection.tests.ts
index 98c7dcb742..84e80a00f2 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/casing-detection.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/casing-detection.tests.ts
@@ -1,8 +1,9 @@
 import { assert } from 'chai';
-import { ModelCompositor } from '#./model-compositor.js';
 
-import { detectCurrentCasing } from "#./model-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import { LexicalModelTypes } from '@keymanapp/common-types';
+import { detectCurrentCasing, ModelCompositor, models } from '@keymanapp/lm-worker/test-index';
+
+import DummyModel = models.DummyModel;
 
 const defaultCasingModel = new DummyModel({
   languageUsesCasing: true,
@@ -37,8 +38,7 @@ const defaultCasingModel = new DummyModel({
   }
 });
 
-/** @type {CasingFunction} */
-const leetCasing = (casing, text) => {
+const leetCasing: LexicalModelTypes.CasingFunction = (casing, text) => {
   // Don't know if there's a standard analogue for '9', but this'll work well enough.
   const plain = ['O', 'L', 'Z', 'E', 'A', 'S', 'G', 'T', 'B']
   const leet  = ['0', '1', '2', '3', '4', '5', '6', '7', '8']
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/predict-from-corrections.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
similarity index 86%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/predict-from-corrections.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
index 3b89c94ef9..54eec72955 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/predict-from-corrections.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
@@ -1,11 +1,21 @@
-import { deepCopy } from "@keymanapp/web-utils";
+
 import { assert } from 'chai';
 
-import { predictFromCorrections, tupleDisplayOrderSort } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import { deepCopy } from "@keymanapp/web-utils";
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { models, predictFromCorrections, tupleDisplayOrderSort } from "@keymanapp/lm-worker/test-index";
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import Context = LexicalModelTypes.Context;
+import Distribution = LexicalModelTypes.Distribution;
+import DummyModel = models.DummyModel;
+import Outcome = LexicalModelTypes.Outcome;
+import Suggestion = LexicalModelTypes.Suggestion;
+import Transform = LexicalModelTypes.Transform;
 
 // See: developer/src/kmc-model/model-defaults.ts, defaultApplyCasing
-const applyCasing = (casing, text) => {
+const applyCasing: CasingFunction = (casing, text) => {
   switch(casing) {
     case 'lower':
       return text.toLowerCase();
@@ -44,7 +54,7 @@ const DUMMY_MODEL_CONFIG = {
     insertAfterWord: '\u00a0' // non-breaking space
   },
   applyCasing: applyCasing,
-  searchTermToKey: (wordform) => {
+  searchTermToKey: (wordform: string) => {
     // See: developer/src/kmc-model/model-defaults.ts, defaultCasedSearchTermToKey
     return applyCasing('lower', wordform)
       .normalize('NFKD')
@@ -63,16 +73,14 @@ const DUMMY_MODEL_CONFIG = {
 
 describe('predictFromCorrections', () => {
   it('handles a single correction prefixing multiple entries - no transform ID', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {Distribution<Transform>} */
-    const correctionDistribution = [{
+    const correctionDistribution: Distribution<Transform> = [{
         sample: {
           insert: 's',
           deleteLeft: 0
@@ -81,8 +89,7 @@ describe('predictFromCorrections', () => {
       }
     ];
 
-    /** @type {ProbabilityMass<Suggestion>[]} */
-    const dummied_suggestions = [
+    const dummied_suggestions: Outcome<Suggestion>[] = [
       {
         transform: {
           insert: "it's",
@@ -117,16 +124,14 @@ describe('predictFromCorrections', () => {
   });
 
   it('handles a single correction prefixing multiple entries - with transform ID', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {Distribution<Transform>} */
-    const correctionDistribution = [{
+    const correctionDistribution: Distribution<Transform> = [{
         sample: {
           insert: 's',
           deleteLeft: 0,
@@ -136,8 +141,7 @@ describe('predictFromCorrections', () => {
       }
     ];
 
-    /** @type {ProbabilityMass<Suggestion>[]} */
-    const dummied_suggestions = [
+    const dummied_suggestions: Outcome<Suggestion>[] = [
       {
         transform: {
           insert: "it's",
@@ -177,8 +181,7 @@ describe('predictFromCorrections', () => {
   });
 
   it('handles multiple corrections at once', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
@@ -187,7 +190,7 @@ describe('predictFromCorrections', () => {
 
     // Note:  each correction is used in order in a separate model.predict call.
     /** @type {Distribution<Transform>} */
-    const correctionDistribution = [{
+    const correctionDistribution: Distribution<Transform> = [{
         // postContext:  is
         sample: {
           insert: 's',
@@ -204,8 +207,7 @@ describe('predictFromCorrections', () => {
       }
     ];
 
-    /** @type {ProbabilityMass<Suggestion>[]} */
-    const dummied_suggestions = [
+    const dummied_suggestions: Outcome<Suggestion>[][] = [
       // postContext:  is
       [{
         transform: {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-deduplication.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
similarity index 84%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-deduplication.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
index 84babcf4b4..eea66d8ad0 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-deduplication.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
@@ -1,9 +1,13 @@
-import * as wordBreakers from '@keymanapp/models-wordbreakers';
-import { deepCopy } from '@keymanapp/web-utils';
 import { assert } from 'chai';
 
-import { dedupeSuggestions } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
+import { deepCopy } from '@keymanapp/web-utils';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { CorrectionPredictionTuple, dedupeSuggestions, models } from "@keymanapp/lm-worker/test-index";
+
+import Context = LexicalModelTypes.Context;
+import DummyModel = models.DummyModel;
 
 /*
  * This file's tests use these parts of a lexical model:
@@ -20,8 +24,7 @@ const testModel = new DummyModel({
  * @returns
  */
 const build_its_is_set = () => {
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const its = {
+  const its: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -40,8 +43,7 @@ const build_its_is_set = () => {
     // matchLevel does not yet exist.
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const it_is = {
+  const it_is: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -59,8 +61,7 @@ const build_its_is_set = () => {
     totalProb: 0.64
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is = {
+  const is: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -78,8 +79,7 @@ const build_its_is_set = () => {
     totalProb: 0.1
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is_not = {
+  const is_not: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -107,8 +107,7 @@ const build_its_is_set = () => {
 
 describe('dedupeSuggestions', () => {
   it('preserves all entries when there are no duplicates', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
@@ -125,8 +124,7 @@ describe('dedupeSuggestions', () => {
   });
 
   it('removes duplicates, combining their total-probabilities', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-finalization.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
similarity index 94%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-finalization.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
index a1f7e65f17..e79af94304 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-finalization.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
@@ -1,9 +1,15 @@
-import * as wordBreakers from '@keymanapp/models-wordbreakers';
+
 import { assert } from 'chai';
 
-import { finalizeSuggestions } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
 import { deepCopy } from '@keymanapp/web-utils';
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { CorrectionPredictionTuple, finalizeSuggestions, models } from "@keymanapp/lm-worker/test-index";
+
+import DummyModel = models.DummyModel;
+import Outcome = LexicalModelTypes.Outcome;
+import Suggestion = LexicalModelTypes.Suggestion;
 
 /*
  * This file's tests use these parts of a lexical model:
@@ -39,11 +45,10 @@ const testModelWithoutSpacing = new DummyModel({
  * @param {'verbose'=} verbose
  * @returns
  */
-const build_its_is_set = (verbose) => {
+const build_its_is_set = (verbose?: string) => {
   const verboseFlag = (verbose == 'verbose' ? true : false);
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const its = {
+  const its: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -62,8 +67,7 @@ const build_its_is_set = (verbose) => {
     // matchLevel does not yet exist.
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const it_is = {
+  const it_is: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -81,8 +85,7 @@ const build_its_is_set = (verbose) => {
     totalProb: 0.64
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is = {
+  const is: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -100,8 +103,7 @@ const build_its_is_set = (verbose) => {
     totalProb: 0.1
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is_not = {
+  const is_not: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -129,7 +131,7 @@ const build_its_is_set = (verbose) => {
   const unfinalized = [...Object.values(baseDefinitions)].map((entry) => deepCopy(entry));
   const expected = unfinalized.map((entry) => {
 
-    const mapped = {
+    const mapped: Outcome<Suggestion & { 'correction-p'?: number, 'lexical-p'?: number }> = {
       ...deepCopy(entry.prediction.sample),
       p: entry.totalProb
     };
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-similarity.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
similarity index 85%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-similarity.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
index 18fa1307b1..ae5133cf4b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-similarity.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
@@ -1,10 +1,18 @@
+import { assert } from 'chai';
+
 import { QuoteBehavior } from "@keymanapp/models-templates";
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
 import { deepCopy } from '@keymanapp/web-utils';
-import { assert } from 'chai';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-import { SuggestionSimilarity, processSimilarity, toAnnotatedSuggestion } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import { CorrectionPredictionTuple, models, processSimilarity, SuggestionSimilarity, toAnnotatedSuggestion } from "@keymanapp/lm-worker/test-index";
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import Context = LexicalModelTypes.Context;
+import DummyModel = models.DummyModel;
+import DummyOptions = models.DummyOptions;
+import ProbabilityMass = LexicalModelTypes.ProbabilityMass;
+import Transform = LexicalModelTypes.Transform;
 
 /*
  * This file's tests use these parts of a lexical model:
@@ -14,8 +22,7 @@ import { DummyModel } from "#./models/dummy-model.js";
  * - model.punctuation
  */
 
-/** @type { import("#./models/dummy-model.js").DummyOptions } */
-const DUMMY_MODEL_CONFIG = {
+const DUMMY_MODEL_CONFIG: DummyOptions = {
   punctuation: {
     quotesForKeepSuggestion: {
       open: '<',
@@ -27,7 +34,7 @@ const DUMMY_MODEL_CONFIG = {
 };
 
 // See: developer/src/kmc-model/model-defaults.ts, defaultApplyCasing
-const applyCasing = (casing, text) => {
+const applyCasing: CasingFunction = (casing, text) => {
   switch(casing) {
     case 'lower':
       return text.toLowerCase();
@@ -102,8 +109,7 @@ const testModelWithCasing = new DummyModel({
  * @returns
  */
 const build_its_is_set = () => {
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const its = {
+  const its: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -122,8 +128,7 @@ const build_its_is_set = () => {
     // matchLevel does not yet exist.
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const it_is = {
+  const it_is: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -141,8 +146,7 @@ const build_its_is_set = () => {
     totalProb: 0.64
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is = {
+  const is: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -160,8 +164,7 @@ const build_its_is_set = () => {
     totalProb: 0.1
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is_not = {
+  const is_not: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -189,16 +192,14 @@ const build_its_is_set = () => {
 
 describe('processSimilarity', () => {
   it(`selects non-contraction as 'more similar' than same-keyed contraction when context is non-contraction`, () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {ProbabilityMass<Transform>} */
-    const trueInput = {
+    const trueInput: ProbabilityMass<Transform> = {
       sample: {
         insert: 's',
         deleteLeft: 0
@@ -209,8 +210,7 @@ describe('processSimilarity', () => {
     const testSet = build_its_is_set();
     const distribution = [...Object.values(testSet)];
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const expectation = [
+    const expectation: CorrectionPredictionTuple[] = [
       {
         ...testSet.its,
         matchLevel: SuggestionSimilarity.exact
@@ -239,16 +239,14 @@ describe('processSimilarity', () => {
   });
 
   it(`selects contraction as 'more similar' than same-keyed non-contraction when context is contraction`, () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {ProbabilityMass<Transform>} */
-    const trueInput = {
+    const trueInput: ProbabilityMass<Transform> = {
       sample: {
         insert: '\'s',
         deleteLeft: 0
@@ -259,8 +257,7 @@ describe('processSimilarity', () => {
     const testSet = build_its_is_set();
     const distribution = [...Object.values(testSet)];
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const expectation = [
+    const expectation: CorrectionPredictionTuple[] = [
       {
         ...testSet.its,
         matchLevel: SuggestionSimilarity.sameKey
@@ -289,16 +286,14 @@ describe('processSimilarity', () => {
   });
 
   it(`creates an 'exact'-match suggestion as 'keep' if no exact-match exists`, () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'iphon',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {ProbabilityMass<Transform>} */
-    const trueInput = {
+    const trueInput: ProbabilityMass<Transform> = {
       sample: {
         insert: 'e',
         deleteLeft: 0
@@ -306,8 +301,7 @@ describe('processSimilarity', () => {
       p: 1
     };
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-    const iPhone = {
+    const iPhone: CorrectionPredictionTuple = {
       correction: {
         sample: 'iphone',
         p: 0.8
@@ -326,13 +320,11 @@ describe('processSimilarity', () => {
       // matchLevel does not yet exist.
     };
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const distribution = [
+    const distribution: CorrectionPredictionTuple[] = [
       iPhone
     ];
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-    const keep_iphone = {
+    const keep_iphone: CorrectionPredictionTuple = {
       correction: {
         sample: 'iphone',
         p: 1
@@ -345,8 +337,7 @@ describe('processSimilarity', () => {
           },
           displayAs: '<iphone>',
           matchesModel: false,
-          tag: 'keep',
-          p: 1
+          tag: 'keep'
         },
         p: 1
       },
@@ -355,8 +346,7 @@ describe('processSimilarity', () => {
     };
 
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const expectation = [
+    const expectation: CorrectionPredictionTuple[] = [
       {
         ...keep_iphone,
         matchLevel: SuggestionSimilarity.exact
@@ -380,16 +370,14 @@ describe('processSimilarity', () => {
     // keeps a separate entry for the two versions (or only has the title-cased
     // one).
     it(`differentiates same-keyed suggestions when one only mismatches due to casing`, () => {
-      /** @type {Context} */
-      const context = {
+      const context: Context = {
         left: 'It',
         right: '',
         startOfBuffer: true,
         endOfBuffer: true
       };
 
-      /** @type {ProbabilityMass<Transform>} */
-      const trueInput = {
+      const trueInput: ProbabilityMass<Transform> = {
         sample: {
           insert: '\'s',
           deleteLeft: 0
@@ -408,8 +396,7 @@ describe('processSimilarity', () => {
 
       const distribution = [...Object.values(testSet)];
 
-      /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-      const expectation = [
+      const expectation: CorrectionPredictionTuple[] = [
         {
           ...testSet.its,
           matchLevel: SuggestionSimilarity.sameKey
@@ -446,16 +433,14 @@ describe('processSimilarity', () => {
 
   describe('without casing', () => {
     it(`does not utilize casing behaviors when checking similarity`, () => {
-      /** @type {Context} */
-      const context = {
+      const context: Context = {
         left: 'It',
         right: '',
         startOfBuffer: true,
         endOfBuffer: true
       };
 
-      /** @type {ProbabilityMass<Transform>} */
-      const trueInput = {
+      const trueInput: ProbabilityMass<Transform> = {
         sample: {
           insert: '\'s',
           deleteLeft: 0
@@ -474,8 +459,7 @@ describe('processSimilarity', () => {
 
       const distribution = [...Object.values(testSet)];
 
-      /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-      const expectation = [
+      const expectation: CorrectionPredictionTuple[] = [
         {
           ...testSet.its,
           matchLevel: SuggestionSimilarity.none
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/suggestion-casing.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/suggestion-casing.tests.ts
new file mode 100644
index 0000000000..dd586eab64
--- /dev/null
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/suggestion-casing.tests.ts
@@ -0,0 +1,161 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-08-13.
+ *
+ * Defines simple unit tests for the internal method that applies a
+ * lexical-model's casing rules to generated suggestions.
+ */
+
+import { assert } from 'chai';
+
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
+import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { applySuggestionCasing, models } from '@keymanapp/lm-worker/test-index';
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import TrieModel = models.TrieModel;
+
+describe('applySuggestionCasing', function() {
+  let plainApplyCasing: CasingFunction = function(caseToApply, text) {
+    switch(caseToApply) {
+      case 'lower':
+        return text.toLowerCase();
+      case 'upper':
+        return text.toUpperCase();
+      case 'initial':
+        return plainApplyCasing('upper', text.charAt(0)) . concat(text.substring(1));
+      default:
+        return text;
+    }
+  };
+
+  var plainCasedModel = new TrieModel(
+    jsonFixture('models/tries/english-1000'), {
+      languageUsesCasing: true,
+      applyCasing: plainApplyCasing,
+      wordBreaker: wordBreakers.default,
+      searchTermToKey: function(text: string) {
+        // We're dealing with very simple English text; no need to normalize or remove diacritics here.
+        return plainApplyCasing('lower', text);
+      }
+    }
+  );
+
+  it('properly cases suggestions with no suggestion root', function() {
+    let suggestion = {
+      transform: {
+        insert: 'the',
+        deleteLeft: 0
+      },
+      displayAs: 'the'
+    };
+
+    applySuggestionCasing(suggestion, '', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'The');
+    assert.equal(suggestion.transform.insert, 'The');
+
+    suggestion = {
+      transform: {
+        insert: 'thE',
+        deleteLeft: 0
+      },
+      displayAs: 'thE'
+    };
+
+    applySuggestionCasing(suggestion, '', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'ThE');
+    assert.equal(suggestion.transform.insert, 'ThE');
+
+    suggestion = {
+      transform: {
+        insert: 'the',
+        deleteLeft: 0
+      },
+      displayAs: 'the'
+    };
+
+    applySuggestionCasing(suggestion, '', plainCasedModel, 'upper');
+    assert.equal(suggestion.displayAs, 'THE');
+    assert.equal(suggestion.transform.insert, 'THE');
+  });
+
+  it('properly cases suggestions that fully replace the suggestion root', function() {
+    let suggestion = {
+      transform: {
+        insert: 'therefore',
+        deleteLeft: 3
+      },
+      displayAs: 'therefore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'Therefore');
+    assert.equal(suggestion.transform.insert, 'Therefore');
+
+    suggestion = {
+      transform: {
+        insert: 'thereFore',
+        deleteLeft: 3
+      },
+      displayAs: 'thereFore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'ThereFore');
+    assert.equal(suggestion.transform.insert, 'ThereFore');
+
+    suggestion = {
+      transform: {
+        insert: 'therefore',
+        deleteLeft: 3
+      },
+      displayAs: 'therefore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'upper');
+    assert.equal(suggestion.displayAs, 'THEREFORE');
+    assert.equal(suggestion.transform.insert, 'THEREFORE');
+  });
+
+  it('properly cases suggestions that do not fully replace the suggestion root', function() {
+    let suggestion = {
+      transform: {
+        insert: 'erefore',
+        deleteLeft: 1
+      },
+      displayAs: 'therefore'
+    };
+
+    // When integrated, the 'the' string comes from a wordbreak operation on the current context.
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'Therefore');
+    assert.equal(suggestion.transform.insert, 'Therefore');
+
+    suggestion = {
+      transform: {
+        insert: 'ereFore',
+        deleteLeft: 1
+      },
+      displayAs: 'thereFore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'ThereFore');
+    assert.equal(suggestion.transform.insert, 'ThereFore');
+
+    suggestion = {
+      transform: {
+        insert: 'erefore',
+        deleteLeft: 1
+      },
+      displayAs: 'therefore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'upper');
+    assert.equal(suggestion.displayAs, 'THEREFORE');
+    assert.equal(suggestion.transform.insert, 'THEREFORE');
+  });
+});
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-tokenization.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-tokenization.tests.ts
similarity index 83%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-tokenization.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-tokenization.tests.ts
index 41b2a912de..e048b322d8 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-tokenization.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-tokenization.tests.ts
@@ -1,18 +1,23 @@
 import { assert } from 'chai';
 
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
+import { Token, Tokenization, tokenize } from '@keymanapp/models-templates';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-import { tokenize } from '@keymanapp/models-templates';
-import { tokenizeTransform } from '#./correction/transform-tokenization.js';
+import { tokenizeTransform } from '@keymanapp/lm-worker/test-index';
 
-const defaultTokenize = (context) => tokenize(defaultBreaker, context);
+import Context = LexicalModelTypes.Context;
+
+const defaultTokenize = (context: Context) => tokenize(defaultBreaker, context);
 
 describe('tokenizeTransform', () => {
   describe('with default wordbreaking', () => {
     it('properly handles simple token-edit transform', () => {
-      const context = {
+      const context: Context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -33,7 +38,9 @@ describe('tokenizeTransform', () => {
     it('properly handles simple token-replacing transform', () => {
       const context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -54,7 +61,9 @@ describe('tokenizeTransform', () => {
     it('handles simple token-replacing transform with cross-token deleteLeft', () => {
       const context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
@@ -76,7 +85,9 @@ describe('tokenizeTransform', () => {
     it('properly handles a simple appended whitespace', () => {
       const context = {
         left: 'an apple a day',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -103,7 +114,9 @@ describe('tokenizeTransform', () => {
     it('properly handles a simple appended period', () => {
       const context = {
         left: 'an apple a day',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -128,7 +141,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 1)', () => {
       const context = {
         left: 'an apple a dat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -153,7 +168,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 2)', () => {
       const context = {
         left: 'an apple a dat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -179,7 +196,9 @@ describe('tokenizeTransform', () => {
     it('handles complex breakable cases', () => {
       const context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
@@ -204,18 +223,20 @@ describe('tokenizeTransform', () => {
   });
 
   describe('with mocked dictionary-based wordbreaking', () => {
-    function mockedTokenization(entries) {
+    function mockedTokenization(entries: string[]) {
       return {
         left: entries.map((text) => {
-          return {text: text}
+          return {text: text} as Token
         })
-      };
+      } as Tokenization;
     }
 
     it('properly handles simple token-edit transform', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -236,7 +257,9 @@ describe('tokenizeTransform', () => {
     it('properly handles simple token-replacing transform', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -257,7 +280,9 @@ describe('tokenizeTransform', () => {
     it('handles simple token-replacing transform with cross-token deleteLeft', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
@@ -279,7 +304,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 1)', () => {
       const context = {
         left: 'anappleadat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -303,7 +330,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 2)', () => {
       const context = {
         left: 'anappleadat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -327,7 +356,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 2 alternate output)', () => {
       const context = {
         left: 'anappleadat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -352,7 +383,9 @@ describe('tokenizeTransform', () => {
     it('handles complex breakable cases', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-utils.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-utils.tests.ts
similarity index 95%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-utils.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-utils.tests.ts
index d4da4501f4..e7d992ae64 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-utils.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-utils.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import TransformUtils from '#./transformUtils.js';
+import { TransformUtils } from '@keymanapp/lm-worker/test-index';
 
 describe('TransformUtils', function () {
   describe('isWhitespace', function () {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-custom-punctuation.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-custom-punctuation.tests.ts
similarity index 92%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-custom-punctuation.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-custom-punctuation.tests.ts
index 3982bdfe7a..dce4924004 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-custom-punctuation.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-custom-punctuation.tests.ts
@@ -4,8 +4,8 @@
 
 import { assert } from 'chai';
 
-import DummyModel from '#./models/dummy-model.js';
-import ModelCompositor from '#./model-compositor.js';
+import { ModelCompositor, models } from '@keymanapp/lm-worker/test-index';
+import DummyModel = models.DummyModel;
 
 describe('Custom Punctuation', function () {
   it('appears in the keep suggestion', async function () {
@@ -31,6 +31,7 @@ describe('Custom Punctuation', function () {
         quotesForKeepSuggestion: {
           open: "«", close: "»"
         },
+        insertAfterWord: ''
       }
     });
 
@@ -76,6 +77,10 @@ describe('Custom Punctuation', function () {
           // U+1680 OGHAM SPACE MARK:
           // it's technically whitespace, but it don't look it!
           insertAfterWord: " ",
+          quotesForKeepSuggestion: {
+            open: "'",
+            close: "'"
+          }
         }
       });
 
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-initialization.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-initialization.tests.ts
similarity index 89%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-initialization.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-initialization.tests.ts
index 3c15543bce..08c5262484 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-initialization.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-initialization.tests.ts
@@ -1,14 +1,22 @@
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+
 import { assert } from 'chai';
 import sinon from 'sinon';
-import fs from 'fs';
-
-import LMLayerWorker from '#./index.js';
 
 import { configWorker, createMessageEventWithData, importScriptsWith } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
-import { createRequire } from 'module';
+// @ts-ignore
+import { LMLayerWorker } from '@keymanapp/lm-worker/test-index';
+
 const require = createRequire(import.meta.url);
 
+interface MockedContext {
+  onmessage?: () => void;
+  importScripts?: () => void;
+  postMessage: sinon.SinonSpy<any, any>;
+}
+
 // Unit tests for instantiating and initializing the LMLayer Worker in isolation.
 //
 // Although the LMLayerWorker expects to be used inside a DedicatedWorkerGlobalScope,
@@ -18,7 +26,7 @@ describe('LMLayerWorker', function() {
   describe('#constructor()', function() {
     it('should allow for the mocking of postMessage()', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
@@ -42,7 +50,7 @@ describe('LMLayerWorker', function() {
 
   describe('#onMessage()', function() {
     it('should fail if not given the `message` attribute', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -60,9 +68,9 @@ describe('LMLayerWorker', function() {
 
   describe('.install()', function () {
     it('should create a new instance, installed on our global object', function () {
-      var fakeWorkerGlobal = {
+      var fakeWorkerGlobal: MockedContext = {
         onmessage: undefined,
-        postMessage: new sinon.fake(),
+        postMessage: sinon.fake(),
       };
       fakeWorkerGlobal.importScripts = importScriptsWith(fakeWorkerGlobal);
 
@@ -91,7 +99,7 @@ describe('LMLayerWorker', function() {
 
   describe('Message: config', function () {
     it('should disallow any other message', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -107,7 +115,7 @@ describe('LMLayerWorker', function() {
     });
 
     it('accepts a capability set and transitions to the "modelless" state', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -117,13 +125,13 @@ describe('LMLayerWorker', function() {
       // Trigger the config message
       configWorker(worker);
 
-      assert.equal(worker.state.name, 'modelless');
+      assert.equal(worker.unitTestEndPoints.getStateName(), 'modelless');
     });
   });
 
   describe('Message: load', function () {
     it('should disallow any other message', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -142,7 +150,7 @@ describe('LMLayerWorker', function() {
 
     it('should send back a "ready" message when given a file', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
@@ -165,7 +173,7 @@ describe('LMLayerWorker', function() {
 
     it('should send back a "ready" message when given raw code', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
@@ -190,7 +198,7 @@ describe('LMLayerWorker', function() {
 
     it('should send back configuration', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-model-compositor.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-model-compositor.tests.ts
similarity index 83%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-model-compositor.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-model-compositor.tests.ts
index cc24991247..bad4a869d9 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-model-compositor.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-model-compositor.tests.ts
@@ -2,16 +2,22 @@
  * Integration tests for the model compositor with the trie model.
  */
 
-import ModelCompositor from '#./model-compositor.js';
-import { toAnnotatedSuggestion } from '#./predict-helpers.js';
-import * as models from '#./models/index.js';
-import * as wordBreakers from '@keymanapp/models-wordbreakers';
-
 import { assert } from 'chai';
 
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-var TrieModel = models.TrieModel;
+import { ModelCompositor, models, toAnnotatedSuggestion } from '@keymanapp/lm-worker/test-index';
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import Context = LexicalModelTypes.Context;
+import Keep = LexicalModelTypes.Keep;
+import LexicalModelPunctuation = LexicalModelTypes.LexicalModelPunctuation
+import QuoteBehavior = models.QuoteBehavior;
+import Suggestion = LexicalModelTypes.Suggestion;
+import Transform = LexicalModelTypes.Transform;
+import TrieModel = models.TrieModel;
 
 describe('ModelCompositor', function() {
   describe('Prediction with 14.0+ models', function() {
@@ -254,154 +260,6 @@ describe('ModelCompositor', function() {
       });
     });
 
-    describe('applySuggestionCasing', function() {
-      let plainApplyCasing = function(caseToApply, text) {
-        switch(caseToApply) {
-          case 'lower':
-            return text.toLowerCase();
-          case 'upper':
-            return text.toUpperCase();
-          case 'initial':
-            return plainApplyCasing('upper', text.charAt(0)) . concat(text.substring(1));
-          default:
-            return text;
-        }
-      };
-
-      var plainCasedModel = new TrieModel(
-        jsonFixture('models/tries/english-1000'), {
-          languageUsesCasing: true,
-          applyCasing: plainApplyCasing,
-          wordBreaker: wordBreakers.default,
-          searchTermToKey: function(text) {
-            // We're dealing with very simple English text; no need to normalize or remove diacritics here.
-            return applyCasing('lower', text);
-          }
-        }
-      );
-
-      it('properly cases suggestions with no suggestion root', function() {
-        var compositor = new ModelCompositor(plainCasedModel, true);
-
-        let suggestion = {
-          transform: {
-            insert: 'the',
-            deleteLeft: 0
-          },
-          displayAs: 'the'
-        };
-
-        compositor.applySuggestionCasing(suggestion, '', 'initial');
-        assert.equal(suggestion.displayAs, 'The');
-        assert.equal(suggestion.transform.insert, 'The');
-
-        suggestion = {
-          transform: {
-            insert: 'thE',
-            deleteLeft: 0
-          },
-          displayAs: 'thE'
-        };
-
-        compositor.applySuggestionCasing(suggestion, '', 'initial');
-        assert.equal(suggestion.displayAs, 'ThE');
-        assert.equal(suggestion.transform.insert, 'ThE');
-
-        suggestion = {
-          transform: {
-            insert: 'the',
-            deleteLeft: 0
-          },
-          displayAs: 'the'
-        };
-
-        compositor.applySuggestionCasing(suggestion, '', 'upper');
-        assert.equal(suggestion.displayAs, 'THE');
-        assert.equal(suggestion.transform.insert, 'THE');
-      });
-
-      it('properly cases suggestions that fully replace the suggestion root', function() {
-        var compositor = new ModelCompositor(plainCasedModel, true);
-
-        let suggestion = {
-          transform: {
-            insert: 'therefore',
-            deleteLeft: 3
-          },
-          displayAs: 'therefore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'Therefore');
-        assert.equal(suggestion.transform.insert, 'Therefore');
-
-        suggestion = {
-          transform: {
-            insert: 'thereFore',
-            deleteLeft: 3
-          },
-          displayAs: 'thereFore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'ThereFore');
-        assert.equal(suggestion.transform.insert, 'ThereFore');
-
-        suggestion = {
-          transform: {
-            insert: 'therefore',
-            deleteLeft: 3
-          },
-          displayAs: 'therefore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'upper');
-        assert.equal(suggestion.displayAs, 'THEREFORE');
-        assert.equal(suggestion.transform.insert, 'THEREFORE');
-      });
-
-      it('properly cases suggestions that do not fully replace the suggestion root', function() {
-        var compositor = new ModelCompositor(plainCasedModel, true);
-
-        let suggestion = {
-          transform: {
-            insert: 'erefore',
-            deleteLeft: 1
-          },
-          displayAs: 'therefore'
-        };
-
-        // When integrated, the 'the' string comes from a wordbreak operation on the current context.
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'Therefore');
-        assert.equal(suggestion.transform.insert, 'Therefore');
-
-        suggestion = {
-          transform: {
-            insert: 'ereFore',
-            deleteLeft: 1
-          },
-          displayAs: 'thereFore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'ThereFore');
-        assert.equal(suggestion.transform.insert, 'ThereFore');
-
-        suggestion = {
-          transform: {
-            insert: 'erefore',
-            deleteLeft: 1
-          },
-          displayAs: 'therefore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'upper');
-        assert.equal(suggestion.displayAs, 'THEREFORE');
-        assert.equal(suggestion.transform.insert, 'THEREFORE');
-      });
-    });
-
     describe('Model uses default-style keying, no casing', function () {
       var uncasedModel = new TrieModel(
         jsonFixture('models/tries/english-1000'), {
@@ -465,7 +323,7 @@ describe('ModelCompositor', function() {
     });
 
     describe('Model uses default-style keying, provides casing', function () {
-      let applyCasing = function(caseToApply, text) {
+      let applyCasing: CasingFunction = function(caseToApply, text) {
         switch(caseToApply) {
           case 'lower':
             return text.toLowerCase();
@@ -604,9 +462,21 @@ describe('ModelCompositor', function() {
 
   describe('Prediction with legacy Models (12.0 / 13.0)', function() {
     it('should compose suggestions from a fat-fingered keypress (no keying needed)', async function () {
-      var model = new TrieModel(
-        jsonFixture('models/tries/english-1000')
-      );
+      var model = new models.DummyModel({
+        futureSuggestions: [
+          [], [{
+            transform: { insert: 'e', deleteLeft: 0 },
+            displayAs: "the",
+            id: 1,
+            p: 0.7
+          }], [{
+            transform: { insert: 'ree', deleteLeft: 0},
+            displayAs: "three",
+            id: 2,
+            p: 0.3
+          }]
+        ]
+      });
       let compositor = new ModelCompositor(model, true);
 
       // Initialize context
@@ -616,8 +486,8 @@ describe('ModelCompositor', function() {
       await compositor.predict({insert: '', deleteLeft: 0}, context);
 
       // Pretend to fat finger "the" as "thr"
-      var the = { sample: { insert: 'r', deleteLeft: 0}, p: 0.45 };
-      var thr = { sample: { insert: 'e', deleteLeft: 0}, p: 0.55 };
+      var the = { sample: { insert: 'r', deleteLeft: 0 }, p: 0.45 };
+      var thr = { sample: { insert: 'e', deleteLeft: 0 }, p: 0.55 };
       var suggestions = await compositor.predict([thr, the], context);
 
       // Get the top suggest for 'the' and 'thr*'.
@@ -633,44 +503,14 @@ describe('ModelCompositor', function() {
       assert.isAbove(theSuggestion.p, thrSuggestion.p);
     });
 
-    it('should compose suggestions from a fat-fingered keypress (keying needed)', async function () {
-      var model = new TrieModel(
-        jsonFixture('models/tries/english-1000')
-      );
-      let compositor = new ModelCompositor(model, true);
-
-      // Initialize context
-      let context = {
-        left: 'Th', startOfBuffer: false, endOfBuffer: true,
-      };
-      await compositor.predict({insert: '', deleteLeft: 0}, context);
-
-      // Pretend to fat finger "the" as "thr"
-      var the = { sample: { insert: 'r', deleteLeft: 0}, p: 0.45 };
-      var thr = { sample: { insert: 'e', deleteLeft: 0}, p: 0.55 };
-      var suggestions = await compositor.predict([thr, the], context);
-
-      // Get the top suggest for 'the' and 'thr*'.
-      // As of 15.0+, because of #5429, the keep suggestion `"The"` will not be merged
-      // with the model's suggestion of `the`.
-      var capTheSuggestion = suggestions.filter(function (s) { return s.displayAs === '“The”'; })[0];
-      var theSuggestion = suggestions.filter(function (s) { return s.displayAs === 'the'})[0];
-      var thrSuggestion = suggestions.filter(function (s) { return s.displayAs.startsWith('thr'); })[0];
-
-      // Sanity check: do we have actual real-valued probabilities?
-      assert.isAbove(thrSuggestion.p, 0.0);
-      assert.isBelow(thrSuggestion.p, 1.0);
-      assert.isAbove(theSuggestion.p, 0.0);
-      assert.isBelow(theSuggestion.p, 1.0);
-      assert.equal(capTheSuggestion.tag, 'keep'); // The keep suggestion
-      // 'the' should be the intended the result here.
-      assert.isAbove(theSuggestion.p, thrSuggestion.p);
+    it.skip('should compose suggestions from a fat-fingered keypress (keying needed)', async function () {
+      // No known 12.0 / 13.0 model is available that can leverage keying to run this test properly.
     });
   });
 
   // The nomenclature's a minor sneak-peek from child PRs.
   describe('toAnnotatedSuggestion', function() {
-    let baseSuggestion = {
+    let baseSuggestion: Suggestion = {
       transform: {
         insert: 'hello',
         deleteLeft: 0,
@@ -691,14 +531,14 @@ describe('ModelCompositor', function() {
     }
 
     describe("'keep'", function() {
-      let annotationTest = function(punctuation, displayText, quoteStyle) {
+      let annotationTest = function(punctuation: LexicalModelPunctuation, displayText: string, quoteStyle?: QuoteBehavior) {
         let options = {
           punctuation: punctuation
         };
 
         let model = new models.DummyModel(options);
 
-        var keep;
+        var keep: Keep;
         if(quoteStyle) {
           keep = toAnnotatedSuggestion(model, baseSuggestion, 'keep', quoteStyle);
         } else {
@@ -734,7 +574,7 @@ describe('ModelCompositor', function() {
   });
 
   describe('acceptSuggestion', function() {
-    let acceptanceTest = function(punctuation, suggestion, context, postTransform) {
+    let acceptanceTest = function(punctuation: LexicalModelPunctuation, suggestion: Suggestion, context: Context, postTransform?: Transform) {
       let options = {
         punctuation: punctuation
       };
@@ -922,12 +762,6 @@ describe('ModelCompositor', function() {
   });
 
   describe('acceptReversion', function() {
-    let executeAcceptance = function(model, suggestion, context, postTransform) {
-      let compositor = new ModelCompositor(model, true);
-
-      return {compositor: compositor, reversion: compositor.acceptSuggestion(suggestion, context, postTransform)};
-    }
-
     let englishPunctuation = {
       quotesForKeepSuggestion: { open: `“`, close: `”`},
       insertAfterWord: ' '
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict-dummy.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict-dummy.tests.ts
similarity index 96%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict-dummy.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict-dummy.tests.ts
index f552f6e29d..536c8d266f 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict-dummy.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict-dummy.tests.ts
@@ -3,10 +3,12 @@
  */
 
 import { assert } from 'chai';
-import DummyModel from '#./models/dummy-model.js';
 
 import { emptyContext, iGotDistractedByHazel, zeroTransform } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
+import { models } from '@keymanapp/lm-worker/test-index'
+import DummyModel = models.DummyModel;
+
 describe('LMLayerWorker dummy model', function() {
   describe('instantiation', function () {
     it('can be instantiated with no arguments', function () {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
similarity index 79%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
index abfe3a1a5d..8099215bdf 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
@@ -1,33 +1,43 @@
-import { assert } from 'chai';
+
+import { createRequire } from 'node:module';
 import sinon from 'sinon';
 
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-
-import LMLayerWorker from '#./index.js';
-
+import { LexicalModelTypes } from '@keymanapp/common-types';
 import { configWorker, createMessageEventWithData, emptyContext, iGotDistractedByHazel,
          importScriptsWith, randomToken, zeroTransform } from '@keymanapp/common-test-resources/model-helpers.mjs';
 import { timedPromise } from '@keymanapp/web-utils';
 
+import { LMLayerWorker } from '@keymanapp/lm-worker/test-index';
+import { OutgoingMessage } from '@keymanapp/lm-message-types';
+
+import Suggestion = LexicalModelTypes.Suggestion;
+
+const require = createRequire(import.meta.url);
+
+interface MockedContext {
+  onmessage?: () => void;
+  importScripts?: () => void;
+  postMessage: (e: any) => void;
+}
+
 describe('LMLayerWorker', function () {
   describe('#predict()', function () {
     it('should send back suggestions', async function () {
       // Initialize the worker with a model that will produce one suggestion.
       var fakePostMessage = sinon.fake();
-      var filteredFakePostMessage = function(event) {
+      var filteredFakePostMessage = function(event: OutgoingMessage) {
         if(event.message == 'suggestions') {
           let suggestions = event.suggestions;
 
           // Strip any IDs set by the model compositor.
-          suggestions.forEach(function(suggestion) {
+          suggestions.forEach(function(suggestion: Suggestion) {
             delete suggestion.id;
           });
         }
 
         fakePostMessage(event);
       }
-      var context = {
+      var context: MockedContext = {
         postMessage: filteredFakePostMessage
       };
       context.importScripts = importScriptsWith(context);
diff --git a/web/src/engine/predictive-text/templates/tests/fixtures/tries/accented.json b/web/src/test/auto/resources/fixtures/tries/accented.json
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/fixtures/tries/accented.json
rename to web/src/test/auto/resources/fixtures/tries/accented.json
diff --git a/web/src/engine/predictive-text/templates/tests/fixtures/tries/english-1000.json b/web/src/test/auto/resources/fixtures/tries/english-1000.json
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/fixtures/tries/english-1000.json
rename to web/src/test/auto/resources/fixtures/tries/english-1000.json
diff --git a/web/src/engine/predictive-text/templates/tests/fixtures/tries/smp-apple.json b/web/src/test/auto/resources/fixtures/tries/smp-apple.json
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/fixtures/tries/smp-apple.json
rename to web/src/test/auto/resources/fixtures/tries/smp-apple.json
diff --git a/web/src/test/auto/tsconfig.json b/web/src/test/auto/tsconfig.json
index f88f147539..066b6446f5 100644
--- a/web/src/test/auto/tsconfig.json
+++ b/web/src/test/auto/tsconfig.json
@@ -12,6 +12,7 @@
     "dom/**/*.ts",
     "headless/**/*.ts",
     "integrated/**/*.ts",
-    "resources/**/*.ts"
+    "resources/**/*.ts",
+    "predictive-text/**/*.ts"
   ]
 }
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 8b564480b8..b2eed53d0a 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # ################################ Main script ################################
 
diff --git a/web/src/test/manual/embed/android-harness/build.sh b/web/src/test/manual/embed/android-harness/build.sh
index 31c53e73a0..d672fd4489 100755
--- a/web/src/test/manual/embed/android-harness/build.sh
+++ b/web/src/test/manual/embed/android-harness/build.sh
@@ -3,9 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+
 builder_describe "Builds a debug-host page simulating Keyman Android's WebView setup for KMW use" \
   "@/common/web/keyman-version" \
   "@/web/src/app/webview" \
@@ -28,7 +30,7 @@ fi
 ### CONFIGURE ACTIONS
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/tools/build.sh b/web/src/tools/build.sh
index b9d1e27bda..6572cc7e26 100755
--- a/web/src/tools/build.sh
+++ b/web/src/tools/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/web/src/tools/building/check-build-size.sh b/web/src/tools/building/check-build-size.sh
index 5b96459035..ce19e0b226 100755
--- a/web/src/tools/building/check-build-size.sh
+++ b/web/src/tools/building/check-build-size.sh
@@ -14,7 +14,7 @@ SIZE_THRESHOLD=1024
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 . "$KEYMAN_ROOT/resources/build/github.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
diff --git a/web/src/tools/building/sourcemap-root/build.sh b/web/src/tools/building/sourcemap-root/build.sh
index 3e9a9759f1..8e5db5e73f 100755
--- a/web/src/tools/building/sourcemap-root/build.sh
+++ b/web/src/tools/building/sourcemap-root/build.sh
@@ -5,10 +5,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -26,6 +27,6 @@ builder_parse "$@"
 
 ### CONFIGURE ACTIONS
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf ../../../../build/tools/building/sourcemap-root
 builder_run_action build      tsc --build tsconfig.json
\ No newline at end of file
diff --git a/web/src/tools/es-bundling/build.sh b/web/src/tools/es-bundling/build.sh
index ec2deee862..3a05714120 100755
--- a/web/src/tools/es-bundling/build.sh
+++ b/web/src/tools/es-bundling/build.sh
@@ -3,10 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -21,6 +22,6 @@ builder_describe_outputs \
 
 builder_parse "$@"
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
 builder_run_action build      tsc -b tsconfig.json
diff --git a/web/src/tools/testing/bulk_rendering/build.sh b/web/src/tools/testing/bulk_rendering/build.sh
index 53ad43da17..6c93d9862c 100755
--- a/web/src/tools/testing/bulk_rendering/build.sh
+++ b/web/src/tools/testing/bulk_rendering/build.sh
@@ -5,12 +5,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=tools/testing/bulk_rendering
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -39,6 +40,6 @@ function do_build ( ) {
      "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/lib/zip.min.js"
 }
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf ../../../../build/$SUBPROJECT_NAME
 builder_run_action build      do_build
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder-core/build.sh b/web/src/tools/testing/recorder-core/build.sh
index 0b89ce7701..4bd56ee2b8 100755
--- a/web/src/tools/testing/recorder-core/build.sh
+++ b/web/src/tools/testing/recorder-core/build.sh
@@ -7,10 +7,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -29,7 +30,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/tools/testing/recorder/build.sh b/web/src/tools/testing/recorder/build.sh
index 91f27d09e5..7a9b0187ec 100755
--- a/web/src/tools/testing/recorder/build.sh
+++ b/web/src/tools/testing/recorder/build.sh
@@ -5,12 +5,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=tools/testing/recorder
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -37,6 +38,6 @@ do_build ( ) {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf ../../../../build/$SUBPROJECT_NAME/
 builder_run_action build do_build
\ No newline at end of file
diff --git a/web/test.sh b/web/test.sh
index ea4f9e0abc..9c877e8d6e 100755
--- a/web/test.sh
+++ b/web/test.sh
@@ -5,11 +5,11 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # This script runs from its own folder
 cd "$THIS_SCRIPT_PATH"
diff --git a/windows/build.sh b/windows/build.sh
index b75967a4ce..74269abcc3 100755
--- a/windows/build.sh
+++ b/windows/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD UTILITY SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD UTILITY SCRIPT INCLUDE
 
 # This is not a builder script but calls a builder script
diff --git a/windows/src/build.sh b/windows/src/build.sh
index c6cbbaa82b..8fd078cd55 100755
--- a/windows/src/build.sh
+++ b/windows/src/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe \
   "Keyman for Windows" \
diff --git a/windows/src/buildtools/sentry-upload-difs.sh b/windows/src/buildtools/sentry-upload-difs.sh
index 3d6b9faadb..1856f03db7 100755
--- a/windows/src/buildtools/sentry-upload-difs.sh
+++ b/windows/src/buildtools/sentry-upload-difs.sh
@@ -20,7 +20,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$KEYMAN_ROOT/windows/src"
diff --git a/windows/src/desktop/build.sh b/windows/src/desktop/build.sh
index 96d0324cfd..bcfd7cdc20 100755
--- a/windows/src/desktop/build.sh
+++ b/windows/src/desktop/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
diff --git a/windows/src/desktop/help/build.sh b/windows/src/desktop/help/build.sh
index 807f7047ab..619fc85fc9 100755
--- a/windows/src/desktop/help/build.sh
+++ b/windows/src/desktop/help/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Help documentation for Keyman for Windows" \
   clean configure build test install \
diff --git a/windows/src/desktop/inst/build.sh b/windows/src/desktop/inst/build.sh
index d0678fb3d0..f3fefa9c58 100755
--- a/windows/src/desktop/inst/build.sh
+++ b/windows/src/desktop/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Installation files for Keyman for Windows" \
   @/common/windows/data \
diff --git a/windows/src/desktop/insthelp/build.sh b/windows/src/desktop/insthelp/build.sh
index 16b2a50e40..d57a4b935f 100755
--- a/windows/src/desktop/insthelp/build.sh
+++ b/windows/src/desktop/insthelp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman installation helper module" \
diff --git a/windows/src/desktop/kmbrowserhost/build.sh b/windows/src/desktop/kmbrowserhost/build.sh
index dd3521f094..ab309a09b0 100755
--- a/windows/src/desktop/kmbrowserhost/build.sh
+++ b/windows/src/desktop/kmbrowserhost/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Chromium browser host process for Keyman" \
diff --git a/windows/src/desktop/kmconfig/build.sh b/windows/src/desktop/kmconfig/build.sh
index a9f69bea21..bfe07e5868 100755
--- a/windows/src/desktop/kmconfig/build.sh
+++ b/windows/src/desktop/kmconfig/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman low-level configuration tool" \
diff --git a/windows/src/desktop/kmshell/build.sh b/windows/src/desktop/kmshell/build.sh
index 6459a67fc6..f4e95eadc0 100755
--- a/windows/src/desktop/kmshell/build.sh
+++ b/windows/src/desktop/kmshell/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman Configuration" \
diff --git a/windows/src/desktop/kmshell/locale/es-ES/strings.xml b/windows/src/desktop/kmshell/locale/es-ES/strings.xml
index 144f49fd26..711760afc9 100644
--- a/windows/src/desktop/kmshell/locale/es-ES/strings.xml
+++ b/windows/src/desktop/kmshell/locale/es-ES/strings.xml
@@ -466,14 +466,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 18.0.168 -->
   <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Hay actualizaciones disponibles que se aplicarán cuando se reinicie Windows:</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.217 -->
+  <string name="S_Update_Current_Version" comment="Update tab Currently Installed Version">Versión instalada actualmente</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.217 -->
+  <string name="S_Update_New_Version" comment="Update tab New Version">Nueva versión</string>
   <!-- Context: Configuration Dialog - Update tab pop up -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 18.0.168 -->
-  <string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">Actualizar ahora requerirá un reinicio del ordenador.</string>
+  <string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">Instalar la actualización ahora requerirá reiniciar su equipo antes de poder usar Keyman de nuevo. ¿Actualizar ahora?</string>
   <!-- Context: Configuration Dialog - Update on boot pop up -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 18.0.168 -->
-  <string name="S_Ready_To_Install" comment="Update on boot pop up - inform user update about to install">Una actualización de Keyman está lista para instalarse.</string>
+  <string name="S_Ready_To_Install" comment="Update on boot pop up - inform user update about to install">Se ha descargado una actualización de Keyman y está lista para instalar.</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -569,6 +577,10 @@
   <string name="S_Update" comment="Update tab name">Actualizar</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update_Now" comment="Update now button">Actualizar ahora</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Update_Title" comment="Update dialog title, where Keyman = product name">Keyman actualizado - Componentes disponibles</string>
   <!-- Context: Online Update Dialog -->
@@ -638,12 +650,20 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">Salir verificar actualizaciones en línea</string>
+  <!-- Context: Install Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Later" comment="Apply Update Later">Más tarde</string>
   <!-- Context: Update Dialog -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 17.0233.0 -->
   <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">Aplicar actualización ahora</string>
   <!-- Context: Update Dialog -->
   <!-- String Type: FormatString -->
+  <!-- Introduced: 18.0.217 -->
+  <string name="S_Button_Update_InstallNow" comment="Install update now button - update dialog">¿Instalar la actualización ahora</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 17.0233.0 -->
   <string name="S_Button_Update_CheckNow" comment="Check for updates now button - update dialog">Buscar nuevas actualizaciones</string>
   <!-- Context: Splash Dialog -->
diff --git a/windows/src/desktop/locale/crowdin-control.sh b/windows/src/desktop/locale/crowdin-control.sh
index 34c7608377..766edc1a72 100755
--- a/windows/src/desktop/locale/crowdin-control.sh
+++ b/windows/src/desktop/locale/crowdin-control.sh
@@ -12,7 +12,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 LOCALE_DIR="$KEYMAN_ROOT/windows/src/desktop/locale/"
diff --git a/windows/src/desktop/setup/build.sh b/windows/src/desktop/setup/build.sh
index a2b3310c3d..5b97dda8ba 100755
--- a/windows/src/desktop/setup/build.sh
+++ b/windows/src/desktop/setup/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman Setup bootstrap" \
diff --git a/windows/src/engine/build.sh b/windows/src/engine/build.sh
index 9c9a6d2d0f..524ad91437 100755
--- a/windows/src/engine/build.sh
+++ b/windows/src/engine/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/engine/inst/build.sh b/windows/src/engine/inst/build.sh
index 42374c140e..3f98ed7688 100755
--- a/windows/src/engine/inst/build.sh
+++ b/windows/src/engine/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Installation files for Keyman Engine for Windows" \
   clean configure build test publish
diff --git a/windows/src/engine/insthelper/build.sh b/windows/src/engine/insthelper/build.sh
index 85a9be91ea..62aec62586 100755
--- a/windows/src/engine/insthelper/build.sh
+++ b/windows/src/engine/insthelper/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Installation helper module" \
diff --git a/windows/src/engine/keyman/build.sh b/windows/src/engine/keyman/build.sh
index 561c277b9f..efdaf0698c 100755
--- a/windows/src/engine/keyman/build.sh
+++ b/windows/src/engine/keyman/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman main host process (32-bit)" \
diff --git a/windows/src/engine/keyman/langswitch/LangSwitchManager.pas b/windows/src/engine/keyman/langswitch/LangSwitchManager.pas
index 80da078728..31481be316 100644
--- a/windows/src/engine/keyman/langswitch/LangSwitchManager.pas
+++ b/windows/src/engine/keyman/langswitch/LangSwitchManager.pas
@@ -1,4 +1,4 @@
-(*
+(*
   Name:             LangSwitchManager
   Copyright:        Copyright (C) SIL International.
   Documentation:
@@ -47,6 +47,7 @@ unit LangSwitchManager;
 interface
 
 uses
+  ErrorControlledRegistry,
   System.Classes,
   System.Contnrs,
   System.SysUtils,
@@ -230,6 +231,19 @@ type
     FLanguageToggle: string;
     FLayoutToggle: string;
     procedure LoadCurrentHotkey;
+    (**
+     * Ensures that the specified registry value has a valid string data type.
+     * If the registry value exists but is not of type `rdString` or `rdExpandString`,
+     * the function deletes the existing value and writes a default string value
+     * of `'3'`.
+     *
+     * @param    RegistryKey   The registry key object wrapper used to access the registry.
+     * @param    ValueName     The name of the registry value to check and correct.
+     *
+     * @returns  True if the data type was incorrect and the value was reset;
+     *           False if the value did not exist or was already a valid string type.
+     *)
+    function  FixRegistryDataType(RegistryKey: TRegistryErrorControlled; const ValueName: string): Boolean;
     procedure DisableWindowsHotkey;
     procedure RestoreWindowsHotkey;
   public
@@ -251,7 +265,6 @@ uses
   InterfaceHotkeys,
   kmint,
   LoadIndirectStringUnit,
-  ErrorControlledRegistry,
   Registry,
   RegistryKeys,
   UfrmKeyman7Main,
@@ -981,42 +994,76 @@ begin
   FCurrentHotkey := FindHotkey(kmcom.Hotkeys);
 end;
 
+function TLangSwitchConfiguration.FixRegistryDataType(
+  RegistryKey: TRegistryErrorControlled;
+  const ValueName: string
+): Boolean;
+var
+  RegType: TRegDataType;
+  const CHotkeyNotAssigned = '3';
+begin
+  Result := False;
+
+  if RegistryKey.ValueExists(ValueName) then
+  begin
+    RegType := RegistryKey.GetDataType(ValueName);
+    if not ((RegType = rdString) or (RegType = rdExpandString)) then
+    begin
+      RegistryKey.DeleteValue(ValueName);
+      RegistryKey.WriteString(ValueName, CHotkeyNotAssigned);
+      Result := True;
+    end;
+  end;
+
+end;
+
 procedure TLangSwitchConfiguration.DisableWindowsHotkey;
 var
   MatchValue: string;
+  KeyboardToggleReg: TRegistryErrorControlled;
   FReset: Boolean;
+  const CHotkeyNotAssigned = '3';
 begin
   if FCurrentHotkey = (HK_ALT or HK_SHIFT) then MatchValue := '1'
   else if FCurrentHotkey = (HK_CTRL or HK_SHIFT) then MatchValue := '2'
   else Exit;
 
-  FLanguageToggle := '3';
-  FLayoutToggle := '3';
+  FLanguageToggle := CHotkeyNotAssigned;
+  FLayoutToggle := CHotkeyNotAssigned;
 
   FReset := False;
 
-  with TRegistryErrorControlled.Create do  // I2890
+  KeyboardToggleReg := TRegistryErrorControlled.Create; // I2890
   try
-    if not OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
-      RaiseLastRegistryError;
+    if not KeyboardToggleReg.OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
+      KeyboardToggleReg.RaiseLastRegistryError;
+    // Fix potential corrupted registry keys
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_Hotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LanguageHotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LayoutHotkey) then
+      FReset := True;
 
-    if ValueExists(SRegValue_Toggle_Hotkey) then FLanguageToggle := ReadString(SRegValue_Toggle_Hotkey);
+    if KeyboardToggleReg.ValueExists(SRegValue_Toggle_Hotkey) then
+      FLanguageToggle := KeyboardToggleReg.ReadString(SRegValue_Toggle_Hotkey);
     if FLanguageToggle = MatchValue then
     begin
-      WriteString(SRegValue_Toggle_Hotkey, '3');
-      WriteString(SRegValue_Toggle_LanguageHotkey, '3');
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_Hotkey, CHotkeyNotAssigned);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LanguageHotkey, CHotkeyNotAssigned);
       FReset := True;
     end;
 
-    if ValueExists(SRegValue_Toggle_LayoutHotkey) then FLayoutToggle := ReadString(SRegValue_Toggle_LayoutHotkey);
+    if KeyboardToggleReg.ValueExists(SRegValue_Toggle_LayoutHotkey) then
+      FLayoutToggle := KeyboardToggleReg.ReadString(SRegValue_Toggle_LayoutHotkey);
 
     if FLayoutToggle = MatchValue then
     begin
-      WriteString(SRegValue_Toggle_LayoutHotkey, '3');
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LayoutHotkey, CHotkeyNotAssigned);
       FReset := True;
     end;
   finally
-    Free;
+    KeyboardToggleReg.Free;
   end;
 
   if FReset then SystemParametersInfo(SPI_SETLANGTOGGLE, 0, nil, 0);
@@ -1024,31 +1071,42 @@ end;
 
 procedure TLangSwitchConfiguration.RestoreWindowsHotkey;
 var
-  FReset: Boolean;
+  FReset, Changed: Boolean;
+  KeyboardToggleReg: TRegistryErrorControlled;
 begin
   FReset := False;
 
   if FLanguageToggle = '' then Exit;
 
-  with TRegistryErrorControlled.Create do  // I2890
+  KeyboardToggleReg := TRegistryErrorControlled.Create; // I2890
   try
-    if not OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
-      RaiseLastRegistryError;
+    if not KeyboardToggleReg.OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
+      KeyboardToggleReg.RaiseLastRegistryError;
 
-    if not ValueExists(SRegValue_Toggle_Hotkey) or (ReadString(SRegValue_Toggle_Hotkey) <> FLanguageToggle) then
+    // Fix potential corrupted registry keys
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_Hotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LanguageHotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LayoutHotkey) then
+      FReset := True;
+
+    if not KeyboardToggleReg.ValueExists(SRegValue_Toggle_Hotkey) or
+      (KeyboardToggleReg.ReadString(SRegValue_Toggle_Hotkey) <> FLanguageToggle) then
     begin
-      WriteString(SRegValue_Toggle_Hotkey, FLanguageToggle);
-      WriteString(SRegValue_Toggle_LanguageHotkey, FLanguageToggle);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_Hotkey, FLanguageToggle);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LanguageHotkey, FLanguageToggle);
       FReset := True;
     end;
 
-    if not ValueExists(SRegValue_Toggle_LayoutHotkey) or (ReadString(SRegValue_Toggle_LayoutHotkey) <> FLayoutToggle) then
+    if not KeyboardToggleReg.ValueExists(SRegValue_Toggle_LayoutHotkey) or
+      (KeyboardToggleReg.ReadString(SRegValue_Toggle_LayoutHotkey) <> FLayoutToggle) then
     begin
-      WriteString(SRegValue_Toggle_LayoutHotkey, FLayoutToggle);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LayoutHotkey, FLayoutToggle);
       FReset := True;
     end;
   finally
-    Free;
+    KeyboardToggleReg.Free;
   end;
 
   if FReset then
diff --git a/windows/src/engine/keyman32/build.sh b/windows/src/engine/keyman32/build.sh
index 55da1ef003..1c52948921 100755
--- a/windows/src/engine/keyman32/build.sh
+++ b/windows/src/engine/keyman32/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keystroke processing engine" \
diff --git a/windows/src/engine/keymanmc/build.sh b/windows/src/engine/keymanmc/build.sh
index 10fc74c65e..8ad933abb7 100755
--- a/windows/src/engine/keymanmc/build.sh
+++ b/windows/src/engine/keymanmc/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Message library for Event Viewer" \
diff --git a/windows/src/engine/keymanx64/build.sh b/windows/src/engine/keymanx64/build.sh
index 4398c062fb..b893b07b26 100755
--- a/windows/src/engine/keymanx64/build.sh
+++ b/windows/src/engine/keymanx64/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman main host process (64-bit)" \
diff --git a/windows/src/engine/kmcomapi/build.sh b/windows/src/engine/kmcomapi/build.sh
index 83f0e164a1..935cb91c6a 100755
--- a/windows/src/engine/kmcomapi/build.sh
+++ b/windows/src/engine/kmcomapi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "COM API library" \
diff --git a/windows/src/engine/kmrefresh/build.sh b/windows/src/engine/kmrefresh/build.sh
index 257f9dc636..47a1310209 100755
--- a/windows/src/engine/kmrefresh/build.sh
+++ b/windows/src/engine/kmrefresh/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Helper app to refresh Windows language settings" \
diff --git a/windows/src/engine/kmtip/build.sh b/windows/src/engine/kmtip/build.sh
index 3289f5b6ed..082125373e 100755
--- a/windows/src/engine/kmtip/build.sh
+++ b/windows/src/engine/kmtip/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Text Services Framework Text Input Processor" \
diff --git a/windows/src/engine/mcompile/build.sh b/windows/src/engine/mcompile/build.sh
index d302e740bc..919391e2ab 100755
--- a/windows/src/engine/mcompile/build.sh
+++ b/windows/src/engine/mcompile/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Helper app to refresh Windows language settings" \
diff --git a/windows/src/engine/testhost/build.sh b/windows/src/engine/testhost/build.sh
index ea9ef97c54..2ff6b844c2 100755
--- a/windows/src/engine/testhost/build.sh
+++ b/windows/src/engine/testhost/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test application for interacting with Keyman Engine" \
diff --git a/windows/src/engine/tsysinfo/build.sh b/windows/src/engine/tsysinfo/build.sh
index 51f233487a..e3390b899b 100755
--- a/windows/src/engine/tsysinfo/build.sh
+++ b/windows/src/engine/tsysinfo/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Diagnostics (32-bit)" \
diff --git a/windows/src/engine/tsysinfox64/build.sh b/windows/src/engine/tsysinfox64/build.sh
index b9a38be7c3..0a97e01c22 100755
--- a/windows/src/engine/tsysinfox64/build.sh
+++ b/windows/src/engine/tsysinfox64/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Diagnostics (64-bit)" \
diff --git a/windows/src/global/delphi/build.sh b/windows/src/global/delphi/build.sh
index 5628d216d4..34e5f0875b 100755
--- a/windows/src/global/delphi/build.sh
+++ b/windows/src/global/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/support/build.sh b/windows/src/support/build.sh
index f9f20f1716..af4d26a9d4 100755
--- a/windows/src/support/build.sh
+++ b/windows/src/support/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/support/etl2log/build.sh b/windows/src/support/etl2log/build.sh
index b7fd91c9b9..21ac7ee659 100755
--- a/windows/src/support/etl2log/build.sh
+++ b/windows/src/support/etl2log/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "etl2log" \
diff --git a/windows/src/support/oskbulkrenderer/build.sh b/windows/src/support/oskbulkrenderer/build.sh
index 7d7dc22918..2b139be912 100755
--- a/windows/src/support/oskbulkrenderer/build.sh
+++ b/windows/src/support/oskbulkrenderer/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "oskbuildrenderer" \
diff --git a/windows/src/support/texteditor/build.sh b/windows/src/support/texteditor/build.sh
index 997d8e6f24..6d58124a5d 100755
--- a/windows/src/support/texteditor/build.sh
+++ b/windows/src/support/texteditor/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "texteditor" \
diff --git a/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh b/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh
index fabddb3e03..6c343bddba 100755
--- a/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh
+++ b/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh
@@ -21,7 +21,7 @@ set -u # die on undefined variables
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Preparation
diff --git a/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh b/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh
index e8e1bd47ca..d905bb3002 100755
--- a/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh
+++ b/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test android locale string conversion to Keyman locale string" clean configure build test
diff --git a/windows/src/test/unit-tests/build.sh b/windows/src/test/unit-tests/build.sh
index d62f29a041..ca0d5bfb29 100755
--- a/windows/src/test/unit-tests/build.sh
+++ b/windows/src/test/unit-tests/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/test/unit-tests/group-helper-rsp19902/build.sh b/windows/src/test/unit-tests/group-helper-rsp19902/build.sh
index dba7f65df4..7946bc3e0e 100755
--- a/windows/src/test/unit-tests/group-helper-rsp19902/build.sh
+++ b/windows/src/test/unit-tests/group-helper-rsp19902/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test RSP-19902 workaround" clean configure build test
diff --git a/windows/src/test/unit-tests/jsonutil/build.sh b/windows/src/test/unit-tests/jsonutil/build.sh
index 2773d710eb..907fc6ca86 100755
--- a/windows/src/test/unit-tests/jsonutil/build.sh
+++ b/windows/src/test/unit-tests/jsonutil/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test JSON utils" clean configure build test
diff --git a/windows/src/test/unit-tests/shared-data/build.sh b/windows/src/test/unit-tests/shared-data/build.sh
index ee4230ecd8..0262202238 100755
--- a/windows/src/test/unit-tests/shared-data/build.sh
+++ b/windows/src/test/unit-tests/shared-data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "test shared data consistency" \
diff --git a/windows/src/test/unit-tests/shared-data/cpp/build.sh b/windows/src/test/unit-tests/shared-data/cpp/build.sh
index 71597fbf2b..8f1afce9d3 100755
--- a/windows/src/test/unit-tests/shared-data/cpp/build.sh
+++ b/windows/src/test/unit-tests/shared-data/cpp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "shared data C++" clean configure build
diff --git a/windows/src/test/unit-tests/shared-data/delphi/build.sh b/windows/src/test/unit-tests/shared-data/delphi/build.sh
index bc2dae2fba..4c0968fcec 100755
--- a/windows/src/test/unit-tests/shared-data/delphi/build.sh
+++ b/windows/src/test/unit-tests/shared-data/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "shared data Delphi" clean configure build
diff --git a/windows/src/test/unit-tests/standards-data/build.sh b/windows/src/test/unit-tests/standards-data/build.sh
index e610a5faed..f744bf3875 100755
--- a/windows/src/test/unit-tests/standards-data/build.sh
+++ b/windows/src/test/unit-tests/standards-data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test standards data import compliance" clean configure build test
diff --git a/windows/src/test/unit-tests/ui-language-manager/build.sh b/windows/src/test/unit-tests/ui-language-manager/build.sh
index a27cd5dc1f..62383ec4ec 100755
--- a/windows/src/test/unit-tests/ui-language-manager/build.sh
+++ b/windows/src/test/unit-tests/ui-language-manager/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test UI language manager" clean configure build test
diff --git a/windows/src/test/unit-tests/windows-setup/build.sh b/windows/src/test/unit-tests/windows-setup/build.sh
index dad789c810..ffc83ea8c2 100755
--- a/windows/src/test/unit-tests/windows-setup/build.sh
+++ b/windows/src/test/unit-tests/windows-setup/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test Setup" clean configure build test