diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..ab02d70
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+
+Dockerfile  text eol=lf
+*.sh        eol=lf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 221813d..e5c93da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,120 +3,23 @@ name: CI
 on: [pull_request]
 
 jobs:
-
   build-test:
-    runs-on: windows-latest
-    env:
-      api_keyman_com_host: http://127.0.0.1:8888
-      api_keyman_com_mssql_pw: Password1!
-      api_keyman_com_mssql_user: sa
-      api_keyman_com_mssqlconninfo: sqlsrv:Server=(local)\KEYMANAPI; Database=
-      api_keyman_com_mssql_create_database: true
-      api_keyman_com_mssqldb: keyboards
-      KEYMANHOSTS_TIER: TIER_TEST
+    runs-on: ubuntu-latest
 
     steps:
-
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - name: Setup PHP 7.4
-      uses: shivammathur/setup-php@6972aed899fa2dd4016a7e314c46e6902bcafb7b
-      with:
-        php-version: '7.4'
-        extensions: curl, intl, mbstring, openssl
-        coverage: none
+    - name: Build the Docker image
+      shell: bash
+      run: |
+        echo "TIER_TEST" > tier.txt
+        ./build.sh build start
       env:
         fail-fast: true
 
-    #
-    # Configure IIS and setup site for running unit tests
-    #  * Installs IIS, CGI extensions, URLRewrite and configures to connect to PHP
-    #  * Sets up http://127.0.0.1:8888 as host for tests
-    #  * Enables detailed error reporting
-    #
-    - name: Download and install IIS and setup a local website
-      shell: powershell
-      run: |
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole -NoRestart
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-CGI -NoRestart
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-ISAPIExtensions -NoRestart
-        Enable-WindowsOptionalFeature -Online -FeatureName IIS-ISAPIFilter -NoRestart
-        Choco-Install -PackageName urlrewrite -ArgumentList "--no-progress"
-        Import-Module WebAdministration
-        New-WebAppPool -name "NewWebSiteAppPool"  -force
-        New-WebSite -name "NewWebSite" -PhysicalPath "$ENV:GITHUB_WORKSPACE" -ApplicationPool "NewWebSiteAppPool" -port 8888 -force
-        Set-WebConfigurationproperty -filter "system.webServer/httpErrors" -pspath "MACHINE/WEBROOT/APPHOST" -name errorMode -value Detailed
-
-    #
-    # This step configures FastCGI according to the documentation at https://www.php.net/manual/en/install.windows.manual.php
-    # This alternative doesn't work: New-WebHandler -name "PHP" -Path *.php -Modules FastCgiModule -ScriptProcessor "c:\tools\php\php-cgi.exe" -Verb 'GET,POST' -Force
-    #
-    - name: Setup FastCGI
-      shell: cmd
-      run: |
-        set phpdir=c:\tools
-        set phppath=php
-
-        REM Clear current PHP handlers
-        %windir%\system32\inetsrv\appcmd clear config /section:system.webServer/fastCGI
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/handlers /-[name='PHP_via_FastCGI']
-
-        REM Set up the PHP handler
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/fastCGI /+[fullPath='%phpdir%\%phppath%\php-cgi.exe']
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/handlers /+[name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='%phpdir%\%phppath%\php-cgi.exe',resourceType='Unspecified']
-        %windir%\system32\inetsrv\appcmd set config /section:system.webServer/handlers /accessPolicy:Read,Script
-
-        REM Configure FastCGI Variables
-        %windir%\system32\inetsrv\appcmd set config -section:system.webServer/fastCgi /[fullPath='%phpdir%\%phppath%\php-cgi.exe'].instanceMaxRequests:10000
-        %windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi /+"[fullPath='%phpdir%\%phppath%\php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']"
-        %windir%\system32\inetsrv\appcmd.exe set config -section:system.webServer/fastCgi /+"[fullPath='%phpdir%\%phppath%\php-cgi.exe'].environmentVariables.[name='PHPRC',value='%phpdir%\%phppath%\php.ini']"
-
-    #
-    # Write environment to localenv.php (so PHP under IIS can see it as env is not available)
-    #
-    - name: Setup localenv.php
-      shell: cmd
-      run: |
-        echo ^<?php > tools\db\localenv.php
-        echo $mssqlpw='%api_keyman_com_mssql_pw%'; >> tools\db\localenv.php
-        echo $mssqluser='%api_keyman_com_mssql_user%'; >> tools\db\localenv.php
-        echo $mssqldb = '%api_keyman_com_mssqldb%'; >> tools\db\localenv.php
-        echo $mssqlconninfo='%api_keyman_com_mssqlconninfo%'; >> tools\db\localenv.php
-        echo $mssql_create_database = true; >> tools\db\localenv.php
-
-    #
-    # Install SQL Server Developer Edition with FullText Search module
-    #
-    - name: Download and install SQL Server Express
-      shell: powershell
-      run: |
-        Choco-Install -PackageName sql-server-2019 -ArgumentList "--no-progress", "--params", "'/IGNOREPENDINGREBOOT /INSTANCEID=KEYMANAPI /INSTANCENAME=KEYMANAPI /SAPWD=Password1! /SECURITYMODE=SQL /UPDATEENABLED=FALSE /FEATURES=SQLENGINE,FULLTEXT'"
-
-    #
-    # Install website PHP dependencies
-    #
-    - name:  Install dependencies
-      shell: cmd
-      run:   composer install --no-progress
-
-    #
-    # Install PHP SQL Server PDO Driver
-    #  * Copy driver to PHP extensions
-    #  * Configure extension
-    #  * Allow PHP errors to be displayed
-    #
-    - name:  Install PHP SQL Server PDO Driver
-      shell: powershell
+    - name: Run tests
+      shell: bash
       run: |
-        Invoke-WebRequest -outfile pdo.zip https://github.com/microsoft/msphpsql/releases/download/v5.8.0/Windows-7.4.zip
-        Expand-Archive pdo.zip -DestinationPath pdo\
-        copy pdo\Windows-7.4\x64\php_pdo_sqlsrv_74_nts.dll c:\tools\php\ext\
-        Add-Content -path c:\tools\php\php.ini -value '','extension=php_pdo_sqlsrv_74_nts.dll','mssql.secure_connection=Off','display_errors = On','upload_tmp_dir = c:\tools\php\tmp'
+        ./build.sh test
 
-    #
-    # Finally, run the unit tests!
-    #
-    - name:  Run unit tests
-      shell: cmd
-      run:   composer test
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
new file mode 100644
index 0000000..6d9b8f9
--- /dev/null
+++ b/.github/workflows/cleanup.yml
@@ -0,0 +1,57 @@
+name: Prune images
+on:
+  workflow_run:
+    workflows: [Docker-build]
+    types: [completed]
+
+jobs:
+  prune:
+    runs-on: ubuntu-latest
+    steps:
+    - name: prune-staging-api
+      uses: vlaurin/action-ghcr-prune@v0.5.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-app
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: staging
+        prune-untagged: true
+
+    - name: prune-staging-db
+      uses: vlaurin/action-ghcr-prune@v0.5.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-db
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: staging
+        prune-untagged: true
+
+    - name: prune-production-api
+      uses: vlaurin/action-ghcr-prune@v0.5.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-app
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: master
+        prune-untagged: true
+
+    - name: prune-production-db
+      uses: vlaurin/action-ghcr-prune@v0.5.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        organization: keymanapp
+        container: api-keyman-com-db
+        dry-run: true
+        keep-younger-than: 7
+        keep-last: 3
+        prune-tags-regexes: master
+        prune-untagged: true
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..6301426
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,84 @@
+name: Docker-build
+on:
+  push:
+    branches: [ "master", "staging" ]
+    paths:
+    - .github/**
+    - composer.*
+    - resources/**
+    - "*Dockerfile"
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: keymanapp/api-keyman-com
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Workaround: https://github.com/docker/build-push-action/issues/461
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      # Login against a Docker registry except on PR
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for PHP container
+      - name: Extract Docker metadata for PHP runtime
+        id: meta-app
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app
+          tags: |
+            type=raw,value={{branch}}
+            type=raw,value=latest
+          labels: |
+            org.opencontainers.image.description=PHP api runtime
+
+      # Extract metadata (tags, labels) for sqlserver container
+      - name: Extract Docker metadata for SQLServer container
+        id: meta-db
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-db
+          tags: |
+            type=raw,value={{branch}}
+            type=raw,value=latest
+          labels: |
+            org.opencontainers.image.description=SQLServer
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      - name: Build and push Docker image for PHP runtime
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-app.outputs.tags }}
+          labels: ${{ steps.meta-app.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      
+      # Build and push Docker image with Buildx (don't push on PR)
+      - name: Build and push Docker image for SQLServer containe
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: mssql.Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-db.outputs.tags }}
+          labels: ${{ steps.meta-db.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a8e7454..ceec8be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,11 @@
 /.data/
 **/.idea/**/*.xml
 **/*.iml
-/vendor/
+vendor*
 /node_modules/
 .vscode/
+
+# Shared files are bootstrapped:
+resources/bootstrap.inc.sh
+resources/.bootstrap-version
+_common/
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..52fe189
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,135 @@
+
+RewriteEngine on
+RewriteBase /
+
+# Ready
+RewriteRule "^_control/ready$" "_control/ready.php" [END]
+
+###### Rewrites for /script folder: /search
+
+# rule name="/search/2.0" stopProcessing="true"
+RewriteRule "^search/2\.0" "/script/search/2.0/search.php" [END]
+
+# rule name="/search" stopProcessing="true"
+RewriteRule "^search(/1\.0)?" "/script/search/1.0/search.php" [END]
+
+# Rewrites for /script folder: /keyboard
+
+# rule name="/keyboard" stopProcessing="true"
+RewriteRule "^keyboard/(.*)$" "/script/keyboard/keyboard.php?id=$1" [END]
+
+
+###### Rewrites for /script folder: /increment-download
+
+# rule name="/increment-download" stopProcessing="true"
+# TODO: Conditions
+#<conditions>
+#  <add input="{REQUEST_METHOD}" matchType="Pattern" pattern="POST" ignoreCase="true" />
+#</conditions>
+# RewriteCond
+RewriteRule "^increment-download/(.*)$" "/script/increment-download/increment-download.php?id=$1" [END]
+
+##### Rewrites for /script folder: /model
+
+# rule name="/model?q=..." stopProcessing="true"
+RewriteRule "^model(/)?$" "/script/model-search/model-search.php" [END]
+
+# rule name="/model" stopProcessing="true"
+RewriteRule "^model/(.*)$" "/script/model/model.php?id=$1" [END]
+
+##### Rewrites for /script folder: /version
+
+# rule name="/version/platform/level" stopProcessing="true"
+RewriteRule "^version(\/([^/]+)(\/([^/]+))?)?$" "/script/version/version.php?platform=$2&level=$4" [END]
+
+# rule name="/version" stopProcessing="true"
+RewriteRule "^version(\/)?$" "/script/version/version.php" [END]
+
+# rule name="/package-version[/1.0]" stopProcessing="true" TODO appendQueryString="true"
+RewriteRule "^package-version(\/1\.0)?(\/)?$" "/script/package-version/package-version.php" [END]
+
+##### Rewrites for /script folder: /cloud to /script/legacy/...
+
+# rule name="Language + keyboard map 4.0" stopProcessing="true"
+RewriteRule "cloud/(4\.0\/)languages(\/([a-z0-9-]{2,}))(\/([a-z0-9_]+))" "/script/legacy/legacy40.php?context=language&languageid=$3&keyboardid=$5" [QSA,END]
+
+# rule name="Language map 4.0" stopProcessing="true"
+RewriteRule "cloud/(4\.0\/)languages(\/([a-z0-9-]{2,}))?" "/script/legacy/legacy40.php?context=language&languageid=$3" [QSA,END]
+
+# rule name="Keyboard + Language Map 4.0" stopProcessing="true"
+RewriteRule "cloud/(4\.0\/)keyboards(\/([a-z0-9_]+))(\/([a-z0-9-]{2,}))" "/script/legacy/legacy40.php?context=keyboard&keyboardid=$3&languageid=$5" [QSA,END]
+
+# rule name="Keyboard map 4.0" stopProcessing="true"
+RewriteRule "cloud/(4\.0\/)keyboards(\/([a-z0-9_]+))?" "/script/legacy/legacy40.php?context=keyboard&keyboardid=$3" [QSA,END]
+
+# rule name="Language + keyboard map 3.0" stopProcessing="true"
+RewriteRule "cloud/(3\.0\/)languages(\/([a-z0-9-]{2,}))(\/([a-z0-9_]+))" "/script/legacy/legacy30.php?context=language&languageid=$3&keyboardid=$5" [END]
+
+# rule name="Language map 3.0" stopProcessing="true"
+RewriteRule "cloud/(3\.0\/)languages(\/([a-z0-9-]{2,}))?" "/script/legacy/legacy30.php?context=language&languageid=$3" [END]
+
+# rule name="Keyboard + Language Map 3.0" stopProcessing="true"
+RewriteRule "cloud/(3\.0\/)keyboards(\/([a-z0-9_]+))(\/([a-z0-9-]{2,}))" "/script/legacy/legacy30.php?context=keyboard&keyboardid=$3&languageid=$5" [END]
+
+# rule name="Keyboard map 3.0" stopProcessing="true"
+RewriteRule "cloud/(3\.0\/)keyboards(\/([a-z0-9_]+))?" "/script/legacy/legacy30.php?context=keyboard&keyboardid=$3" [END]
+
+# rule name="Language map 2.0" stopProcessing="true"
+RewriteRule "cloud/(2\.0\/)languages(\/([a-z0-9-]{2,}))?" "/script/legacy/legacy20.php?context=language&languageid=$3" [END]
+
+# rule name="Keyboard + Language Map 2.0" stopProcessing="true"
+RewriteRule "cloud/(2\.0\/)keyboards(\/([a-z0-9_]+))(\/([a-z0-9-]{2,}))" "/script/legacy/legacy20.php?context=keyboard&keyboardid=$3&languageid=$5" [END]
+
+# rule name="Keyboard map 2.0" stopProcessing="true"
+RewriteRule "cloud/(2\.0\/)keyboards(\/([a-z0-9_]+))?" "/script/legacy/legacy20.php?context=keyboard&keyboardid=$3" [END]
+
+# rule name="Language map" stopProcessing="true"
+RewriteRule "cloud/(1\.0\/)?languages(\/([a-z0-9-]{2,}))?" "/script/legacy/legacy10.php?context=language&languageid=$3" [END]
+
+# rule name="Keyboard map" stopProcessing="true"
+RewriteRule "cloud/(1\.0\/)?keyboards(\/([a-z0-9_]+))?" "/script/legacy/legacy10.php?context=keyboard&keyboardid=$3" [END]
+
+##### Rewrites for /hooks
+
+# rule name="/hooks/keyboards-build-success.json" stopProcessing="true"
+# RewriteRule "^hooks/keyboards-build-success.json" "/script/hooks/keyboards-build-success.php?format=application/json" [QSA,END]
+
+
+# rule name="/hooks/keyboards-build-success" stopProcessing="true"
+# RewriteRule "^hooks/keyboards-build-success" "/script/hooks/keyboards-build-success.php?format=text/plain" [QSA,END]
+
+
+##### Keyman for Windows 14.0+ API endpoints
+
+# rule name="windows/14.0+/update" stopProcessing="true"
+RewriteRule "^windows/[1-9][0-9]\.[0-9]/update(.*)" "/script/windows/14.0/update/index.php$1" [END]
+
+
+##### Keyman Desktop 10.0, 11.0, 12.0, etc API endpoints
+
+# rule name="desktop/10.0-13.0/update" stopProcessing="true"
+RewriteRule "^desktop/(10|11|12|13)\.[0-9]/update(.*)" "/script/desktop/10.0/update/index.php$2" [END]
+
+
+# rule name="desktop/10.0/exception" stopProcessing="true"
+# Note: this endpoint is also used by developer
+RewriteRule "^desktop/[1-9][0-9]\.[0-9]/exception(.*)" "/script/desktop/10.0/exception/index.php$2" [END]
+
+
+# rule name="desktop/10.0/isonline" stopProcessing="true"
+RewriteRule "^desktop/[1-9][0-9]\.[0-9]/isonline(/?)$" "/script/desktop/10.0/isonline/index.php" [END]
+
+
+# rule name="desktop/10.0/submitdiag" stopProcessing="true"
+RewriteRule "^desktop/[1-9][0-9]\.[0-9]/submitdiag(/?)$" "/script/desktop/10.0/submitdiag/index.php" [END]
+
+##### Keyman Developer 10.0 - 13.0 API endpoints
+
+# rule name="developer/10.0/update" stopProcessing="true"
+RewriteRule "^developer/(10|11|12|13)\.0/update(.*)" "/script/developer/10.0/update/index.php$2" [END]
+
+
+##### Keyman Developer 14.0+ API endpoints
+
+# rule name="developer/14.0+/update" stopProcessing="true"
+RewriteRule "^developer/[1-9][0-9]\.[0-9]/update(.*)" "/script/developer/14.0/update/index.php$1" [END]
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f109b08
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,47 @@
+# syntax=docker/dockerfile:1
+FROM php:7.4-apache@sha256:c9d7e608f73832673479770d66aacc8100011ec751d1905ff63fae3fe2e0ca6d AS composer-builder
+
+# Install Zip to use composer
+RUN apt-get update && apt-get install -y \
+    zlib1g-dev \
+    libzip-dev \
+    unzip
+RUN docker-php-ext-install zip
+
+# Install and update composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+RUN composer self-update
+
+USER www-data
+WORKDIR /composer
+COPY composer.* /composer/
+RUN composer install
+
+# Site
+FROM php:7.4-apache@sha256:c9d7e608f73832673479770d66aacc8100011ec751d1905ff63fae3fe2e0ca6d
+COPY resources/keyman-site.conf /etc/apache2/conf-available/
+RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
+RUN echo memory_limit = 1024M >> /usr/local/etc/php/php.ini
+RUN chown -R www-data:www-data /var/www/html/
+
+# Install SQL drivers
+# https://learn.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac?view=sql-server-ver16
+# https://stackoverflow.com/a/72176870
+RUN apt-get update && apt-get install -y gnupg2
+
+# Adding custom MS repo
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
+RUN curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list > /etc/apt/sources.list.d/mssql-release.list
+
+## Install SQL Server drivers and Zip
+RUN apt-get update && ACCEPT_EULA=Y apt-get -y --no-install-recommends install msodbcsql18 unixodbc-dev zip libzip-dev
+RUN pecl install sqlsrv-5.10.1
+RUN pecl install pdo_sqlsrv-5.10.1
+RUN docker-php-ext-install pdo pdo_mysql zip
+RUN docker-php-ext-enable sqlsrv pdo_sqlsrv pdo pdo_mysql
+COPY --from=composer-builder /composer/vendor /var/www/vendor
+
+# This is handled in init-container.sh
+# RUN ls -l /var/www/ &&  php /var/www/html/tools/db/build/build_cli.php
+RUN a2enmod rewrite; a2enconf keyman-site 
+#    service apache2 restart
diff --git a/README.md b/README.md
index d2dafbd..858deab 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # api.keyman.com
 
+The following is outdated and will be replaced with Docker/Apache
+
 ## Configuration
 
 Currently, this site runs only on a Windows host with IIS and Microsoft SQL Server.
diff --git a/_common/JsonApiFailure.php b/_common/JsonApiFailure.php
deleted file mode 100644
index cbf1270..0000000
--- a/_common/JsonApiFailure.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-  declare(strict_types=1);
-
-  namespace Keyman\Site\Common;
-
-  class JsonApiFailure {
-    public const
-      ERROR_InvalidParameters = 'ERROR_InvalidParameters',
-      ERROR_NotFound = 'ERROR_NotFound';
-
-    static function Failure($httpcode, $errorcode, $message) {
-      header("HTTP/1.0 $httpcode $errorcode");
-      header("Content-Type: application/json");
-      \Sentry\captureMessage("Error $errorcode: $message", \Sentry\Severity::error());
-      $data = ['error' => $errorcode, 'message' => $message];
-      echo json_encode($data, JSON_UNESCAPED_SLASHES);
-      exit;
-    }
-
-    static function InvalidParameters($expected) {
-      self::Failure(400, JsonApiFailure::ERROR_InvalidParameters, "Invalid parameters passed to function (expected: $expected)");
-    }
-  }
\ No newline at end of file
diff --git a/_common/KeymanHosts.php b/_common/KeymanHosts.php
deleted file mode 100644
index 36ad3e1..0000000
--- a/_common/KeymanHosts.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-  declare(strict_types=1);
-
-  namespace Keyman\Site\Common;
-
-  class KeymanHosts {
-    // Four tiers. These use the following rough patterns:
-    // * development = [x.]keyman.com.local
-    // * Staging = [x.]keyman-staging.com
-    // * Production = [x.]keyman.com
-    // * Test = GitHub actions, localhost:8888 (uses staging tier for other hosts)
-    const TIER_DEVELOPMENT = "TIER_DEVELOPMENT";
-    const TIER_STAGING = "TIER_STAGING";
-    const TIER_PRODUCTION = "TIER_PRODUCTION";
-    const TIER_TEST = "TIER_TEST";
-
-    public
-      $s_keyman_com, $api_keyman_com, $help_keyman_com, $downloads_keyman_com,
-      $keyman_com, $keymanweb_com, $r_keymanweb_com, $blog_keyman_com,
-      $donate_keyman_com, $translate_keyman_com, $sentry_keyman_com;
-
-    public
-      $s_keyman_com_host, $api_keyman_com_host, $help_keyman_com_host, $downloads_keyman_com_host,
-      $keyman_com_host,  $keymanweb_com_host, $r_keymanweb_com_host, $blog_keyman_com_host,
-      $donate_keyman_com_host, $translate_keyman_com_host, $sentry_keyman_com_host;
-
-    private $tier;
-
-    private static $instance;
-
-    public static function Instance(): KeymanHosts {
-      if(!self::$instance)
-        self::Rebuild();
-      return self::$instance;
-    }
-
-    public function Tier() {
-      return $this->tier;
-    }
-
-    public static function Rebuild() {
-      self::$instance = new KeymanHosts();
-    }
-
-    /**
-     * Returns $contents after regex'ing the Keyman live hosts for Markdown files
-     * @param $contents
-     * @return $contents
-     */
-    public function fixupHostReferences($contents) {
-      // Regex Keyman hosts
-      $contents = str_replace("https://s.keyman.com", $this->s_keyman_com, $contents);
-      $contents = str_replace("https://api.keyman.com", $this->api_keyman_com, $contents);
-      $contents = str_replace("https://help.keyman.com", $this->help_keyman_com, $contents);
-      $contents = str_replace("https://downloads.keyman.com", $this->downloads_keyman_com, $contents);
-      $contents = str_replace("https://keyman.com", $this->keyman_com, $contents);
-      $contents = str_replace("https://keymanweb.com", $this->keymanweb_com, $contents);
-      $contents = str_replace("https://r.keymanweb.com", $this->r_keymanweb_com, $contents);
-      $contents = str_replace("https://blog.keyman.com", $this->blog_keyman_com, $contents);
-      $contents = str_replace("https://donate.keyman.com", $this->donate_keyman_com, $contents);
-      $contents = str_replace("https://translate.keyman.com", $this->translate_keyman_com, $contents);
-      $contents = str_replace("https://sentry.keyman.com", $this->sentry_keyman_com, $contents);
-
-      return $contents;
-    }
-
-    function __construct() {
-      if(isset($_SERVER['KEYMANHOSTS_TIER']) && in_array($_SERVER['KEYMANHOSTS_TIER'],
-          [KeymanHosts::TIER_DEVELOPMENT, KeymanHosts::TIER_STAGING,
-           KeymanHosts::TIER_PRODUCTION, KeymanHosts::TIER_TEST])) {
-        $this->tier = $_SERVER['KEYMANHOSTS_TIER'];
-      } else if(file_exists(__DIR__ . '/../tier.txt')) {
-        $this->tier = trim(file_get_contents(__DIR__ . '/../tier.txt'));
-      } else {
-        $this->tier = KeymanHosts::TIER_DEVELOPMENT;
-      }
-
-      switch($this->tier) {
-      // Not all these are currently used but helps to cleanup confusion
-      case KeymanHosts::TIER_PRODUCTION:
-      case KeymanHosts::TIER_STAGING:
-        $site_suffix = '';
-        $site_protocol = 'https://';
-        break;
-      case KeymanHosts::TIER_TEST:
-        $site_suffix = '';
-        $site_protocol = 'http://';
-        break;
-      case KeymanHosts::TIER_DEVELOPMENT:
-        $site_suffix = '.local';
-        $site_protocol = 'https://';
-        break;
-      }
-
-      $this->blog_keyman_com = "https://blog.keyman.com";
-      $this->donate_keyman_com = "https://donate.keyman.com";
-      $this->translate_keyman_com = "https://translate.keyman.com";
-      $this->sentry_keyman_com = "https://sentry.keyman.com";
-
-      if(in_array($this->tier, [KeymanHosts::TIER_STAGING, KeymanHosts::TIER_TEST])) {
-        // As we build more staging areas, change these over as well. Assumption that we'll stage across multiple sites is a
-        // little presumptuous but we can live with it.
-        $this->s_keyman_com = "https://s.keyman.com";
-        $this->api_keyman_com = "https://api.keyman-staging.com";
-        $this->help_keyman_com = "https://help.keyman-staging.com";
-        $this->downloads_keyman_com = "https://downloads.keyman.com";
-        $this->keyman_com = "https://keyman-staging.com";
-        $this->keymanweb_com = "https://keymanweb.com";
-        $this->r_keymanweb_com = "https://r.keymanweb.com";
-      } else {
-        // TODO: allow override of these with e.g. KEYMANHOSTS_API_KEYMAN_COM='https://api.keyman.com';
-        $this->s_keyman_com = "{$site_protocol}s.keyman.com{$site_suffix}";
-        $this->api_keyman_com = "{$site_protocol}api.keyman.com{$site_suffix}";
-        $this->help_keyman_com = "{$site_protocol}help.keyman.com{$site_suffix}";
-        $this->downloads_keyman_com = "{$site_protocol}downloads.keyman.com{$site_suffix}";
-        $this->keyman_com = "{$site_protocol}keyman.com{$site_suffix}";
-        $this->keymanweb_com = "{$site_protocol}keymanweb.com{$site_suffix}";
-        $this->r_keymanweb_com = "https://r.keymanweb.com"; /// local dev domain is usually not available
-      }
-
-      $this->blog_keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->blog_keyman_com);
-      $this->s_keyman_com_host  = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->s_keyman_com);
-      $this->api_keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->api_keyman_com);
-      $this->help_keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->help_keyman_com);
-      $this->downloads_keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->downloads_keyman_com);
-      $this->keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->keyman_com);
-      $this->keymanweb_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->keymanweb_com);
-      $this->r_keymanweb_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->r_keymanweb_com);
-      $this->donate_keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->donate_keyman_com);
-      $this->translate_keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->translate_keyman_com);
-      $this->sentry_keyman_com_host = preg_replace('/^http(s)?:\/\/(.+)$/', '$2', $this->sentry_keyman_com);
-    }
-  }
diff --git a/_common/KeymanSentry.php b/_common/KeymanSentry.php
deleted file mode 100644
index 7358d32..0000000
--- a/_common/KeymanSentry.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-  declare(strict_types=1);
-
-  namespace Keyman\Site\Common;
-
-  class KeymanSentry {
-    static function init($dsn) {
-      if(isset($_SERVER['SERVER_NAME'])) {
-        // running from web server
-        $host = $_SERVER['SERVER_NAME'];
-        if(preg_match('/\.local$/', $host))
-          // If the host name is, e.g. api.keyman.com.local, then we'll assume this is a development environment
-          $environment = 'development';
-        else if(preg_match('/(^|\.)keyman-staging\.com$/', $host))
-          $environment = 'staging';
-        else
-          $environment = 'production';
-      } else if(isset($_ENV['WEBSITE_SITE_NAME'])) {
-        // probably running from CLI in Azure (e.g. deployment or SCM)
-        $host = $_ENV['WEBSITE_SITE_NAME'];
-        $environment = preg_match('/staging/', $host) ? 'staging' : 'production';
-      } else {
-        // Unknown environment, probably local development CLI
-        $environment = 'development';
-      }
-
-      \Sentry\init([
-        'dsn' => $dsn,
-        'environment' => $environment
-      ]);
-    }
-  }
\ No newline at end of file
diff --git a/_common/MarkdownHost.php b/_common/MarkdownHost.php
deleted file mode 100644
index 517c52f..0000000
--- a/_common/MarkdownHost.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-  declare(strict_types=1);
-
-  namespace Keyman\Site\Common;
-
-  use Keyman\Site\Common\KeymanHosts;
-
-  class MarkdownHost {
-    private $content, $pagetitle;
-
-    function PageTitle() {
-      return $this->pagetitle;
-    }
-
-    function Content() {
-      return $this->content;
-    }
-
-    function __construct($file) {
-      $this->pagetitle = 'TODO'; // If page title is not set, this hints to the developer to fix it
-
-      $file = realpath(__DIR__ . '/../') . DIRECTORY_SEPARATOR . $file;
-      $contents = trim(file_get_contents($file));
-      $contents = str_replace("\r\n", "\n", $contents);
-
-      $contents = KeymanHosts::Instance()->fixupHostReferences($contents);
-
-      // This header specification comes from YAML originally and is not common across
-      // markdown implementations. While Parsedown does not currently parse this out,
-      // it seems a sensible approach to use. The header section is delineated by `---`
-      // and `---` must be the first three characters of the file (no BOM!); note that
-      // the full spec supports metadata sections anywhere but we only support top-of-file.
-      //
-      // Currently we support only the 'title' and 'redirect' keywords.
-      //
-      // title: must be a plain text title
-      // redirect: must be a relative or absolute url
-      //
-      // ---
-      // keyword: content
-      // keyword: content
-      // ---
-      //
-      // source: https://yaml.org/spec/1.2/spec.html#id2760395
-      // source: https://pandoc.org/MANUAL.html#extension-yaml_metadata_block
-      //
-
-      $lines = explode("\n", $contents);
-
-      $found = count($lines) > 3 && rtrim($lines[0]) == '---';
-      $headers = [];
-      for($i = 1; $i < count($lines); $i++) {
-        if($lines[$i] == '---') break;
-        if(!preg_match('/^([a-z0-9_-]+):(.+)$/', $lines[$i], $match)) {
-          $found = false;
-          break;
-        } else {
-          $headers[$match[1]] = trim($match[2]);
-        }
-      }
-      $found = $found && $i < count($lines);
-
-      if($found) $contents = implode("\n", array_slice($lines, $i));
-
-      if(isset($headers['redirect'])) {
-        header("Location: {$headers['redirect']}");
-        exit;
-      }
-
-      $this->pagetitle = isset($headers['title']) ? $headers['title'] : 'Untitled';
-
-      // Performs the parsing + prettification of Markdown for display through PHP.
-      $Parsedown = new \ParsedownExtra();
-
-      // Does the magic.
-      $this->content =
-       "<h1>" . htmlentities($this->pagetitle) . "</h1>\n" .
-       "<div class='markdown'>" .
-       $Parsedown->text($contents) .
-       "</div>";
-    }
-  }
-
diff --git a/_common/README.md b/_common/README.md
deleted file mode 100644
index 6413998..0000000
--- a/_common/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Common Files
-
-These files are common to keyman.com sites. They must be kept identical to each other.
-
-## Namespace
-
-The root namespace for all PHP modules is `Keyman\Site\Common`.
-
-## Validation
-
-`composer test` on api.keyman.com will compare the contents of the `_common` folder across
-keyman.com, api.keyman.com and help.keyman.com (and in future, other sites), if the
-corresponding folders can be found. Currently, this test assumes that each site is in
-a sibling folder with corresponding name (e.g. `~/keyman/sites/keyman.com`,
-`~/keyman/sites/api.keyman.com`, etc), so the test will be skipped in CI at this time
-(especially as the development cycle may be out of sync for the sites).
diff --git a/_control/alive b/_control/alive
new file mode 100644
index 0000000..e7ad0e7
--- /dev/null
+++ b/_control/alive
@@ -0,0 +1,2 @@
+Alive
+
diff --git a/_control/info.php b/_control/info.php
new file mode 100644
index 0000000..951065f
--- /dev/null
+++ b/_control/info.php
@@ -0,0 +1,28 @@
+<?php
+
+require_once __DIR__ . '/../tools/autoload.php';
+require_once __DIR__ . '/../tools/db/servervars.php';
+
+use Keyman\Site\Common\KeymanHosts;
+
+$kh = KeymanHosts::Instance();
+$dci = new \DatabaseConnectionInfo();
+$schema = $dci->getActiveSchema();
+if(file_exists(__DIR__ . '/../.data/BUILDING')) $status = 'Building ' . $dci->getInactiveSchema();
+else if(file_exists(__DIR__ . '/../.data/MUST_REBUILD')) $status .= 'Must Rebuild';
+else $status = 'Ready';
+
+$date = file_exists(__DIR__ . '/../.data/LAST_REBUILD_DATE') ?
+  file_get_contents(__DIR__ . '/../.data/LAST_REBUILD_DATE') :
+  'Unknown';
+
+echo <<<END
+<h1>api.keyman.com</h1>
+<table border='1'>
+<tr><td>host</td><td>{$kh->api_keyman_com_host}</td></tr>
+<tr><td>tier</td><td>{$kh->Tier()}</td></tr>
+<tr><td>schema</td><td>$schema</td></tr>
+<tr><td>database build status</td><td>$status</td></tr>
+<tr><td>last database build completed</td><td>$date</td></tr>
+</table>
+END;
diff --git a/_control/ready.php b/_control/ready.php
new file mode 100644
index 0000000..b055dbe
--- /dev/null
+++ b/_control/ready.php
@@ -0,0 +1,66 @@
+<?php
+  header("Content-Type: text/plain");
+
+  require_once(__DIR__ . '/../tools/db/db.php');
+
+  // Test web server ready, and _common files, and vendor files ready
+
+  // Test db connection. Connect fails if db is not ready
+  $mssql = Keyman\Site\com\keyman\api\Tools\DB\DBConnect::Connect();
+
+  // Test db is built
+  $stmt = $mssql->prepare('EXEC sp_keyboard_search_by_id ?, ?');
+  $id = 'khmer_angkor';
+  $obsolete = FALSE;
+  $stmt->bindParam(1, $id);
+  $stmt->bindParam(2, $obsolete);
+  try {
+    if ($stmt->execute()) {
+      $data = $stmt->fetchAll(PDO::FETCH_NUM);
+      //json_print($data);
+    }
+  } catch(PDOException $e) {
+    die('Error: ' . $e->getMessage());
+  }
+
+  // Test chinese_pinyin_import.sql ready with query
+  $stmt = $mssql->prepare(
+    'SELECT pinyin_key, chinese_text, tip FROM kmw_chinese_pinyin WHERE pinyin_key=? ORDER BY frequency DESC, id');
+  $py = 'biguansuoguo';
+  $stmt->bindParam(1, $py);
+  try {
+    if ($stmt->execute()) {
+      $data = $stmt->fetchAll(PDO::FETCH_NUM);
+      //json_print($data);
+    }
+  } catch(PDOException $e) {
+    die('chinese_pinyin_import.sql not ready: ' . $e->getMessage());
+  }
+
+  // Test japanese_import.sql ready with query
+  $stmt = $mssql->prepare(
+    'SELECT DISTINCT kanji, gloss, pri FROM kmw_japanese WHERE (kana=?) ORDER BY pri');
+  $kana = 'あいでし';
+  $stmt->bindParam(1, $kana);
+  try {
+    if ($stmt->execute()) {
+      $data = $stmt->fetchAll(PDO::FETCH_NUM);
+      //json_print($data);
+    }
+  } catch(PDOException $e) {
+    die('japanese_import.sql not ready: ' . $e->getMessage());
+  }
+
+  if (!file_exists(__DIR__ . '/../.data/activeschema.txt')) {
+    die('/.data/activeschema.txt not ready');
+  }
+
+  if (!file_exists(__DIR__ . '/../_common/KeymanHosts.php')) {
+    die('/_common not ready');
+  }
+
+  if (!is_dir(__DIR__ . '/../vendor')) {
+    die('/vendor not ready');
+  }
+
+  echo "ready\n";
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..e867f9e
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+## START STANDARD SITE BUILD SCRIPT INCLUDE
+readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh"
+readonly BOOTSTRAP_VERSION=v0.4
+[ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
+## END STANDARD SITE BUILD SCRIPT INCLUDE
+
+readonly API_KEYMAN_DB_CONTAINER_NAME=api-keyman-com-db
+readonly API_KEYMAN_DB_CONTAINER_DESC=api-keyman-com-db
+readonly API_KEYMAN_DB_IMAGE_NAME=api-keyman-com-db
+
+readonly API_KEYMAN_CONTAINER_NAME=api-keyman-com-website
+readonly API_KEYMAN_CONTAINER_DESC=api-keyman-com-app
+readonly API_KEYMAN_IMAGE_NAME=api-keyman-com-website
+readonly HOST_API_KEYMAN_COM=api.keyman.com.localhost
+
+source _common/keyman-local-ports.inc.sh
+source _common/docker.inc.sh
+
+################################ Main script ################################
+
+builder_describe \
+  "Setup api.keyman.com site to run via Docker." \
+  "configure" \
+  "clean" \
+  "build" \
+  "start" \
+  "stop" \
+  "test" \
+  ":db   Build the database" \
+  ":app  Build the site"
+
+builder_parse "$@"
+
+function test_docker_container() {
+  echo "TIER_TEST" > tier.txt
+  # Note: ci.yml replicates these
+
+  # Run unit tests
+  docker exec $API_KEYMAN_CONTAINER_DESC sh -c "vendor/bin/phpunit --testdox"
+
+  # Lint .php files for obvious errors
+  docker exec $API_KEYMAN_CONTAINER_DESC sh -c "find . -name '*.php' | grep -v '/vendor/' | xargs -n 1 -d '\\n' php -l"
+
+  # Check all internal links
+  # NOTE: link checker runs on host rather than in docker image
+  npx broken-link-checker http://localhost:8058 --ordered --recursive --host-requests 10 -e --filter-level 3
+
+  rm tier.txt
+}
+
+builder_run_action configure bootstrap_configure
+
+builder_run_action clean:db   clean_docker_container $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME
+builder_run_action clean:app  clean_docker_container $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME
+builder_run_action stop:db    stop_docker_container  $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME
+builder_run_action stop:app   stop_docker_container  $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME
+
+# Build the Docker containers
+function build_docker_container_db() {
+  local IMAGE_NAME=$1
+  local CONTAINER_NAME=$2
+
+  # Download docker image. --mount option requires BuildKit
+  DOCKER_BUILDKIT=1 docker build -t $API_KEYMAN_DB_IMAGE_NAME -f mssql.Dockerfile .
+}
+
+builder_run_action build:db   build_docker_container_db $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME
+builder_run_action build:app  build_docker_container   $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME
+
+# Custom start actions for db and app different from shared-sites
+function start_docker_container_db() {
+  local IMAGE_NAME=$1
+  local CONTAINER_NAME=$2
+  local CONTAINER_DESC=$3
+  # HOST not applicable
+  local PORT=$4
+
+  local CONTAINER_ID=$(get_docker_container_id $CONTAINER_NAME)
+  if [ ! -z "$CONTAINER_ID" ]; then
+    builder_die "container $CONTAINER_ID has already been started"
+  fi
+
+  # Start the Docker container
+  if [ -z $(get_docker_image_id $IMAGE_NAME) ]; then
+    builder_die "ERROR: Docker container doesn't exist. Run \"./build.sh build\" first"
+  fi
+
+  # Setup database
+  builder_echo "Setting up DB container"
+  docker run --rm -d -p $PORT:1433 \
+    -e "ACCEPT_EULA=Y" \
+    -e "MSSQL_AGENT_ENABLED=true" \
+    -e "MSSQL_SA_PASSWORD=yourStrong(\!)Password" \
+    --name $CONTAINER_DESC \
+    $CONTAINER_NAME
+
+  builder_echo green "Listening on http://localhost:$PORT"  
+}
+
+function start_docker_container_app() {
+  local IMAGE_NAME=$1
+  local CONTAINER_NAME=$2
+  local CONTAINER_DESC=$3
+  local HOST=$4
+  local PORT=$5
+
+  _verify_vendor_is_not_folder
+
+  local CONTAINER_ID=$(get_docker_container_id $CONTAINER_NAME)
+  if [ ! -z "$CONTAINER_ID" ]; then
+    builder_die "$HOST container $CONTAINER_ID has already been started"
+  fi
+
+  # Start the Docker container
+  if [ -z $(get_docker_image_id $IMAGE_NAME) ]; then
+    builder_die "ERROR: Docker container doesn't exist. Run \"./build.sh build\" first"
+  fi
+
+  if [[ $OSTYPE =~ msys|cygwin ]]; then
+    # Windows needs leading slashes for path
+    SITE_HTML="//$(pwd):/var/www/html/"
+  else
+    SITE_HTML="$(pwd):/var/www/html/"
+  fi
+
+  ADD_HOST=
+  if [[ $OSTYPE =~ linux-gnu ]]; then
+    # Linux needs --add-host parameter
+    ADD_HOST="--add-host host.docker.internal:host-gateway"
+  fi
+  
+  db_ip=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${API_KEYMAN_DB_IMAGE_NAME})
+
+  builder_echo "Spooling up site container"
+
+  docker run --rm -d -p $PORT:80 -v ${SITE_HTML} \
+    -e 'api_keyman_com_mssql_pw=yourStrong(\!)Password' \
+    -e api_keyman_com_mssql_user=sa \
+    -e 'api_keyman_com_mssqlconninfo=sqlsrv:Server='$db_ip',1433;TrustServerCertificate=true;Encrypt=false;Database=' \
+    -e api_keyman_com_mssql_create_database=true \
+    -e api_keyman_com_mssqldb=keyboards \
+    --name $CONTAINER_DESC \
+    ${ADD_HOST} \
+    $CONTAINER_NAME
+
+  # Skip if link already exists
+  if [ ! -L vendor ]; then
+    # Create link to vendor/ folder
+    CONTAINER_ID=$(get_docker_container_id $CONTAINER_NAME)
+    if [ -z "$CONTAINER_ID" ]; then
+      builder_die "Docker container appears to have failed to start in order to create link to vendor/"
+    fi
+
+    docker exec -i $CONTAINER_ID sh -c "ln -s /var/www/vendor vendor && chown -R www-data:www-data vendor"
+  fi
+
+  # after starting container, we want to run an init script if it is present
+  if [ -f resources/init-container.sh ]; then
+    CONTAINER_ID=$(get_docker_container_id $CONTAINER_NAME)
+    if [ -z "$CONTAINER_ID" ]; then
+      builder_die "Docker container appears to have failed to start in order to run init-container.sh script"
+    fi
+
+    docker exec -i $CONTAINER_ID sh -c "./resources/init-container.sh"
+  fi
+
+  builder_echo green "Listening on http://$HOST:$PORT"
+}
+
+builder_run_action start:db   start_docker_container_db  $API_KEYMAN_DB_IMAGE_NAME $API_KEYMAN_DB_CONTAINER_NAME $API_KEYMAN_DB_CONTAINER_DESC $PORT_API_KEYMAN_COM_DB
+builder_run_action start:app  start_docker_container_app $API_KEYMAN_IMAGE_NAME $API_KEYMAN_CONTAINER_NAME $API_KEYMAN_CONTAINER_DESC $HOST_API_KEYMAN_COM $PORT_API_KEYMAN_COM
+
+builder_run_action test:app      test_docker_container
diff --git a/composer.json b/composer.json
index 6aa104b..0c39a76 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,11 @@
     "scripts": {
       "test": [
         "Composer\\Config::disableProcessTimeout",
-        "vendor\\bin\\phpunit --testdox"
+        "vendor/bin/phpunit --testdox"
       ],
       "build": [
         "Composer\\Config::disableProcessTimeout",
-        "php tools\\db\\build\\build_cli.php"
+        "php ./tools/db/build/build_cli.php"
       ],
       "lint": "find . -name '*.php' | grep -v '/vendor/' | xargs -n 1 php -l"
     }
diff --git a/mssql.Dockerfile b/mssql.Dockerfile
new file mode 100644
index 0000000..869fe2c
--- /dev/null
+++ b/mssql.Dockerfile
@@ -0,0 +1,16 @@
+# syntax=docker/dockerfile:1
+FROM mcr.microsoft.com/mssql/server:2022-latest@sha256:ffef32dda16cc5abd70db1d0654c01cbe9f7093d66e0c83ade20738156cb7d0e
+USER root
+
+RUN export DEBIAN_FRONTEND=noninteractive && \
+apt-get update --fix-missing && \
+apt-get install -y gnupg2 && \
+apt-get install -yq curl apt-transport-https && \
+curl https://packages.microsoft.com/keys/microsoft.asc | tac | tac | apt-key add - && \
+curl https://packages.microsoft.com/config/ubuntu/22.04/mssql-server-2022.list | tac | tac | tee /etc/apt/sources.list.d/mssql-server.list && \
+apt-get update
+
+RUN apt-get install -y mssql-server-fts
+
+# Run SQL Server process
+CMD /opt/mssql/bin/sqlservr
diff --git a/resources/init-container.sh b/resources/init-container.sh
new file mode 100755
index 0000000..5276105
--- /dev/null
+++ b/resources/init-container.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+echo "---- Sleep 15 Before Generating DB ----"
+sleep 15;
+
+# If we know we are immediately going to run tests, there's no need to build
+# the database and then rebuild it again as a test database!
+if [[ ! -f /var/www/html/tier.txt ]] || [[ $(</var/www/html/tier.txt) != TIER_TEST ]]; then
+  php /var/www/html/tools/db/build/build_cli.php
+fi
diff --git a/resources/keyman-site.conf b/resources/keyman-site.conf
new file mode 100644
index 0000000..9f1c976
--- /dev/null
+++ b/resources/keyman-site.conf
@@ -0,0 +1,13 @@
+<FilesMatch .md$>
+	SetHandler text/html
+</FilesMatch>
+
+DirectoryIndex index.md index.php index.html
+
+<Directory /var/www/html>                
+	Options +Includes +FollowSymLinks -MultiViews
+	AllowOverride All
+</Directory>
+
+php_value include_path "/var/www/html/_includes:."
+
diff --git a/schemas/.htaccess b/schemas/.htaccess
new file mode 100644
index 0000000..13a49ea
--- /dev/null
+++ b/schemas/.htaccess
@@ -0,0 +1,44 @@
+# Rewrite old schema endpoints: note, all future references should be to the
+# versioned schema files rather than to the base, so we will not add extra
+# redirects here for new schemas
+
+# keyboard_info.distribution.json (deprecated by keyboard_info.schema.json)
+RewriteRule "^keyboard_info\.distribution\.json$" "/schemas/keyboard_info.distribution/1.0.6/keyboard_info.distribution.json" [END]
+
+# keyboard_info.source.json (deprecated by keyboard_info.schema.json)
+RewriteRule "^keyboard_info\.source\.json$" "/schemas/keyboard_info.source/1.0.6/keyboard_info.source.json" [END]
+
+# keyboard_json.json
+RewriteRule "^keyboard_json\.json$" "/schemas/keyboard_json/1.0/keyboard_json.json" [END]
+
+# model_info.distribution.json"
+RewriteRule "^model_info\.distribution\.json$" "/schemas/model_info.distribution/1.0.1/model_info.distribution.json" [END]
+
+# model_info.source.json
+RewriteRule "^model_info\.source\.json$" "/schemas/model_info.source/1.0.1/model_info.source.json" [END]
+
+# model-search.json
+RewriteRule "^model-search\.json$" "/schemas/model-search/1.0.1/model-search.json" [END]
+
+# package.json (renamed to kmp.schema.json)
+
+# note: package.json has been renamed to kmp.schema.json to reduce confusion with
+# NPM's standard filename, and these redirects added to keep things clear
+RewriteRule "^package\.json$" "/schemas/package/1.1.0/kmp.schema.json" [END]
+
+RewriteRule "^package/1\.0/package\.json$"    "/schemas/kmp/1.0/kmp.schema.json" [END]
+RewriteRule "^package/1\.0\.1/package\.json$" "/schemas/kmp/1.0.1/kmp.schema.json" [END]
+RewriteRule "^package/1\.0\.2/package\.json$" "/schemas/kmp/1.0.2/kmp.schema.json" [END]
+RewriteRule "^package/1\.1\.0/package\.json$" "/schemas/kmp/1.1.0/kmp.schema.json" [END]
+
+# package-version.json
+RewriteRule "^package-version\.json$" "/schemas/package-version/1.0.1/package-version.json" [END]
+
+# search.json
+RewriteRule "^search\.json$" "/schemas/search/3.0/search.json" [END]
+
+# version.json
+RewriteRule "^version\.json$" "/schemas/version/2.0/version.json" [END]
+
+# windows-update.json
+RewriteRule "^windows-update\.json$" "/schemas/windows-update/17.0/windows-update.json" [END]
diff --git a/schemas/README.md b/schemas/README.md
index bff21b3..fa094df 100644
--- a/schemas/README.md
+++ b/schemas/README.md
@@ -1,199 +1,28 @@
-# keyboard_info
-
-* **keyboard_info.source.json**
-* **keyboard_info.distribution.json**
-
-Documentation at https://help.keyman.com/developer/cloud/keyboard_info
-
-New versions should be deployed to
-- **keymanapp/keyman/windows/src/global/inst/data/keyboard_info**
-- **keymanapp/keyboards/tools**
-- **keymanapp/keyboards-starter/tools**
-
-# .keyboard_info version history
-
-## 2018-11-26 1.0.5 stable
-* Add deprecated field - true if the keyboard is deprecated (generated at deployment time).
-
-## 2018-11-26 1.0.4 stable
-* Add helpLink field - a link to a keyboard's help page on help.keyman.com if it exists.
-
-## 2018-02-12 1.0.3 stable
-* Renamed minKeymanDesktopVersion to minKeymanVersion to clarify that this version information applies to all platforms.
-
-## 2018-02-10 1.0.2 stable
-* Add dictionary to platform support choices. Fixed default for platform to 'none'.
-
-## 2018-01-31 1.0.1 stable
-* Add file sizes, isRTL, sourcePath fields so we can supply these to the legacy KeymanWeb Cloud API endpoints.
-* Remove references to .kmx being a valid package format.
-
-## 2017-09-14 1.0 stable
-* Initial version
-
-------------------------------------------------------------
-
-# search
-
-* search.json
-
-Documentation at https://help.keyman.com/developer/cloud/search
-
-# search version history
-
-## 2019-12-13 1.0.2
-* Added deprecated field for keyboard_info
-
-## 2018-02-06 1.0.1
-* Added SearchCountry definition.
-
-## 2017-11-07 1.0 beta
-* Initial version
-
-------------------------------------------------------------
-
-# keyboard_json
-
-* keyboard_json.json
-
-Note: this format is deprecated as of Keyman 10.0.
-
-Documentation at https://help.keyman.com/developer/9.0/guides/distribute/mobile-apps
-
-# keyboard_json version history
-
-## 2017-11-23 1.0 beta
-* Initial version
-
-------------------------------------------------------------
-
-# package
-
-* package.json
-
-Documentation at https://help.keyman.com/developer/10.0/reference/file-types/metadata
-
-# package.json version history
-
-## 2019-01-31 1.1.0
-* Add lexicalModels properties (note: `version` is optional and currently unused)
-
-## 2018-02-13 1.0.2
-* Add rtl property for keyboard layouts
-
-## 2018-01-22 1.0.1
-* Remove id field as it is derived from the filename anyway
-
-## 2017-11-30 1.0 beta
-* Initial version
-
-------------------------------------------------------------
-
-# version
-
-* version.json
-
-Documentation at https://help.keyman.com/developer/cloud/version/2.0
-
-## version.json version history
-
-## 2021-09-30 2.0.2
-* Add 'all' semantics
-
-## 2019-10-23 2.0.1 alpha
-* Add linux platform
-
-## 2018-03-07 2.0 beta
-* Initial version
-
-------------------------------------------------------------
-
-# keymanweb-cloud-api
-
-* keymanweb-cloud-api-1.0.json
-* keymanweb-cloud-api-2.0.json
-* keymanweb-cloud-api-3.0.json
-* keymanweb-cloud-api-4.0.json
-
-Formal specification of legacy KeymanWeb cloud API endpoints at https://r.keymanweb.com/api/
-
-Documentation at https://help.keyman.com/developer/cloud/
-
-# keyman-web-cloud-api version history
-
-## 2018-01-31
-* Created schema files for existing json api endpoints
-
-------------------------------------------------------------
-
-# model_info
-
-* model_info.source.json
-* model_info.distribution.json
-
-Documentation at https://help.keyman.com/developer/cloud/model_info
-
-## 2019-01-31 1.0 beta
-* Initial version, seeded from .keyboard_info specification
-
-## 2020-09-21 1.0.1
-* Relaxed the URL definitions in the schema so extension is no longer tested
-
-------------------------------------------------------------
-
-# visualkeyboard
-
-* visualkeyboard.dtd
-
-XML Document Type Defintion for the .kvks file format. Previously, this was
-at http://tavultesoft.com/keymandev/visualkeyboard.dtd.
-
-## 2019-08-20
-* Moved to api.keyman.com (redirect on tavultesoft.com)
-
-------------------------------------------------------------
-
-# package-version
-
-* package-version.json
-
-Documentation at https://help.keyman.com/developer/cloud/package-version
-
-## 2020-04-30 1.0
-* Initial version 1.0 (alpha)
-
-## 2020-09-21 1.0.1
-
-* Fixed bugs with missing .kmp files
-* Added deprecation links
-* Updated .kmp URLs to use keyman.com/go/package format
-
-------------------------------------------------------------
-
-# windows-update
-
-* windows-update.json
-
-## 2020-07-23 1.0
-* Initial version 1.0 (alpha)
-
-## 2020-11-17 1.0.1
-* Relaxed `file` to `optional-file` to allow for responses without an update available.
-
-------------------------------------------------------------
-
-# developer-update
-
-* developer-update.json
-
-## 2020-11-17 1.0
-* Initial version 1.0 (alpha)
-
-------------------------------------------------------------
-
-# kps
-
-* kps.xsd
-
-## 2021-07-19 7.0
-* Initial version 7.0
+# Documentation for individual schemas
+
+* [developer-update](developer-update/README.md)
+* [displaymap](displaymap/README.md)
+* [keyboard_info](keyboard_info/README.md) (formerly named 'keyboard_info.distribution' and 'keyboard_info.source')
+* [keyboard_json](keyboard_json/README.md)
+* [keyman-touch-layout](keyman-touch-layout/README.md)
+* [keymanweb-cloud-api](keymanweb-cloud-api/README.md)
+* [kmp](kmp/README.md) (formerly named 'package')
+* [kpj](kpj/README.md)
+* [kpj-9.0](kpj-9.0/README.md)
+* [kps](kps/README.md)
+* [kvks](kvks/README.md) (replaces visualkeyboard)
+* [model_info.distribution](model_info.distribution/README.md)
+* [model_info.source](model_info.source/README.md)
+* [package-version](package-version/README.md)
+* [regtest](regtest/README.md)
+* [search](search/README.md)
+* [version](version/README.md)
+* [visualkeyboard](visualkeyboard/README.md)
+* [windows-update](windows-update/README.md)
+
+# Other schemas
+
+The following schemas are currently not documented:
+* increment-download
+* kvk (binary schema in Kaitai struct format)
+* model-search
diff --git a/schemas/developer-update/README.md b/schemas/developer-update/README.md
new file mode 100644
index 0000000..016aaf9
--- /dev/null
+++ b/schemas/developer-update/README.md
@@ -0,0 +1,6 @@
+# developer-update
+
+* developer-update.json
+
+## 2020-11-17 1.0
+* Initial version 1.0 (alpha)
diff --git a/schemas/displaymap/1.0/displaymap.schema.json b/schemas/displaymap/1.0/displaymap.schema.json
new file mode 100644
index 0000000..a5e6419
--- /dev/null
+++ b/schemas/displaymap/1.0/displaymap.schema.json
@@ -0,0 +1,36 @@
+{
+  "$ref": "#/definitions/displayMap",
+
+  "definitions": {
+    "displayMap": {
+      "type": "object",
+      "properties": {
+        "map": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/map"
+          }
+        }
+      }
+    },
+    "map": {
+      "type": "object",
+      "properties": {
+        "pua": { "type": "string" },
+        "str": { "type": "string" },
+        "unicode": { "type": "string" },
+        "usages": { "anyOf": [
+          { "type": "array", "items": { "$ref": "#/definitions/usage" } },
+          { "type": "array", "items": { "type": "string" } }
+        ] }
+      }
+    },
+    "usage": {
+      "type": "object",
+      "properties": {
+        "filename": { "type": "string" },
+        "count": { "type": "number" }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/displaymap/README.md b/schemas/displaymap/README.md
new file mode 100644
index 0000000..1958c30
--- /dev/null
+++ b/schemas/displaymap/README.md
@@ -0,0 +1,77 @@
+# displaymap.schema.json
+
+This mapping file provides data for remapping the touch layout and visual
+keyboard key caps. The primary purpose of this file is to provide a pathway for
+consistent display of diacritics and other unattached marks which may be
+displayed on the keyboard by use of a special font with formatted glyphs in the
+Private Use Area, which will have consistent display across all platforms and
+not rely on platform-specific or font-specific rendering behaviors.
+
+This file can be generated by `kmc analyze osk-char-use` command, or hand
+crafted. The compiler uses only the `str` and `pua` values in the file, although
+there may be additional data in the file provided for reference purposes. The
+file should have the following structure, in this example, mapping the Unicode
+values `U+17BB U+17C7` (ុះ) to the Private Use Area code `U+F19F`:
+
+```json
+{
+  "map": [
+    {
+      "pua": "F19F",
+      "str": "ុះ",
+      "unicode": "17BB 17C7",
+      "usages": [
+        "khmer_angkor.kvks",
+        "khmer_angkor.keyman-touch-layout"
+      ]
+    },
+    ...
+  ]
+}
+```
+
+The file can be passed without modification to the [ttkbdfont.py script][2]
+(unsupported) to generate a Kbd font. The font may need some manual editing as
+insertion of dotted circle (`U+25CC`) as a base may not always be possible
+automatically, and combined marks may not render as a cluster in some scenarios.
+The open source tool [FontForge][3] is suitable for making these kinds of minor
+adjustments to the generated font.
+
+## Standard conventions for use of displayMaps
+
+In the Keyman keyboards repository, the PUA range used should start at `U+F100`.
+
+`&displayMap` JSON files should be named `Kbd<script>.json` where `<script>` is
+a [4 letter script subtag][4], for example `KbdKhmr.json`, and the corresponding
+font is named `KbdKhmr.ttf` (with face name `KbdKhmr`). These fonts are intended
+only for use in visual keyboards and touch layouts and generally will not be
+suitable for any other use. An optional suffix to a font may be included, if
+appropriate, for example, `KbdArab-Nastaliq.ttf` (face name `KbdArab-Nastaliq`).
+
+## Fields in the `map` objects
+
+* `pua`: must be a single hex value, by convention in the PUA range starting at
+  `U+F100`. Do not include the `U+` prefix.
+* `str`: contains the codepoints that will be mapped to the PUA code;
+  if `U+25CC` (◌, dotted circle) is specified in the key cap, it will be
+  stripped before matching in the `&displayMap`, so `U+25CC` should not be
+  included in `str`.
+* `unicode`: must be the unicode codepoints contained in the `str` field, as
+  hexadecimal values, without initial `U+` prefix. Used only for reference when
+  reading the file.
+* `usages`: data provided by `kmc analyze osk-char use` on which files this
+  specific string is found in. This may be an array of strings, or optionally
+  may be an array of objects with `filename` and `count` fields.
+
+See [`&displaymap` system store][1] online documentation for more information on
+how this format is used.
+
+## 2023-06-17 1.0
+
+* Initial version 1.0, describes osk usage data file format generated by kmc
+  analyze osk-char-use. Schema is kept reasonably loose for future expansion.
+
+  [1]: https://help.keyman.com/developer/language/reference/displaymap
+  [2]: https://github.com/silnrsi/palaso-python/blob/master/scripts/font/ttkbdfont.py
+  [3]: https://fontforge.org
+  [4]: https://help.keyman.com/developer/current-version/reference/bcp-47#toc-the-script-subtag
diff --git a/schemas/keyboard_info/2.0/keyboard_info.schema.json b/schemas/keyboard_info/2.0/keyboard_info.schema.json
new file mode 100644
index 0000000..75d8e03
--- /dev/null
+++ b/schemas/keyboard_info/2.0/keyboard_info.schema.json
@@ -0,0 +1,105 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "$ref": "#/definitions/KeyboardInfo",
+
+  "definitions": {
+    "KeyboardInfo": {
+      "type": "object",
+      "properties": {
+        "id": { "type": "string" },
+        "name": { "type": "string" },
+        "authorName": { "type": "string" },
+        "authorEmail": { "type": "string", "format": "email" },
+        "description": { "type": "string" },
+        "license": { "type": "string", "enum": ["freeware", "shareware", "commercial", "mit", "other"] },
+        "languages": { "anyOf": [
+          { "type": "array", "items": { "type": "string" }, "uniqueItems": true },
+          { "$ref": "#/definitions/KeyboardLanguageInfo" }
+        ]},
+        "lastModifiedDate": { "type": "string", "format": "date-time" },
+        "packageFilename": { "type": "string", "pattern": "\\.km[xp]$" },
+        "packageFileSize": { "type": "number" },
+        "jsFilename": { "type": "string", "pattern": "\\.js$" },
+        "jsFileSize": { "type": "number" },
+        "isRTL": { "type": "boolean" },
+        "encodings": { "type": "array", "items": { "type": "string", "enum": ["ansi", "unicode"] } },
+        "packageIncludes": { "type": "array", "items": { "type": "string", "enum": ["welcome", "documentation", "fonts", "visualKeyboard"] } },
+        "version": { "type": "string" },
+        "minKeymanVersion": { "type": "string", "pattern": "^\\d+\\.\\d$" },
+        "helpLink": { "type": "string", "pattern": "^https://help\\.keyman\\.com/keyboard/" },
+        "platformSupport": { "$ref": "#/definitions/KeyboardPlatformInfo" },
+        "sourcePath": { "type": "string", "pattern": "^(release|legacy|experimental)/.+/.+$" },
+        "related": { "type": "object", "patternProperties": {
+          ".": { "$ref": "#/definitions/KeyboardRelatedInfo" }
+          },
+          "additionalProperties": false
+        },
+        "deprecated": { "type": "boolean" }
+      },
+      "required": [ "id", "name", "license", "languages", "lastModifiedDate", "platformSupport" ]
+    },
+
+    "KeyboardLanguageInfo": {
+      "type": "object",
+      "patternProperties": {
+        ".": { "$ref": "#/definitions/KeyboardLanguageInfoItem" }
+      },
+      "additionalProperties": false
+    },
+
+    "KeyboardLanguageInfoItem": {
+      "type": "object",
+      "properties": {
+        "font": { "$ref": "#/definitions/KeyboardFontInfo" },
+        "oskFont": { "$ref": "#/definitions/KeyboardFontInfo" },
+        "examples": { "type": "array", "items": { "$ref": "#/definitions/KeyboardExampleInfo" } },
+        "displayName": { "type": "string" },
+        "languageName": { "type": "string" },
+        "scriptName": { "type": "string" },
+        "regionName": { "type": "string" }
+      },
+      "required": [],
+      "additionalProperties": false
+    },
+
+    "KeyboardFontInfo": {
+      "type": "object",
+      "properties": {
+        "family": { "type": "string" },
+        "source": { "type": "array", "items": { "type": "string" } }
+      },
+      "required": ["family", "source"],
+      "additionalProperties": false
+    },
+
+    "KeyboardExampleInfo": {
+      "type": "object",
+      "properties": {
+        "keys": { "type": "string" },
+        "text": { "type": "string" },
+        "note": { "type": "string" }
+      },
+      "required": ["keys", "text"],
+      "additionalProperties": false
+    },
+
+    "KeyboardPlatformInfo": {
+      "type": "object",
+      "patternProperties": {
+        "^(windows|macos|desktopWeb|ios|android|mobileWeb|linux)$": { "type": "string", "enum": ["dictionary", "full", "basic", "none"] }
+      },
+      "required": [],
+      "additionalProperties": false
+    },
+
+    "KeyboardRelatedInfo": {
+      "type": "object",
+      "properties": {
+        "deprecates": { "type": "boolean" },
+        "deprecatedBy": { "type": "boolean" }
+      },
+      "required": [],
+      "additionalProperties": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/keyboard_info/README.md b/schemas/keyboard_info/README.md
new file mode 100644
index 0000000..1cea8a8
--- /dev/null
+++ b/schemas/keyboard_info/README.md
@@ -0,0 +1,47 @@
+# keyboard_info
+
+* **keyboard_info.schema.json**
+
+Documentation at https://help.keyman.com/developer/cloud/keyboard_info
+
+New versions should be deployed to
+- **keymanapp/keyman:common/schemas/keyboard_info**
+
+# .keyboard_info version history
+
+## 2023-10-12 2.0 stable
+* Removed:
+  - `.documentationFilename`
+  - `.documentationFileSize`
+  - `.legacyId`
+  - `.links`
+  - `.related[].note`
+  - `.languages[].example`
+* Added:
+  - `.languages[].examples[]`
+* Modified:
+  - `.languages[].font`, `.languages[].oskFont`: `.source` is `[string]`
+  - Source .keyboard_info files are no longer needed, so source vs distribution
+    keyboard_info distinction is removed
+
+## 2019-09-06 1.0.6 stable
+* No changes (see api.keyman.com#36 and api.keyman.com#59. Reverted in 2020-06-10.).
+
+## 2018-11-26 1.0.5 stable
+* Add deprecated field - true if the keyboard is deprecated (generated at deployment time).
+
+## 2018-11-26 1.0.4 stable
+* Add helpLink field - a link to a keyboard's help page on help.keyman.com if it exists.
+
+## 2018-02-12 1.0.3 stable
+* Renamed minKeymanDesktopVersion to minKeymanVersion to clarify that this version information applies to all platforms.
+
+## 2018-02-10 1.0.2 stable
+* Add dictionary to platform support choices. Fixed default for platform to 'none'.
+
+## 2018-01-31 1.0.1 stable
+* Add file sizes, isRTL, sourcePath fields so we can supply these to the legacy KeymanWeb Cloud API endpoints.
+* Remove references to .kmx being a valid package format.
+
+## 2017-09-14 1.0 stable
+* Initial version
diff --git a/schemas/keyboard_json/README.md b/schemas/keyboard_json/README.md
new file mode 100644
index 0000000..c791935
--- /dev/null
+++ b/schemas/keyboard_json/README.md
@@ -0,0 +1,12 @@
+# keyboard_json
+
+* keyboard_json.json
+
+Note: this format is deprecated as of Keyman 10.0.
+
+Documentation at https://help.keyman.com/developer/9.0/guides/distribute/mobile-apps
+
+# keyboard_json version history
+
+## 2017-11-23 1.0 beta
+* Initial version
diff --git a/schemas/keyman-touch-layout/2.1/keyman-touch-layout.clean.spec.json b/schemas/keyman-touch-layout/2.1/keyman-touch-layout.clean.spec.json
new file mode 100644
index 0000000..8bdbf7f
--- /dev/null
+++ b/schemas/keyman-touch-layout/2.1/keyman-touch-layout.clean.spec.json
@@ -0,0 +1,170 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "$ref": "#/definitions/touch-layout",
+  "$comment": "Version: 16.0",
+  "description": "A Keyman Touch Layout file, per version 16.0, clean spec, no legacy data or types",
+
+  "definitions": {
+    "touch-layout": {
+      "type": "object",
+      "properties": {
+        "tablet": { "$ref": "#/definitions/platform" },
+        "phone": { "$ref": "#/definitions/platform" },
+        "desktop": { "$ref": "#/definitions/platform" }
+      },
+      "minProperties": 1,
+      "additionalProperties": false
+    },
+
+    "platform": {
+      "type": "object",
+      "properties": {
+        "font": { "$ref": "#/definitions/font-spec" },
+        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
+        "layer": { "$ref": "#/definitions/layers" },
+        "displayUnderlying": { "type": "boolean" },
+        "defaultHint": { "type": "string", "enum": ["none","dot","longpress","multitap","flick","flick-n","flick-ne","flick-e","flick-se","flick-s","flick-sw","flick-w","flick-nw"] }
+      },
+      "required": ["layer"],
+      "additionalProperties": false
+    },
+
+    "layers": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/layer" },
+      "minItems": 1
+    },
+
+    "layer": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/layer-id" },
+        "row": { "$ref": "#/definitions/rows" }
+      },
+      "required": ["id", "row"],
+      "additionalProperties": false
+    },
+
+    "layer-id": {
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_-]+$"
+    },
+
+    "rows": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/row" },
+      "minItems": 1
+    },
+
+    "row": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/row-id" },
+        "key": { "$ref": "#/definitions/keys" }
+      },
+      "required": ["id", "key"],
+      "additionalProperties": false
+    },
+
+    "row-id": {
+      "type": "integer",
+      "minimum": 0,
+      "maximum": 100
+    },
+
+    "keys": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/key" },
+      "minItems": 1
+    },
+
+    "key": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/key-id" },
+        "text": { "type": "string" },
+        "layer": { "$ref": "#/definitions/layer-id" },
+        "nextlayer": { "$ref": "#/definitions/layer-id" },
+        "font": { "$ref": "#/definitions/font-spec" },
+        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
+        "sp": { "$ref": "#/definitions/key-sp" },
+        "pad": { "$ref" : "#/definitions/key-pad" },
+        "width": { "$ref" : "#/definitions/key-width" },
+        "sk": { "$ref": "#/definitions/subkeys" },
+        "flick": { "$ref": "#/definitions/flick" },
+        "multitap": { "$ref": "#/definitions/subkeys" },
+        "hint": { "type": "string" }
+      },
+      "anyOf": [
+        {"required": ["id"]},
+        {"required": ["sp"]},
+        {"required": ["sk"]},
+        {"required": ["flick"]},
+        {"required": ["multitap"]}
+      ],
+      "additionalProperties": false
+    },
+
+    "key-id": {
+      "type": "string",
+      "pattern": "^[TKUtku]_[a-zA-Z0-9_]+$"
+    },
+
+    "key-sp": {
+      "type": "integer",
+      "enum": [0, 1, 2, 8, 9, 10]
+    },
+
+    "key-pad": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 100000
+    },
+
+    "key-width": {
+      "type": "number",
+      "minimum": 0,
+      "maximum": 100000
+    },
+
+    "subkeys": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/subkey" },
+      "minItems": 1
+    },
+
+    "subkey": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/key-id" },
+        "text": { "type": "string" },
+        "layer": { "$ref": "#/definitions/layer-id" },
+        "nextlayer": { "$ref": "#/definitions/layer-id" },
+        "font": { "$ref": "#/definitions/font-spec" },
+        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
+        "sp": { "$ref": "#/definitions/key-sp" },
+        "pad": { "$ref" : "#/definitions/key-pad" },
+        "width": { "$ref" : "#/definitions/key-width" }
+      },
+      "required": ["id"],
+      "additionalProperties": false
+    },
+
+    "flick": {
+      "type": "object",
+      "patternProperties": {
+        "^(n|s|e|w|ne|nw|se|sw)$": { "$ref": "#/definitions/subkey" }
+      },
+      "minProperties": 1,
+      "additionalProperties": false
+    },
+
+    "font-spec": {
+      "type": "string"
+    },
+
+    "fontsize-spec": {
+      "type": "string"
+    }
+  }
+}
diff --git a/schemas/keyman-touch-layout/2.1/keyman-touch-layout.spec.json b/schemas/keyman-touch-layout/2.1/keyman-touch-layout.spec.json
new file mode 100644
index 0000000..72fc16b
--- /dev/null
+++ b/schemas/keyman-touch-layout/2.1/keyman-touch-layout.spec.json
@@ -0,0 +1,157 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "$ref": "#/definitions/touch-layout",
+  "$comment": "Version: 16.0",
+  "description": "A Keyman Touch Layout file, per version 16.0, loose specification that allows for legacy such as numbers as strings",
+
+  "definitions": {
+    "touch-layout": {
+      "type": "object",
+      "properties": {
+        "tablet": { "$ref": "#/definitions/platform" },
+        "phone": { "$ref": "#/definitions/platform" },
+        "desktop": { "$ref": "#/definitions/platform" }
+      }
+    },
+
+    "platform": {
+      "type": "object",
+      "properties": {
+        "font": { "$ref": "#/definitions/font-spec" },
+        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
+        "layer": { "$ref": "#/definitions/layers" },
+        "displayUnderlying": { "type": "boolean" },
+        "defaultHint": { "type": "string", "enum": ["none","dot","longpress","multitap","flick","flick-n","flick-ne","flick-e","flick-se","flick-s","flick-sw","flick-w","flick-nw"] }
+      },
+      "required": ["layer"],
+      "additionalProperties": false
+    },
+
+    "layers": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/layer" }
+    },
+
+    "layer": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/layer-id" },
+        "row": { "$ref": "#/definitions/rows" }
+      },
+      "required": ["id", "row"],
+      "additionalProperties": false
+    },
+
+    "layer-id": {
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9_-]+$"
+    },
+
+    "rows": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/row" }
+    },
+
+    "row": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/row-id" },
+        "key": { "$ref": "#/definitions/keys" }
+      },
+      "required": ["id", "key"],
+      "additionalProperties": false
+    },
+
+    "row-id": {
+      "oneOf": [
+        {
+          "type": "integer",
+          "minimum": 0,
+          "maximum": 100
+        },
+        {
+          "type": "string",
+          "pattern": "^[0-9]+$"
+        }
+      ]
+    },
+
+    "keys": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/key" }
+    },
+
+    "key": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/key-id" },
+        "text": { "type": "string" },
+        "layer": { "$ref": "#/definitions/layer-id" },
+        "nextlayer": { "$ref": "#/definitions/layer-id" },
+        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
+        "font": { "$ref": "#/definitions/font-spec" },
+        "dk": { "type": "string" },
+        "sp": { "$ref" : "#/definitions/numeric" },
+        "pad": { "$ref" : "#/definitions/numeric" },
+        "width": { "$ref" : "#/definitions/numeric" },
+        "sk": { "$ref": "#/definitions/subkeys" },
+        "flick": { "$ref": "#/definitions/flick" },
+        "multitap": { "$ref": "#/definitions/subkeys" },
+        "hint": { "type": "string" }
+      },
+      "additionalProperties": false
+    },
+
+    "numeric": {
+      "oneOf": [
+        { "type": "string", "pattern": "^[0-9]+(\\.?[0-9]*)$|^$" },
+        { "type": "number" }
+      ]
+    },
+
+    "key-id": {
+      "type": "string",
+      "pattern": "^[TKUtku]_[a-zA-Z0-9_]+$|^$"
+    },
+
+    "subkeys": {
+      "type": "array",
+      "items": { "$ref": "#/definitions/subkey" }
+    },
+
+    "subkey": {
+      "type": "object",
+      "properties": {
+        "id": { "$ref": "#/definitions/key-id" },
+        "text": { "type": "string" },
+        "layer": { "$ref": "#/definitions/layer-id" },
+        "nextlayer": { "$ref": "#/definitions/layer-id" },
+        "sp": { "$ref" : "#/definitions/numeric" },
+        "pad": { "$ref" : "#/definitions/numeric" },
+        "width": { "$ref" : "#/definitions/numeric" },
+        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
+        "font": { "$ref": "#/definitions/font-spec" },
+        "dk": { "type": "string" },
+        "default": { "type": "boolean" }
+      },
+      "required": ["id"],
+      "additionalProperties": false
+    },
+
+    "flick": {
+      "type": "object",
+      "patternProperties": {
+        "^(n|s|e|w|ne|nw|se|sw)$": { "$ref": "#/definitions/subkey" }
+      },
+      "additionalProperties": false
+    },
+
+    "font-spec": {
+      "type": "string"
+    },
+
+    "fontsize-spec": {
+      "type": "string"
+    }
+  }
+}
diff --git a/schemas/keyman-touch-layout/README.md b/schemas/keyman-touch-layout/README.md
new file mode 100644
index 0000000..8e1348f
--- /dev/null
+++ b/schemas/keyman-touch-layout/README.md
@@ -0,0 +1,472 @@
+# keyman-touch-layout
+
+Documentation at https://help.keyman.com/developer/...TODO...
+
+* Primary version:
+  * https://github.com/keymanapp/keyman/tree/master/common/schemas/keyman-touch-layout
+* Deployed to:
+  * N/A
+
+# .keyman-touch-layout File Format
+
+The source format for a .keyman-touch-layout is JSON, encoded in UTF-8 without a BOM.
+
+A .keyman-touch-layout file must contain a single top-level object, the [`root` object](#root-object).
+
+The general structure of a .keyman-touch-layout file is:
+
+```
+{
+  "platform": {
+    // platform properties
+    "layer": [ {
+      // multiple layers in each platform
+      // layer properties here
+      "row": [ {
+        // multiple rows in a layer
+        // row properties here
+        "key": [ {
+          // multiple keys in a row
+          // key properties here
+          "sk": [ {
+            // optional multiple longpress keys under a key;
+            // longpress properties here
+           }, ...]
+        }, ... ]
+      }, ... ]
+    }, ... ]
+  }, ...
+}
+```
+
+## `root` object
+
+The `root` object may contain up to three properties, each being a [`platform`
+object](#platform-object), named `"phone"`, `"tablet"` or `"desktop"`. There
+must be at least one property.
+
+## `platform` object
+
+The `platform` object describes the keyboard arrangement for a given platform.
+Currently, this format supports three generic 'platforms':, `"phone"`,
+`"tablet"` and `"desktop"`. The `"phone"` and `"tablet"` platforms are
+heuristically selected based on the dimensions of the screen.
+
+The `"desktop"` platform is not currently used by Keyman Engine for Web but may
+be used in future releases, for example if we start to support touch screens on
+Windows. This does not need to match a hardware layout -- it is still a
+touchscreen layout description, not an on screen virtual keyboard.
+
+**Future enhancement:** We may wish to allow for more specific layout
+constraints, for example, specific device widths. To support these, we may add
+extra properties to the `root` object, such as `"touch-8cm"` which would match
+any touch device up to 8cm wide (unless there was another, smaller breakpoint
+platform width in the same file). This would also allow keyboard designers to
+specify separate landscape and portrait layouts.
+
+The `platform` object must contain one `layer` property, and may
+optionally contain three additional properties: `font`, `fontsize`, and
+`displayUnderlying`.
+
+* `layer`
+: A non-empty array of [`layer` objects](#layer-object). Required.
+
+* `font`
+: An optional CSS-style font-family specification, being the name of the font to
+  display on the key caps. If omitted, uses the system default UI font.
+
+* `fontsize`
+: An optional font scaling, specified in `em`s, such as `'1em'`. Default
+  `'1em'`.
+
+* `displayUnderlying`
+
+: A boolean value, if `true`, then the base layout's key cap will be displayed
+  in the top left of the key cap. Defaults to `false`.
+
+* `defaultHint`
+
+: A string value. Default is `"dot"`.  Controls the display of the hint text on
+  the key cap, which is shown at the top right of the key cap.
+
+  * `"none"`: show no hint on the key cap.
+  * `"dot"`: show a dot on top-right of key cap if a longpress menu is
+    available, default. Matches behavior for Keyman 15.0 and earlier.
+  * `"longpress"`: show the default longpress key cap, if it exists.
+  * `"multitap"`: show the first multitap key cap, if it exists.
+  * `"flick"`: show the first flick key cap, selected in clockwise order,
+    starting from North.
+  * `"flick-n"`: show the key cap from the North flick, if it exists.
+  * `"flick-ne"`: show the key cap from the North-East flick, if it exists.
+  * `"flick-e"`: show the key cap from the East flick, if it exists.
+  * `"flick-se"`: show the key cap from the South-East flick, if it exists.
+  * `"flick-s"`: show the key cap from the South flick, if it exists.
+  * `"flick-sw"`: show the key cap from the South-West flick, if it exists.
+  * `"flick-w"`: show the key cap from the West flick, if it exists.
+  * `"flick-nw"`: show the key cap from the North-West flick, if it exists.
+
+  Introduced in Keyman 16.0.
+
+## `layer` object
+
+The `layer` object describes one visible layer on a touch keyboard. It has two
+required properties: `id` and `row`.
+
+The `id` for a layer object may correspond to a hardware modifier key. These
+affect the modifiers in any key events generated by keys on the layer.
+
+* `id`
+
+: the string identifier of the layer. Required. There are a number of reserved
+  identifiers. The following identifiers are recommended for use:
+
+   id          | Modifier        | Notes
+  -------------|-----------------|----------------
+  `"default"`  | -               |
+  `"shift"`    | Shift           |
+  `"numeric"`  | -               |
+  `"symbol'"`  | -               |
+  `"currency"` | -               |
+  `"caps"`     | Caps Lock       | Accessed by double-tapping Shift key, 15.0+
+
+  These additional identifiers are also reserved but used mostly for
+  compatibility with desktop:
+
+   id                          | Modifier
+  -----------------------------|-----------------
+  `"ctrl"`                     | either Ctrl
+  `"alt"`                      | either Alt
+  `"shift-ctrl"`               | Shift + Ctrl
+  `"shift-alt"`                | Shift + Alt
+  `"ctrl-alt"`                 | Ctrl + Alt
+  `"shift-ctrl-alt"`           | Shift + Ctrl + Alt
+  `"leftctrl"`                 | Left Ctrl
+  `"rightctrl"`                | Right Ctrl
+  `"leftalt"`                  | Left Alt
+  `"leftctrl-leftalt"`         | Left Ctrl + Left Alt
+  `"rightalt"`                 | Right Alt
+  `"rightctrl-rightalt"`       | Right Ctrl + Right Alt
+  `"leftctrl-shift"`           | Shift + Left Ctrl
+  `"rightctrl-shift"`          | Shift + Right Ctrl
+  `"leftalt-shift"`            | Shift + Left Alt
+  `"rightalt-shift"`           | Shift + Right Alt
+  `"leftctrl-leftalt-shift"`   | Shift + Left Ctrl + Left Alt
+  `"rightctrl-rightalt-shift"` | Shift + Right Ctrl + Right Alt
+
+  These legacy identifiers are reserved but deprecated:
+
+   id              | Modifier
+  -----------------|--------------------
+  `"ctrlalt"`      | Ctrl + Alt
+  `"ctrlshift"`    | Ctrl + Shift
+  `"altshift"`     | Alt + Shift
+  `"ctrlaltshift"` | Ctrl + Alt + Shift
+
+* `row`
+
+: A non-empty array of [`row` objects](#row-object). Required.
+
+## `row` object
+
+Describes a single row of keys on a touch layout layer. It has two required
+properties: `id` and `key`.
+
+* `id`
+
+: An non-negative integer denoting where the row appears, with `0` being the top
+  row. Required.
+
+  Legacy: this value was sometimes an integer in a string. This string format is
+  deprecated and will not be supported in future versions of Keyman Developer.
+
+* `key`
+
+: A non-empty array of [`key` objects](#key-object). Required.
+
+## `key` object
+
+Describes a single key on a touch layout row. See also [`sk`
+object](#sk-object). A `key` object must include either an `id` or `sp` property.
+
+* `id`
+
+: A string identifier for the key. Must conform to the Keyman virtual key
+  format. This must be one of the following:
+
+  `K_xxxx` codes
+  :   These are used for a standard Keyman Desktop key name, e.g. `K_W`,
+      `K_ENTER`. You cannot make up your own `K_xxxx` names. Many of the
+      `K_` ids have overloaded output behaviour, for instance, if no rule
+      is matched for `K_W`, Keyman will output `w` when the key is pressed
+      or touched. The standard key names are in the
+      [Keyman Developer Language Reference](https://help.keyman.com/developer/language/guide/virtual-keys#common-virtual-key-codes).
+      Typically, you would use only the "common" virtual key codes.
+
+  `T_xxxx` codes
+  :   These are used for any user defined names, e.g. `T_SCHWA`. If you
+      wanted to use it, `T_ENTER` would also be valid. If no rule matches
+      it, the key will have no output behaviour.
+
+  `U_####[_....]` codes
+  :   These are used as a shortcut for a key that will output a string of Unicode
+      values, if no rule matches the key. (In Keyman 14 and earlier, only a single
+      Unicode value was permitted.) This is similar to the overloaded behaviour
+      for `K_` ids. Thus `####` must be valid Unicode codepoint values, in the
+      range `0020-10FFFF`, with sequences separated by `_`. E.g. `U_0259` would
+      generate a schwa if no rule matches. It is still valid to have a rule such
+      as `+ [U_0259] > ...`. These codes are only valid for touch layouts.
+      **Note**: For characters outside the BMP, use Unicode codepoints, not
+      surrogate pairs (e.g. use `U_10000`, never `U_D800_DC00`).
+
+  A key without an identifier can never generate any output. This may be the case
+  for spacers or blank keys.
+
+* `text`
+
+: String. The string displayed on the key cap.
+
+* `hint`
+
+: String. If present, a small hint, often shown at top right of key cap.
+
+  Introduced in Keyman 16.0.
+
+
+* `layer`
+
+: String. If specified, overrides the modifier associated with the layer (this
+  property would be better named `modifierOverride`). It must match one of the
+  reserved modifier-type layer identifiers listed above.
+
+* `nextlayer`
+
+: String. If present, when this key is tapped, switches to the specified layer
+  after the key event is processed. This is commonly used for layer switch keys
+  but may also be used for any key. See also
+  [&layer](https://help.keyman.com/developer/language/reference/layer).
+
+* `fontsize`
+
+: String. Applies an override to the font size for the key. Note that Keyman
+  will automatically scale the text to fit on the key. If present, this should
+  be specified in `em` units.
+
+* `font`
+
+: String. Applies an override to the specified font family for the key. Note
+  that as of version 15.0, this is not consistently supported, as it is not
+  possible to specify more than one font to be deployed and loaded with a given
+  on screen touch keyboard.
+
+* `dk`
+
+: String. If present, with the value `"1"`, specifies that the key is a deadkey.
+
+  Deprecated. Use `"sp": 8` instead. Will be removed in a future version of
+  Keyman Developer.
+
+* `sp`
+
+: Integer. Defines special key types. The following values are supported:
+
+  `0` (default)
+  : A normal key
+
+  `1`
+  : A modifier key or a "frame" key
+
+  `2`
+  : A modifier key which is marked as selected (usually with a different
+    background color, such as a Shift key on the shift layer).
+
+  `8`
+  : A deadkey. Does not change the behavior of the key, but highlights the key
+    in a slightly different style.  This is mostly used with desktop keyboards
+    which have deadkeys translated to touch.
+
+  `9`
+  : A blank key. Indicates that the key has no key cap.
+
+  `10`
+  : A spacer. Does not draw a key cap but leaves a space equal to the width of
+    the key.
+
+  Legacy: this value was sometimes an integer in a string. This string format is
+  deprecated and will not be supported in future versions of Keyman Developer.
+
+* `pad`
+
+: Number. Defines the width of a gap to the left of the key, often used for
+  example on the left hand side of the keyboard. Defaults to `5`. The same
+  layout behavior may be achieved by using 'spacer' keys. The value is a
+  percentage of the standard key width.
+
+* `width`
+
+: Number. Defines the width of the key, default of `100`, as a percentage of the
+  standard key width. The standard key width is calculated by scaling the widest
+  row on the layer to the width of the keyboard area, and the resulting standard
+  key width applies to all keys on the layer.
+
+  Legacy: this value was sometimes an number in a string. This string format is
+  deprecated and will not be supported in future versions of Keyman Developer.
+
+* `sk`
+
+: If present, defines an array of keys presented when longpressing on the key,
+  an array of [`sk` objects](#sk-object). Longpress should not generally be used
+  on Spacebar and it is recommend to avoid using them on modifier keys and other
+  special keys.
+
+* `flick`
+
+: If present, defines additional keys that may be selected when using a
+  flick gesture on the key, with a [`flick` object](#flick-object). Flicks
+  should not be used on modifier keys, special keys, or the Spacebar.
+
+  Introduced in Keyman 16.0.
+
+* `multitap`
+
+: If present, defines an array of keys that may be selected sequentially when
+  tapping multiple times on the key, an array of [`sk` objects](#sk-object).
+  Multitaps may not be used on layer switch keys, special keys such as the globe key, or the
+  Spacebar. Beware of mixing multitaps with layer switching, as this can lead to
+  a confusing user experience.
+
+  Keyman 15+: the Shift key has a predefined multitap sequence to access the
+  `caps` layer, which is available if the `caps` layer is present. This is the
+  only multitap sequence supported in Keyman 15. This multitap sequence cannot
+  be overridden, and is the sole case where multitap input may cause a layer switch.
+
+  Introduced in Keyman 16.0.
+
+## `sk` object
+
+The `sk` object defines a key on a longpress menu. It has a subset of the
+properties on the `key` object. All properties on the `key` object are
+available, except for `sk`, `flick`, and `multitap`. However, the following
+properties are not fully supported as of Keyman 15: `font`, `fontsize`, `pad`,
+and `width`.
+
+* `id`
+
+: String. Required. An identifier for the longpress key. See `key` object for
+  details.
+
+* `text`
+
+: String. The string displayed on the longpress key cap.
+
+* `layer`
+
+: String. If specified, overrides the modifier associated with the layer (this
+  property would be better named `modifierOverride`). It must match one of the
+  reserved modifier-type layer identifiers listed above.
+
+* `nextlayer`
+
+: String. If present, when this longpress key is tapped, switches to the
+  specified layer after the key event is processed. This is commonly used for
+  layer switch keys but may also be used for any longpress key. See also
+  [&layer](https://help.keyman.com/developer/language/reference/layer).
+
+* `fontsize`
+
+: String. Not currently supported for longpress keys. See `key` object for
+  details.
+
+* `font`
+
+: String. Not currently supported for longpress keys. See `key` object for
+  details.
+
+* `dk`
+
+: String. See `key` object for details.
+
+* `sp`
+
+: Integer. Defines special key types. See `key` object for details.
+
+* `pad`
+
+: Number. Defines the width of a gap to the left of the key. Not currently
+  supported for longpress keys. See `key` object for details.
+
+* `width`
+
+: Number. Defines the width of the key. Not currently supported for longpress
+  keys. See `key` object for details.
+
+* `default`
+
+: Boolean. Defaults to `false`. If true, this will be the default key when the
+  user longpresses the base key without moving their finger. Only one subkey
+  should be default; if multiple subkeys have the default field set, then
+  behaviour is undefined.  Given that cancel is not the preferred default
+  action for a longpress, the user can cancel the longpress default by 
+  sliding outside the 'acceptance' area -- e.g. south of the key cap, 
+  which would then unhighlight the default and indicate visually that 
+  no output would occur when they release their finger.
+
+## `flick` object
+
+A object with a set of properties that define flick keys for given directions.
+There may be up to eight properties, with the following reserved names. It is
+not recommended to use more than 4 directions on one key, as it can be difficult
+to select the correct flick if there are too many options.
+
+The following properties may be used, corresponding with a given direction from
+the center of the key. Each property must reference an [`sk` object](#sk-object):
+
+Property Name | Direction
+--------------|-----------
+`n`           | North
+`s`           | South
+`e`           | East
+`w`           | West
+`ne`          | North-East
+`nw`          | North-West
+`se`          | South-East
+`sw`          | South-West
+
+The flick direction starts at the center of the key, and continues in the direction
+shown in this diagram:
+
+```text
+nw       n       ne
+  \      |      /
+     ---------
+    |         |
+    |         |
+w - |         | - e
+    |         |
+    |         |
+     ---------
+  /      |      \
+sw       s       se
+```
+
+# Compiling .keyman-touch-layout files
+
+As of Keyman 15.0, the compiler embeds the .keyman-touch-layout file, into the
+output .js file, and transforms any legacy formats (such as "number in a
+string") into the appropriate spec format.
+
+# .keyman-touch-layout version history
+
+## 2023-08-08 2.1 stable
+* Add support for default on longpress (sk) keys. Aligns with Keyman 17.0.
+
+## 2022-06-30 2.0 stable
+* Add support for flick, multitap, hint, defaultHint. Aligns with Keyman 16.0.
+
+## 2022-06-27 1.0 stable
+* Initial schema version and full documentation
+
+## 2018-05-28 0.2 .keyman-touch-layout format
+* Changed file extension to .keyman-touch-layout in https://github.com/keymanapp/keyman/pull/897
+
+## 0.1 -layout.js format
+* Initial version
diff --git a/schemas/keymanweb-cloud-api/README.md b/schemas/keymanweb-cloud-api/README.md
new file mode 100644
index 0000000..425dbf2
--- /dev/null
+++ b/schemas/keymanweb-cloud-api/README.md
@@ -0,0 +1,15 @@
+# keymanweb-cloud-api
+
+* keymanweb-cloud-api-1.0.json
+* keymanweb-cloud-api-2.0.json
+* keymanweb-cloud-api-3.0.json
+* keymanweb-cloud-api-4.0.json
+
+Formal specification of legacy KeymanWeb cloud API endpoints at https://r.keymanweb.com/api/
+
+Documentation at https://help.keyman.com/developer/cloud/
+
+# keyman-web-cloud-api version history
+
+## 2018-01-31
+* Created schema files for existing json api endpoints
diff --git a/schemas/package/1.0.1/package.json b/schemas/kmp/1.0.1/kmp.schema.json
similarity index 100%
rename from schemas/package/1.0.1/package.json
rename to schemas/kmp/1.0.1/kmp.schema.json
diff --git a/schemas/package/1.0.2/package.json b/schemas/kmp/1.0.2/kmp.schema.json
similarity index 100%
rename from schemas/package/1.0.2/package.json
rename to schemas/kmp/1.0.2/kmp.schema.json
diff --git a/schemas/package/1.0/package.json b/schemas/kmp/1.0/kmp.schema.json
similarity index 100%
rename from schemas/package/1.0/package.json
rename to schemas/kmp/1.0/kmp.schema.json
diff --git a/schemas/package/1.1.0/package.json b/schemas/kmp/1.1.0/kmp.schema.json
similarity index 100%
rename from schemas/package/1.1.0/package.json
rename to schemas/kmp/1.1.0/kmp.schema.json
diff --git a/schemas/kmp/2.0/kmp.schema.json b/schemas/kmp/2.0/kmp.schema.json
new file mode 100644
index 0000000..a28aa43
--- /dev/null
+++ b/schemas/kmp/2.0/kmp.schema.json
@@ -0,0 +1,353 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "$ref": "#/definitions/package",
+  "definitions": {
+    "package": {
+      "type": "object",
+      "properties": {
+        "system": {
+          "$ref": "#/definitions/system"
+        },
+        "options": {
+          "$ref": "#/definitions/options"
+        },
+        "startMenu": {
+          "$ref": "#/definitions/startMenu"
+        },
+        "strings": {
+          "$ref": "#/definitions/strings"
+        },
+        "files": {
+          "$ref": "#/definitions/files"
+        },
+        "keyboards": {
+          "$ref": "#/definitions/keyboards"
+        },
+        "lexicalModels": {
+          "$ref": "#/definitions/lexicalModels"
+        },
+        "info": {
+          "$ref": "#/definitions/info"
+        },
+        "relatedPackages": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/relatedPackage"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "options",
+        "system"
+      ]
+    },
+    "system": {
+      "type": "object",
+      "properties": {
+        "keymanDeveloperVersion": {
+          "type": "string"
+        },
+        "fileVersion": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "fileVersion"
+      ]
+    },
+    "options": {
+      "type": "object",
+      "properties": {
+        "readmeFile": {
+          "type": "string"
+        },
+        "graphicFile": {
+          "type": "string"
+        },
+        "licenseFile": {
+          "type": "string"
+        },
+        "welcomeFile": {
+          "type": "string"
+        },
+        "executeProgram": {
+          "type": "string"
+        },
+        "msiFilename": {
+          "type": "string"
+        },
+        "msiOptions": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "startMenu": {
+      "type": "object",
+      "properties": {
+        "folder": {
+          "type": "string"
+        },
+        "addUninstallEntry": {
+          "type": "boolean"
+        },
+        "items": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/startMenuItem"
+          }
+        }
+      },
+      "additionalProperties": false
+    },
+    "startMenuItem": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "filename": {
+          "type": "string"
+        },
+        "arguments": {
+          "type": "string"
+        },
+        "icon": {
+          "type": "string"
+        },
+        "location": {
+          "type": "number"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "name",
+        "filename"
+      ]
+    },
+    "strings": {
+      "type": "object",
+      "patternProperties": {
+        ".": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "files": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/file"
+      }
+    },
+    "file": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "copyLocation": {
+          "type": "number"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "name",
+        "description"
+      ]
+    },
+    "keyboards": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/keyboard"
+      }
+    },
+    "keyboard": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "oskFont": {
+          "type": "string"
+        },
+        "displayFont": {
+          "type": "string"
+        },
+        "rtl": {
+          "type": "boolean"
+        },
+        "languages": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/keyboardLanguage"
+          }
+        },
+        "examples": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/keyboardExample"
+          }
+        },
+        "webOskFonts": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "webDisplayFonts": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "name",
+        "id",
+        "version"
+      ]
+    },
+    "keyboardLanguage": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "id",
+        "name"
+      ]
+    },
+    "info": {
+      "type": "object",
+      "properties": {
+        "website": {
+          "$ref": "#/definitions/infoItem"
+        },
+        "version": {
+          "$ref": "#/definitions/infoItem"
+        },
+        "name": {
+          "$ref": "#/definitions/infoItem"
+        },
+        "copyright": {
+          "$ref": "#/definitions/infoItem"
+        },
+        "author": {
+          "$ref": "#/definitions/infoItem"
+        },
+        "description": {
+          "$ref": "#/definitions/infoItem"
+        }
+      },
+      "additionalProperties": false
+    },
+    "infoItem": {
+      "type": "object",
+      "properties": {
+        "description": {
+          "type": "string"
+        },
+        "url": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "description"
+      ]
+    },
+    "lexicalModels": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/lexicalModel"
+      }
+    },
+    "lexicalModel": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "id": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "rtl": {
+          "type": "boolean"
+        },
+        "languages": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/keyboardLanguage"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "name",
+        "id",
+        "languages"
+      ]
+    },
+    "keyboardExample": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "keys": {
+          "type": "string"
+        },
+        "text": {
+          "type": "string"
+        },
+        "note": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "id",
+        "keys"
+      ]
+    },
+    "relatedPackage": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "relationship": {
+          "type": "string",
+          "enum": ["deprecates", "related"]
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "id",
+        "relationship"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/kmp/README.md b/schemas/kmp/README.md
new file mode 100644
index 0000000..6c8372b
--- /dev/null
+++ b/schemas/kmp/README.md
@@ -0,0 +1,24 @@
+# kmp.schema.json
+
+* kmp.json file format, metadata included in Keyman .kmp package files
+
+Documentation at https://help.keyman.com/developer/current-version/reference/file-types/metadata
+
+# kmp.schema.json version history
+
+## 2023-10-19 2.0
+* Add relatedPackages, options.licenseFile, options.welcomeFile,
+  keyboard.examples, keyboard.webOskFonts, keyboard.webDisplayFonts,
+  info.description (all of these formerly were stored in .keyboard_info)
+
+## 2019-01-31 1.1.0
+* Add lexicalModels properties (note: `version` is optional and currently unused)
+
+## 2018-02-13 1.0.2
+* Add rtl property for keyboard layouts
+
+## 2018-01-22 1.0.1
+* Remove id field as it is derived from the filename anyway
+
+## 2017-11-30 1.0 beta
+* Initial version
diff --git a/schemas/kpj-9.0/README.md b/schemas/kpj-9.0/README.md
new file mode 100644
index 0000000..9f28fcf
--- /dev/null
+++ b/schemas/kpj-9.0/README.md
@@ -0,0 +1,11 @@
+# kpj-9.0.schema.json
+
+**Note:** `KeymanDeveloperProject.Options.Version` is currently implicitly
+always '1.0'. It will be required for version 2.0 and later of the format.
+
+This is a schema for for supporting legacy versions of .kpj, from Keyman
+Developer 9.0 and earlier, is now available. Note that this schema is not fully
+validating on the legacy fields, but just sufficient to pass a valid
+file.
+
+You should be using kpj.schema.json for most purposes
diff --git a/schemas/kpj-9.0/kpj-9.0.schema.json b/schemas/kpj-9.0/kpj-9.0.schema.json
new file mode 100644
index 0000000..bfc8a3c
--- /dev/null
+++ b/schemas/kpj-9.0/kpj-9.0.schema.json
@@ -0,0 +1,134 @@
+{
+  "title": "kpj-9.0.xsd",
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "KeymanDeveloperProject": {
+      "properties": {
+        "Options": {
+          "$ref": "#/definitions/Options"
+        },
+        "Files": {
+          "$ref": "#/definitions/Files"
+        },
+        "templatepath": { "type":"string", "$comment": "Keyman Developer 9, no longer used in modern .kpj files" },
+        "stringspath": { "type":"string", "$comment": "Keyman Developer 9, no longer used in modern .kpj files" },
+        "state": { "type": "string", "$comment": "Keyman Developer 9, no longer used in modern .kpj files" },
+        "Modules": { "oneOf": [{"type": "object"}, {"type": "string"}], "$comment": "Keyman Developer 9, no longer used in modern .kpj files" },
+        "MRU": { "type": "object", "$comment": "Keyman Developer 9, no longer used in modern .kpj files" }
+      },
+      "required": [
+      ],
+      "additionalProperties": false,
+      "type": "object"
+    }
+  },
+  "required": [
+    "KeymanDeveloperProject"
+  ],
+  "additionalProperties": false,
+  "definitions": {
+    "Options": {
+      "type": "object",
+      "properties": {
+        "BuildPath": {
+          "type": "string"
+        },
+        "SourcePath": {
+          "type": "string"
+        },
+        "CompilerWarningsAsErrors": {
+          "type": "string",
+          "pattern": "^(True|False)$"
+        },
+        "WarnDeprecatedCode": {
+          "type": "string",
+          "pattern": "^(True|False)$"
+        },
+        "CheckFilenameConventions": {
+          "type": "string",
+          "pattern": "^(True|False)$"
+        },
+        "ProjectType": {
+          "type": "string",
+          "pattern": "^(keyboard|lexicalmodel)$"
+        },
+        "Version": {
+          "type": "string",
+          "pattern": "^(1\\.0|2\\.0)$"
+        }
+      },
+      "required": [
+      ],
+      "additionalProperties": false
+    },
+    "Files": {
+      "type": "object",
+      "properties": {
+        "File": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/File"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "File"
+      ]
+    },
+    "File": {
+      "type": "object",
+      "properties": {
+        "ID": {
+          "type": "string"
+        },
+        "Filename": {
+          "type": "string"
+        },
+        "Filepath": {
+          "type": "string"
+        },
+        "FileVersion": {
+          "type": "string"
+        },
+        "FileType": {
+          "type": "string"
+        },
+        "Details": {
+          "$ref": "#/definitions/FileDetails"
+        },
+        "ParentFileID": {
+          "type": "string"
+        },
+        "FullPath": { "type":"string", "$comment": "Keyman Developer 9, no longer used in modern .kpj files" },
+        "IDEState": { "type":"object", "$comment": "Keyman Developer 9, no longer used in modern .kpj files" }
+      },
+      "required": [
+        "Filename"
+      ],
+      "additionalProperties": false
+    },
+    "FileDetails": {
+      "type": "object",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Copyright": {
+          "type": "string"
+        },
+        "Message": {
+          "type": "string"
+        },
+        "Version": {
+          "type": "string"
+        },
+        "Debug": { "type":"string", "$comment": "Keyman Developer 9, no longer used in modern .kpj files" }
+      },
+      "required": [
+      ],
+      "additionalProperties": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/kpj/README.md b/schemas/kpj/README.md
new file mode 100644
index 0000000..bfca5c5
--- /dev/null
+++ b/schemas/kpj/README.md
@@ -0,0 +1,19 @@
+# kpj.xsd
+
+**Note:** `KeymanDeveloperProject.Options.Version` is currently implicitly
+always '1.0'. It will be required for version 2.0 and later of the format.
+
+**Note:** An additional schema file, kpj-9.0.schema.json, for supporting legacy
+  versions of .kpj, from Keyman Developer 9.0 and earlier, is now available.
+
+## 2023-08-07 2.0.1
+* Add Options/SkipMetadataFiles, defaults to True for 1.0 projects.
+
+## 2023-02-27 2.0
+* Version 2.0 makes 'Files' optional (internally, Files/File will be ignored,
+  deleted on load and populated from folder structure). Adds Options/SourcePath,
+  which defaults to '$PROJECTPATH/source', and Options/BuildPath now defaults to
+  '$PROJECTPATH/build'.
+
+## 2023-02-25 1.0
+* Initial version 1.0, based on Delphi classes Keyman.Developer.System.Project.*
diff --git a/schemas/kpj/kpj.schema.json b/schemas/kpj/kpj.schema.json
new file mode 100644
index 0000000..8a59fa4
--- /dev/null
+++ b/schemas/kpj/kpj.schema.json
@@ -0,0 +1,131 @@
+{
+  "title": "kpj.xsd",
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "KeymanDeveloperProject": {
+      "properties": {
+        "Options": {
+          "$ref": "#/definitions/Options"
+        },
+        "Files": {
+          "$ref": "#/definitions/Files"
+        }
+      },
+      "required": [
+        "Options"
+      ],
+      "additionalProperties": false,
+      "type": "object"
+    }
+  },
+  "required": [
+    "KeymanDeveloperProject"
+  ],
+  "additionalProperties": false,
+  "definitions": {
+    "Options": {
+      "type": "object",
+      "properties": {
+        "BuildPath": {
+          "type": "string"
+        },
+        "SourcePath": {
+          "type": "string"
+        },
+        "CompilerWarningsAsErrors": {
+          "type": "string",
+          "pattern": "^(True|False)$"
+        },
+        "WarnDeprecatedCode": {
+          "type": "string",
+          "pattern": "^(True|False)$"
+        },
+        "CheckFilenameConventions": {
+          "type": "string",
+          "pattern": "^(True|False)$"
+        },
+        "SkipMetadataFiles": {
+          "type": "string",
+          "pattern": "^(True|False)$"
+        },
+        "ProjectType": {
+          "type": "string",
+          "pattern": "^(keyboard|lexicalmodel)$"
+        },
+        "Version": {
+          "type": "string",
+          "pattern": "^(1\\.0|2\\.0)$"
+        }
+      },
+      "required": [
+      ],
+      "additionalProperties": false
+    },
+    "Files": {
+      "type": "object",
+      "properties": {
+        "File": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/File"
+          }
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "File"
+      ]
+    },
+    "File": {
+      "type": "object",
+      "properties": {
+        "ID": {
+          "type": "string"
+        },
+        "Filename": {
+          "type": "string"
+        },
+        "Filepath": {
+          "type": "string"
+        },
+        "FileVersion": {
+          "type": "string"
+        },
+        "FileType": {
+          "type": "string"
+        },
+        "Details": {
+          "$ref": "#/definitions/FileDetails"
+        },
+        "ParentFileID": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "Filename"
+      ],
+      "additionalProperties": false
+    },
+    "FileDetails": {
+      "type": "object",
+      "properties": {
+        "Name": {
+          "type": "string"
+        },
+        "Copyright": {
+          "type": "string"
+        },
+        "Message": {
+          "type": "string"
+        },
+        "Version": {
+          "type": "string"
+        }
+      },
+      "required": [
+      ],
+      "additionalProperties": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/kps/17.0/kps.xsd b/schemas/kps/17.0/kps.xsd
new file mode 100644
index 0000000..292f0c8
--- /dev/null
+++ b/schemas/kps/17.0/kps.xsd
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  .kps file schema, version 7.0
+
+  Copyright (C) SIL International
+
+  Supports KPS files for Keyman Developer 7+
+
+  Expects FileVersion 7.0
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+<xs:element name="Package">
+  <xs:complexType>
+    <xs:all>
+
+
+      <xs:element minOccurs="1" maxOccurs="1" name="System">
+        <xs:complexType>
+          <xs:all>
+            <xs:element minOccurs="1" maxOccurs="1" name="KeymanDeveloperVersion" type="km-version" />
+            <xs:element minOccurs="1" maxOccurs="1" name="FileVersion" type="km-version" />
+          </xs:all>
+        </xs:complexType>
+      </xs:element>
+
+
+      <xs:element minOccurs="0" maxOccurs="1" name="Options">
+        <xs:complexType>
+          <xs:all>
+            <xs:element minOccurs="0" maxOccurs="1" name="ExecuteProgram" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="ReadMeFile" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="GraphicFile" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="LicenseFile" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="WelcomeFile" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="MSIFileName" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="MSIOptions" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="FollowKeyboardVersion" type="km-empty" />
+          </xs:all>
+        </xs:complexType>
+      </xs:element>
+
+
+      <xs:element minOccurs="0" maxOccurs="1" name="StartMenu">
+        <xs:complexType>
+          <xs:all>
+            <xs:element minOccurs="0" maxOccurs="1" name="Folder" type="xs:string" />
+            <xs:element minOccurs="0" maxOccurs="1" name="AddUninstallEntry" type="km-empty" />
+            <xs:element minOccurs="0" maxOccurs="1" name="Items">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" name="Item">
+                    <xs:complexType>
+                      <xs:all>
+                        <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" />
+                        <xs:element minOccurs="0" maxOccurs="1" name="FileName" type="xs:string" />
+                        <xs:element minOccurs="0" maxOccurs="1" name="Arguments" type="xs:string" />
+                        <xs:element minOccurs="0" maxOccurs="1" name="Icon" type="xs:string" />
+                        <xs:element minOccurs="0" maxOccurs="1" name="Location" type="km-start-menu-location" />
+                      </xs:all>
+                    </xs:complexType>
+                  </xs:element>
+                </xs:sequence>
+              </xs:complexType>
+            </xs:element>
+          </xs:all>
+        </xs:complexType>
+      </xs:element>
+
+
+      <xs:element minOccurs="0" maxOccurs="1" name="Info">
+        <xs:complexType>
+          <xs:all>
+            <xs:element minOccurs="0" maxOccurs="1" name="Name" type="km-info" />
+            <xs:element minOccurs="0" maxOccurs="1" name="Version" type="km-info" />
+            <xs:element minOccurs="0" maxOccurs="1" name="Copyright" type="km-info" />
+            <xs:element minOccurs="0" maxOccurs="1" name="Author" type="km-info" />
+            <xs:element minOccurs="0" maxOccurs="1" name="WebSite" type="km-info" />
+            <xs:element minOccurs="0" maxOccurs="1" name="Description" type="km-info" />
+          </xs:all>
+        </xs:complexType>
+      </xs:element>
+
+
+      <xs:element minOccurs="0" maxOccurs="1" name="Files">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="File">
+              <xs:complexType>
+                <xs:all>
+                  <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="Description" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="CopyLocation" type="km-file-copy-location" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="FileType" type="xs:string" />
+                </xs:all>
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+      <xs:element minOccurs="0" maxOccurs="1" name="RelatedPackages">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="RelatedPackage">
+              <xs:complexType>
+                <xs:attribute name="ID" type="xs:string" />
+                <!-- "deprecates" is only valid value, if not present then means "related" -->
+                <xs:attribute name="Relationship" type="km-package-relationship" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+      <xs:element minOccurs="0" maxOccurs="1" name="Keyboards">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="Keyboard">
+              <xs:complexType>
+                <xs:all>
+                  <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="ID" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="Version" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="RTL" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="OSKFont" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="DisplayFont" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="Languages" type="km-keyboard-languages" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="Examples" type="km-keyboard-examples" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="WebOSKFonts" type="km-keyboard-fonts" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="WebDisplayFonts" type="km-keyboard-fonts" />
+                </xs:all>
+              </xs:complexType>
+              </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+
+      <xs:element minOccurs="0" maxOccurs="1" name="LexicalModels">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="LexicalModel">
+              <xs:complexType>
+                <xs:all>
+                  <xs:element minOccurs="0" maxOccurs="1" name="Name" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="ID" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="RTL" type="xs:string" />
+                  <xs:element minOccurs="0" maxOccurs="1" name="Languages" type="km-keyboard-languages" />
+                </xs:all>
+              </xs:complexType>
+              </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+      <!-- Deprecated elements: we won't validate as processors ignore them -->
+
+      <xs:element minOccurs="0" maxOccurs="1" name="Strings">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" name="String">
+              <xs:complexType>
+                <xs:attribute name="Name" type="xs:string" />
+                <xs:attribute name="Value" type="xs:string" />
+              </xs:complexType>
+            </xs:element>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+
+      <xs:element minOccurs="0" maxOccurs="1" name="Buttons" type="km-any" />
+      <xs:element minOccurs="0" maxOccurs="1" name="Registry" type="km-any" />
+
+    </xs:all>
+  </xs:complexType>
+</xs:element>
+
+<xs:complexType name="km-empty">
+  <xs:sequence/>
+</xs:complexType>
+
+<xs:complexType name="km-any">
+  <xs:sequence>
+    <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip" />
+  </xs:sequence>
+</xs:complexType>
+
+<xs:simpleType name="km-version">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="(\d+\.)+(\d+)"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="km-info">
+  <xs:simpleContent>
+    <xs:extension base="xs:string">
+      <xs:attribute name="URL" type="xs:anyURI" />
+    </xs:extension>
+  </xs:simpleContent>
+</xs:complexType>
+
+<xs:simpleType name="km-file-copy-location">
+  <xs:restriction base="xs:integer">
+    <xs:minInclusive value="0" />
+    <xs:maxInclusive value="3"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:simpleType name="km-package-relationship">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="deprecates" />
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:simpleType name="km-start-menu-location">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="psmelStartMenu|psmelDesktop"></xs:pattern>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="km-keyboard-languages">
+  <xs:sequence>
+    <xs:element minOccurs="0" maxOccurs="unbounded" name="Language">
+      <xs:complexType>
+        <xs:simpleContent>
+          <xs:extension base="xs:string">
+            <xs:attribute name="ID" type="xs:string" />
+          </xs:extension>
+        </xs:simpleContent>
+      </xs:complexType>
+    </xs:element>
+  </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="km-keyboard-examples">
+  <xs:sequence>
+    <xs:element minOccurs="0" maxOccurs="unbounded" name="Example">
+      <xs:complexType>
+        <xs:attribute name="ID" type="xs:string" />
+        <xs:attribute name="Keys" type="xs:string" />
+        <xs:attribute name="Text" type="xs:string" />
+        <xs:attribute name="Note" type="xs:string" />
+      </xs:complexType>
+    </xs:element>
+  </xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="km-keyboard-fonts">
+  <xs:sequence>
+    <xs:element minOccurs="0" maxOccurs="unbounded" name="Font">
+      <xs:complexType>
+        <xs:attribute name="Filename" type="xs:string" />
+      </xs:complexType>
+    </xs:element>
+  </xs:sequence>
+</xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/schemas/kps/README.md b/schemas/kps/README.md
new file mode 100644
index 0000000..eb5c957
--- /dev/null
+++ b/schemas/kps/README.md
@@ -0,0 +1,19 @@
+# kps
+
+* kps.xsd
+
+## 2023-10-19 17.0
+* Version 17.0 adds:
+  - LicenseFile - a .md file, usually named LICENSE.md
+  - WelcomeFile - a .htm file, usually named welcome.htm (later versions will support .md)
+  - Info/Description - a short Markdown description of the content of the package, e.g. shown in search results on keyman.com
+  - RelatedPackages - a list of other packages which relate to this one, or are deprecated by it
+  - Keyboards/Keyboard/Examples - a list of typing examples for the keyboard
+  - Keyboards/Keyboard/WebOSKFonts - a list of font filenames (not necessarily in package) suitable for rendering the on screen keyboard
+  - Keyboards/Keyboard/WebDisplayFonts - a list of font filenames (not necessarily in package) suitable for use with the keyboard
+
+## 2023-04-21 7.0.1 (not published)
+* Removes LexicalModel.Version, as it was never read or written
+
+## 2021-07-19 7.0
+* Initial version 7.0
diff --git a/schemas/kvk/1.0/kvk.ksy b/schemas/kvk/1.0/kvk.ksy
new file mode 100644
index 0000000..11d8f2f
--- /dev/null
+++ b/schemas/kvk/1.0/kvk.ksy
@@ -0,0 +1,122 @@
+meta:
+  id: kvk
+  title: Keyman Visual Keyboard
+  file-extension: kvk
+  license: MIT
+  ks-version: 0.9
+  endian: le
+  bit-endian: le
+doc: |
+  KVK is the binary file format for Keyman Visual Keyboard
+  files. KVKS is the equivalent XML source file format
+doc-ref:
+  - https://github.com/keymanapp/keyman/
+seq:
+  - id: header
+    type: header
+  - id: keys
+    type: keys
+types:
+  header:
+    seq:
+      - id: identifier
+        contents: 'KVKF'
+        doc: Magic file identifier, always KVKF
+      - id: version
+        contents: [0, 6, 0, 0]
+        doc: Version number of KVK file format, always 0x00000600
+      - id: flag
+        type: header_flags
+      - id: associated_keyboard
+        type: string
+      - id: ansi_font
+        type: font
+      - id: unicode_font
+        type: font
+
+  header_flags:
+    seq:
+      - id: display_102
+        type: b1
+        doc: kvkh102, Keyboard should display 102nd key
+      - id: display_underlying
+        type: b1
+        doc: kvkhDisplayUnderlying, Keyboard should display underlying characters
+      - id: use_underlying
+        type: b1
+        doc: kvkhUseUnderlying,
+      - id: altgr
+        type: b1
+        doc: kvkhAltGr, Keyboard should treat left/right Ctrl and Alt separately
+
+  keys:
+    seq:
+      - id: count
+        type: u4
+      - id: key
+        type: key
+        repeat: expr
+        repeat-expr: count
+  key:
+    seq:
+      - id: flags
+        type: key_flags
+      - id: modifiers
+        type: key_modifiers
+      - id: vkey
+        type: u2
+      - id: text
+        type: string
+      - id: bitmap
+        type: u4
+
+  key_modifiers:
+    seq:
+      - id: shift
+        type: b1
+      - id: ctrl
+        type: b1
+      - id: alt
+        type: b1
+      - id: lctrl
+        type: b1
+      - id: rctrl
+        type: b1
+      - id: lalt
+        type: b1
+      - id: ralt
+        type: b1
+      - id: padding
+        type: b1
+        doc: reserved,
+      - id: zeropad
+        contents: [0]
+
+  key_flags:
+    seq:
+      - id: bitmap
+        type: b1
+      - id: unicode
+        type: b1
+      - id: padding
+        type: b6
+
+  font:
+    seq:
+      - id: name
+        type: string
+      - id: size
+        type: u4
+      - id: color
+        type: u4
+
+  string:
+    seq:
+      - id: len
+        type: u2
+      - id: str
+        type: str
+        size: len*2 - 2
+        encoding: utf-16
+      - id: zero_terminator
+        contents: [0,0]
diff --git a/schemas/kvk/README.md b/schemas/kvk/README.md
new file mode 100644
index 0000000..21879ea
--- /dev/null
+++ b/schemas/kvk/README.md
@@ -0,0 +1,5 @@
+# .kvk binary schema
+
+## 2024-02-09 1.0
+
+* Documentation for long-standing format
diff --git a/schemas/kvks/10.0/kvks.schema.json b/schemas/kvks/10.0/kvks.schema.json
new file mode 100644
index 0000000..357b28b
--- /dev/null
+++ b/schemas/kvks/10.0/kvks.schema.json
@@ -0,0 +1,182 @@
+{
+  "title": "kvks.xsd",
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "visualkeyboard": {
+      "properties": {
+        "header": {
+          "$ref": "#/definitions/kvk-header"
+        },
+        "encoding": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/kvk-encoding"
+          }
+        }
+      },
+      "required": [
+        "header"
+      ],
+      "additionalProperties": false,
+      "type": "object"
+    }
+  },
+  "required": [
+    "visualkeyboard"
+  ],
+  "additionalProperties": false,
+  "definitions": {
+    "kvk-header": {
+      "type": "object",
+      "properties": {
+        "version": {
+          "$ref": "#/definitions/kvk-version"
+        },
+        "kbdname": {
+          "type": "string"
+        },
+        "flags": {
+          "$ref": "#/definitions/kvk-header-flags"
+        },
+        "layout": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "version"
+      ],
+      "additionalProperties": false
+    },
+    "kvk-header-flags": {
+      "type": "object",
+      "properties": {
+        "key102": {
+          "$ref": "#/definitions/km-empty"
+        },
+        "displayunderlying": {
+          "$ref": "#/definitions/km-empty"
+        },
+        "usealtgr": {
+          "$ref": "#/definitions/km-empty"
+        },
+        "useunderlying": {
+          "$ref": "#/definitions/km-empty"
+        }
+      },
+      "additionalProperties": false
+    },
+    "kvk-encoding": {
+      "type": "object",
+      "properties": {
+        "layer": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/kvk-layer"
+          }
+        },
+        "$": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "$ref": "#/definitions/kvk-encoding-name"
+            },
+            "fontname": {
+              "type": "string"
+            },
+            "fontsize": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "name"
+          ],
+          "additionalProperties": false
+        }
+      },
+      "required": [
+        "$"
+      ],
+      "additionalProperties": false
+    },
+    "kvk-layer": {
+      "type": "object",
+      "properties": {
+        "key": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/kvk-key"
+          }
+        },
+        "$": {
+          "type": "object",
+          "properties": {
+            "shift": {
+              "$ref": "#/definitions/kvk-layer-shift"
+            }
+          },
+          "required": [
+            "shift"
+          ],
+          "additionalProperties": false
+        }
+      },
+      "required": [
+        "$"
+      ],
+      "additionalProperties": false
+    },
+    "kvk-key": {
+      "type": "object",
+      "properties": {
+        "bitmap": {
+          "type": "string"
+        },
+        "$": {
+          "type": "object",
+          "properties": {
+            "vkey": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "vkey"
+          ],
+          "additionalProperties": false
+        },
+        "_": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "$"
+      ],
+      "additionalProperties": false
+    },
+    "km-empty": {
+      "type": "string"
+    },
+    "kvk-encoding-name": {
+      "type": "string",
+      "enum": [
+        "ansi",
+        "unicode"
+      ]
+    },
+    "kvk-layer-shift": {
+      "type": "string",
+      "pattern": "S?(C|LC|RC)?(A|LA|RA)?"
+    },
+    "kvk-version": {
+      "type": "string",
+      "pattern": "(\\d+\\.)+(\\d+)",
+      "enum": [
+        "10.0"
+      ]
+    },
+    "km-version": {
+      "type": "string",
+      "pattern": "(\\d+\\.)+(\\d+)"
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/kvks/10.0/kvks.xsd b/schemas/kvks/10.0/kvks.xsd
new file mode 100644
index 0000000..17056a5
--- /dev/null
+++ b/schemas/kvks/10.0/kvks.xsd
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  .kvks file schema, version 10.0
+
+  Copyright (C) SIL International
+
+  Supports KVKS files for Keyman Developer 10+
+
+  Expects version 10.0
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+<xs:element name="visualkeyboard">
+  <xs:complexType>
+    <xs:all>
+      <xs:element name="header" type="kvk-header" />
+      <xs:element minOccurs="0" name="encoding" type="kvk-encoding" />
+    </xs:all>
+  </xs:complexType>
+</xs:element>
+
+<xs:complexType name="kvk-header">
+  <xs:all>
+    <xs:element name="version" type="kvk-version" />
+    <xs:element minOccurs="0" name="kbdname" type="xs:string" />
+    <xs:element minOccurs="0" name="flags" type="kvk-header-flags" />
+    <xs:element minOccurs="0" name="layout" type="xs:string" />
+  </xs:all>
+</xs:complexType>
+
+<xs:complexType name="kvk-header-flags">
+  <xs:all>
+    <xs:element minOccurs="0" name="key102" type="km-empty" />
+    <xs:element minOccurs="0" name="displayunderlying" type="km-empty" />
+    <xs:element minOccurs="0" name="usealtgr" type="km-empty" />
+    <xs:element minOccurs="0" name="useunderlying" type="km-empty" />
+  </xs:all>
+</xs:complexType>
+
+<xs:complexType name="kvk-encoding">
+  <xs:sequence>
+    <xs:element minOccurs="0" maxOccurs="unbounded" name="layer" type="kvk-layer" />
+  </xs:sequence>
+  <xs:attribute name="name" type="kvk-encoding-name" use="required" />
+  <xs:attribute name="fontname" type="xs:string" />
+  <xs:attribute name="fontsize" type="xs:double" />
+</xs:complexType>
+
+<xs:simpleType name="kvk-encoding-name">
+  <xs:restriction base="xs:string">
+    <xs:enumeration value="ansi" />
+    <xs:enumeration value="unicode" />
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="kvk-layer">
+  <xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="key" type="kvk-key" /></xs:sequence>
+  <xs:attribute name="shift" use="required" type="kvk-layer-shift" />
+</xs:complexType>
+
+<xs:simpleType name="kvk-layer-shift">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="S?(C|LC|RC)?(A|LA|RA)?" />
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="kvk-key" mixed="true">
+  <xs:sequence>
+    <xs:element minOccurs="0" name="bitmap" type="xs:string" />
+  </xs:sequence>
+  <xs:attribute name="vkey" type="xs:string" use="required" />
+</xs:complexType>
+
+<xs:simpleType name="kvk-version">
+  <xs:restriction base="km-version">
+    <xs:enumeration value="10.0" />
+  </xs:restriction>
+</xs:simpleType>
+
+<!-- Some base types -->
+
+<xs:complexType name="km-empty">
+  <xs:sequence/>
+</xs:complexType>
+
+<xs:simpleType name="km-version">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="(\d+\.)+(\d+)"/>
+  </xs:restriction>
+</xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/schemas/kvks/README.md b/schemas/kvks/README.md
new file mode 100644
index 0000000..429720c
--- /dev/null
+++ b/schemas/kvks/README.md
@@ -0,0 +1,18 @@
+# .kvks schema
+
+This schema validates .kvks files, according to the reference implementation
+from VisualKeyboardLoaderXML.pas.
+
+## Notes on conversion from xsd to json-schema
+
+Converted using xsd2json. Following structural changes:
+
+* kvk-version base type from km-version to string, copy km-version pattern in
+* remove xs:all bracketing
+* remove format:double from fontsize, change type to string
+* encoding property changed type to array
+* kvk-key added _ property for base text value
+
+## 2024-02-09 10.0
+
+* Published schema for longstanding format
\ No newline at end of file
diff --git a/schemas/model_info.distribution/README.md b/schemas/model_info.distribution/README.md
new file mode 100644
index 0000000..2b91c3a
--- /dev/null
+++ b/schemas/model_info.distribution/README.md
@@ -0,0 +1,12 @@
+# model_info
+
+* model_info.source.json
+* model_info.distribution.json
+
+Documentation at https://help.keyman.com/developer/cloud/model_info
+
+## 2019-01-31 1.0 beta
+* Initial version, seeded from .keyboard_info specification
+
+## 2020-09-21 1.0.1
+* Relaxed the URL definitions in the schema so extension is no longer tested
diff --git a/schemas/model_info.source/1.0.1/model_info.source.json b/schemas/model_info.source/1.0.1/model_info.source.json
index fd64dfc..6b140d8 100644
--- a/schemas/model_info.source/1.0.1/model_info.source.json
+++ b/schemas/model_info.source/1.0.1/model_info.source.json
@@ -23,7 +23,7 @@
         "packageIncludes": { "type": "array", "items": { "type": "string", "enum": ["fonts"] }, "additionalItems": false },
         "version": { "type": "string" },
         "minKeymanVersion": { "type": "string", "pattern": "^\\d+\\.0$" },
-        "helpLink": { "type": "string", "pattern": "^http(s)?://help\\.keyman(-staging)?\\.com(.local)?/lexical-model/" },
+        "helpLink": { "type": "string", "pattern": "^http(s)?://help\\.keyman(-staging)?\\.com(.localhost)?/lexical-model/" },
         "sourcePath": { "type": "string", "pattern": "^(release|experimental)/.+/.+$" },
         "related": { "type": "object", "patternProperties": {
           ".": { "$ref": "#/definitions/ModelRelatedInfo" }
diff --git a/schemas/model_info.source/README.md b/schemas/model_info.source/README.md
new file mode 100644
index 0000000..2b91c3a
--- /dev/null
+++ b/schemas/model_info.source/README.md
@@ -0,0 +1,12 @@
+# model_info
+
+* model_info.source.json
+* model_info.distribution.json
+
+Documentation at https://help.keyman.com/developer/cloud/model_info
+
+## 2019-01-31 1.0 beta
+* Initial version, seeded from .keyboard_info specification
+
+## 2020-09-21 1.0.1
+* Relaxed the URL definitions in the schema so extension is no longer tested
diff --git a/schemas/package-version/README.md b/schemas/package-version/README.md
new file mode 100644
index 0000000..3feabc7
--- /dev/null
+++ b/schemas/package-version/README.md
@@ -0,0 +1,14 @@
+# package-version
+
+* package-version.json
+
+Documentation at https://help.keyman.com/developer/cloud/package-version
+
+## 2020-04-30 1.0
+* Initial version 1.0 (alpha)
+
+## 2020-09-21 1.0.1
+
+* Fixed bugs with missing .kmp files
+* Added deprecation links
+* Updated .kmp URLs to use keyman.com/go/package format
diff --git a/schemas/search/3.0/search.json b/schemas/search/3.0/search.json
new file mode 100644
index 0000000..527651c
--- /dev/null
+++ b/schemas/search/3.0/search.json
@@ -0,0 +1,60 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "$ref": "#/definitions/Search",
+
+  "definitions": {
+    "Search": {
+      "type": "object",
+      "properties": {
+        "keyboards": { "type": "array", "items": { "$ref": "#/definitions/SearchKeyboard" } },
+        "context": { "$ref": "#/definitions/Context" }
+      },
+      "required": ["keyboards","context"]
+    },
+
+    "Context": {
+      "type": "object",
+      "properties": {
+        "range": { "type": "string" },
+        "text": { "type": "string" },
+        "platform": { "type": "string", "enum": ["android", "ios", "linux", "macos", "web", "windows"] },
+        "pageSize": { "type": "number" },
+        "pageNumber": { "type": "number" },
+        "totalRows": { "type": "number" },
+        "totalPages": { "type": "number" }
+      },
+      "required": ["range", "text", "pageSize", "pageNumber", "totalRows", "totalPages"],
+      "additionalProperties": false
+    },
+
+    "SearchKeyboard": {
+      "allOf": [
+        { "$ref": "/keyboard_info/2.0/keyboard_info.schema.json#/definitions/KeyboardInfo" },
+        {
+          "properties": {
+            "match": {
+              "type": "object",
+              "properties": {
+                "name": { "oneOf": [ { "type": "string" }, { "type": "null"} ] },
+                "type": { "type": "string", "enum": [
+                  "keyboard", "keyboard_id", "description", "legacy_keyboard_id",
+                  "language", "language_bcp47_tag",
+                  "country", "country_iso3166_code",
+                  "script", "script_iso15924_code"
+                ] },
+                "tag": { "type": "string" },
+                "weight": { "type": "number" },
+                "downloads": { "type": "number" },
+                "totalDownloads": { "type": "number" },
+                "finalWeight": { "type": "number" }
+              },
+              "required": ["name","type","weight","downloads","finalWeight"],
+              "additionalProperties": false
+            }
+          },
+          "required": ["match"]
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/schemas/search/README.md b/schemas/search/README.md
new file mode 100644
index 0000000..c7e821b
--- /dev/null
+++ b/schemas/search/README.md
@@ -0,0 +1,34 @@
+# search
+
+* search.json
+
+Documentation at https://help.keyman.com/developer/cloud/search
+
+# search version history
+
+## 2024-02-09 3.0
+* Search results use the .keyboard_info 2.0 schema
+  `keyboard_info/2.0/keyboard_info.schema.json#/definitions/KeyboardInfo`
+  * Removed:
+    - `.documentationFilename`
+    - `.documentationFileSize`
+    - `.legacyId`
+    - `.links`
+    - `.related[].note`
+    - `.languages[].example`
+  * Added:
+    - `.languages[].examples[]`
+  * Modified:
+    - `.languages[].font`, `.languages[].oskFont`: `.source` is `[string]`
+
+## undated 2.0
+* Changes not documented at this time
+
+## 2019-12-13 1.0.2
+* Added deprecated field for keyboard_info
+
+## 2018-02-06 1.0.1
+* Added SearchCountry definition.
+
+## 2017-11-07 1.0 beta
+* Initial version
diff --git a/schemas/version/README.md b/schemas/version/README.md
new file mode 100644
index 0000000..252ea9e
--- /dev/null
+++ b/schemas/version/README.md
@@ -0,0 +1,16 @@
+# version
+
+* version.json
+
+Documentation at https://help.keyman.com/developer/cloud/version/2.0
+
+## version.json version history
+
+## 2021-09-30 2.0.2
+* Add 'all' semantics
+
+## 2019-10-23 2.0.1 alpha
+* Add linux platform
+
+## 2018-03-07 2.0 beta
+* Initial version
diff --git a/schemas/visualkeyboard/README.md b/schemas/visualkeyboard/README.md
new file mode 100644
index 0000000..64056f8
--- /dev/null
+++ b/schemas/visualkeyboard/README.md
@@ -0,0 +1,12 @@
+# visualkeyboard
+
+* visualkeyboard.dtd
+
+XML Document Type Defintion for the .kvks file format. Previously, this was
+at http://tavultesoft.com/keymandev/visualkeyboard.dtd.
+
+This DTD is deprecated, and for most cases you should be using
+[kvks](../kvks/README.md)
+
+## 2019-08-20
+* Moved to api.keyman.com (redirect on tavultesoft.com)
diff --git a/schemas/web.config b/schemas/web.config
deleted file mode 100644
index 9756d60..0000000
--- a/schemas/web.config
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <system.webServer>
-    <staticContent>
-      <remove fileExtension=".json" />
-      <mimeMap fileExtension=".json" mimeType="application/json" />
-    </staticContent>
-
-    <rewrite>
-      <rules>
-        <!-- Rewrite old schema endpoints -->
-
-        <rule name="keyboard_info.distribution.json" enabled="true" stopProcessing="true">
-          <match url="^keyboard_info\.distribution\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="keyboard_info.distribution/1.0.6/keyboard_info.distribution.json" />
-        </rule>
-
-        <rule name="keyboard_info.source.json" enabled="true" stopProcessing="true">
-          <match url="^keyboard_info\.source\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="keyboard_info.source/1.0.6/keyboard_info.source.json" />
-        </rule>
-
-        <rule name="keyboard_json.json" enabled="true" stopProcessing="true">
-          <match url="^keyboard_json\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="keyboard_json/1.0/keyboard_json.json" />
-        </rule>
-
-        <rule name="model_info.distribution.json" enabled="true" stopProcessing="true">
-          <match url="^model_info\.distribution\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="model_info.distribution/1.0.1/model_info.distribution.json" />
-        </rule>
-
-        <rule name="model_info.source.json" enabled="true" stopProcessing="true">
-          <match url="^model_info\.source\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="model_info.source/1.0.1/model_info.source.json" />
-        </rule>
-
-        <rule name="model-search.json" enabled="true" stopProcessing="true">
-          <match url="^model-search\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="model-search/1.0.1/model-search.json" />
-        </rule>
-
-        <rule name="package.json" enabled="true" stopProcessing="true">
-          <match url="^package\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="package/1.1.0/package.json" />
-        </rule>
-
-        <rule name="package-version.json" enabled="true" stopProcessing="true">
-          <match url="^package-version\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="package-version/1.0.1/package-version.json" />
-        </rule>
-
-        <rule name="search.json" enabled="true" stopProcessing="true">
-          <match url="^search\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="search/1.0.2/search.json" />
-        </rule>
-
-        <rule name="version.json" enabled="true" stopProcessing="true">
-          <match url="^version\.json$" ignoreCase="false" />
-          <action type="Rewrite" url="version/2.0/version.json" />
-        </rule>
-      </rules>
-    </rewrite>
-
-  </system.webServer>
-</configuration>
diff --git a/schemas/windows-update/17.0/windows-update.json b/schemas/windows-update/17.0/windows-update.json
new file mode 100644
index 0000000..4a21c33
--- /dev/null
+++ b/schemas/windows-update/17.0/windows-update.json
@@ -0,0 +1,106 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$ref": "#/definitions/windows-update",
+
+  "definitions": {
+    "windows-update": {
+      "type": "object",
+      "required": ["msi", "setup", "bundle", "keyboards"],
+      "additionalProperties": true,
+      "properties": {
+        "msi": {
+          "$ref": "#/definitions/optional-file"
+        },
+        "setup": {
+          "$ref": "#/definitions/optional-file"
+        },
+        "bundle": {
+          "$ref": "#/definitions/optional-file"
+        },
+        "keyboards": {
+          "$ref": "#/definitions/keyboards"
+        }
+      }
+    },
+
+    "optional-file": {
+      "anyOf": [{ "$ref": "#/definitions/file" }, { "type": "boolean" }]
+    },
+
+    "file": {
+      "type": "object",
+      "required": [
+        "name",
+        "version",
+        "date",
+        "platform",
+        "stability",
+        "file",
+        "md5",
+        "type",
+        "build",
+        "size",
+        "url"
+      ],
+      "additionalProperties": true,
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "date": {
+          "type": "string"
+        },
+        "platform": {
+          "type": "string"
+        },
+        "stability": {
+          "type": "string"
+        },
+        "file": {
+          "type": "string"
+        },
+        "md5": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        },
+        "build": {
+          "type": "string"
+        },
+        "size": {
+          "type": "integer"
+        },
+        "url": {
+          "type": "string"
+        }
+      }
+    },
+    "keyboards": {
+      "type": "object",
+      "additionalProperties": false,
+      "patternProperties": {
+        ".+": {
+          "$ref": "#/definitions/keyboard"
+        }
+      }
+    },
+    "keyboard": {
+      "allOf": [
+        {
+          "$ref": "/keyboard_info/2.0/keyboard_info.schema.json#/definitions/KeyboardInfo"
+        },
+        {
+          "properties": {
+            "url": {
+              "type": "string"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/schemas/windows-update/README.md b/schemas/windows-update/README.md
new file mode 100644
index 0000000..3b674ee
--- /dev/null
+++ b/schemas/windows-update/README.md
@@ -0,0 +1,25 @@
+# windows-update
+
+* windows-update.json is the schema for /windows/17.0/update endpoint
+
+## 2024-02-09 17.0
+* Keyboard results use the .keyboard_info 2.0 schema
+  `keyboard_info/2.0/keyboard_info.schema.json#/definitions/KeyboardInfo`
+  * Removed:
+    - `.documentationFilename`
+    - `.documentationFileSize`
+    - `.legacyId`
+    - `.links`
+    - `.related[].note`
+    - `.languages[].example`
+  * Added:
+    - `.languages[].examples[]`
+  * Modified:
+    - `.languages[].font`, `.languages[].oskFont`: `.source` is `[string]`
+
+## 2020-11-17 14.0.1
+* Relaxed `file` to `optional-file` to allow for responses without an update available.
+
+## 2020-07-23 14.0
+* Initial version 14.0 (alpha)
+
diff --git a/script/desktop/10.0/exception/index.php b/script/desktop/10.0/exception/index.php
index 50e58b9..b444e23 100644
--- a/script/desktop/10.0/exception/index.php
+++ b/script/desktop/10.0/exception/index.php
@@ -1,5 +1,7 @@
 <?php
   require_once('../../../../tools/base.inc.php');
+  $env = getenv();
+
   define('CACERT_PATH', $_SERVER['DOCUMENT_ROOT'].'/tools/cacert.pem');
   if(!isset($_REQUEST['Text']) ||
     !isset($_REQUEST['Details']) ||
@@ -12,8 +14,8 @@
 
   header('Content-Type: text/plain');
 
-  $github_user = $_SERVER['api_keyman_com_github_user'];
-  $github_repo = $_SERVER['api_keyman_com_github_repo'];
+  $github_user = $env['api_keyman_com_github_user'];
+  $github_repo = $env['api_keyman_com_github_repo'];
 
   $crashid = $_REQUEST['CrashID'];
   $text = $_REQUEST['Text'];
diff --git a/script/desktop/10.0/submitdiag/index.php b/script/desktop/10.0/submitdiag/index.php
index 701d28f..9527a3c 100644
--- a/script/desktop/10.0/submitdiag/index.php
+++ b/script/desktop/10.0/submitdiag/index.php
@@ -1,5 +1,7 @@
 <?php
   require_once('../../../../tools/base.inc.php');
+
+  $env = getenv();
   if(!isset($_SERVER['argv'])) {
     if(!isset($_REQUEST['Username']) || !isset($_REQUEST['Title']) || !isset($_REQUEST['Body']) || !isset($_FILES['File']))
     {
@@ -84,9 +86,10 @@
   echo "<result>$topic_id</result>";
 
   function CallDiscourse($path, $data, $method = 'GET', $username = '') {
-    $discourse_key = $_SERVER['api_keyman_com_discourse_key'];
-    $discourse_site = $_SERVER['api_keyman_com_discourse_site'];
-    $discourse_username = $_SERVER['api_keyman_com_discourse_username'];
+    global $env;
+    $discourse_key = $env['api_keyman_com_discourse_key'];
+    $discourse_site = $env['api_keyman_com_discourse_site'];
+    $discourse_username = $env['api_keyman_com_discourse_username'];
 
     if(empty($username)) $username = $discourse_username;
     $url = "$discourse_site$path";
diff --git a/script/hooks/keyboards-build-success.php b/script/hooks/keyboards-build-success.php
index ed45937..3b45680 100644
--- a/script/hooks/keyboards-build-success.php
+++ b/script/hooks/keyboards-build-success.php
@@ -24,7 +24,8 @@
     fail('No token');
   }
 
-  if($_REQUEST['token'] != $_SERVER['api_keyman_com_webhook_token']) {
+  $env = getenv();
+  if($_REQUEST['token'] != $env['api_keyman_com_webhook_token']) {
     fail('Invalid token');
   }
 
diff --git a/script/increment-download/increment-download.php b/script/increment-download/increment-download.php
index 5997734..c0492ba 100644
--- a/script/increment-download/increment-download.php
+++ b/script/increment-download/increment-download.php
@@ -11,6 +11,7 @@
   use Keyman\Site\Common\KeymanHosts;
 
   $mssql = Keyman\Site\com\keyman\api\Tools\DB\DBConnect::Connect();
+  $env = getenv();
 
   header('Link: <' . KeymanHosts::Instance()->api_keyman_com .'/schemas/increment-download/1.0/increment-download.json#>; rel="describedby"');
 
@@ -28,7 +29,7 @@
   if(KeymanHosts::Instance()->Tier() === KeymanHosts::TIER_DEVELOPMENT)
     $key = 'local';
   else
-    $key = $_SERVER['API_KEYMAN_COM_INCREMENT_DOWNLOAD_KEY'];
+    $key = $env['API_KEYMAN_COM_INCREMENT_DOWNLOAD_KEY'];
 
   if($_REQUEST['key'] !== $key) {
     fail('Invalid key');
diff --git a/script/version/version.php b/script/version/version.php
index 90a111e..16a4c30 100644
--- a/script/version/version.php
+++ b/script/version/version.php
@@ -4,6 +4,7 @@
   require_once(__DIR__ . '/version.inc.php');
   require_once __DIR__ . '/../../tools/autoload.php';
   use Keyman\Site\Common\KeymanHosts;
+  require_once __DIR__ . '/../../tools/db/servervars.php';
 
   define("LEGACY_WEB_STABLE_VERSION", "473"); // Corresponds to the last legacy stable web version 2.0.473
   allow_cors();
diff --git a/tests/ApiTestCase.php b/tests/ApiTestCase.php
index b870ab0..d685460 100644
--- a/tests/ApiTestCase.php
+++ b/tests/ApiTestCase.php
@@ -29,6 +29,7 @@ static function setUpBeforeClass(): void
       file_put_contents(self::TIER_TXT, KeymanHosts::TIER_TEST);
       self::$wroteTierTxt = true;
       KeymanHosts::Rebuild();
+      SetKeymanHostsForTest();
     }
   }
 
diff --git a/tests/CommonFilesTest.php b/tests/CommonFilesTest.php
deleted file mode 100644
index 5997b8d..0000000
--- a/tests/CommonFilesTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Keyman\Site\com\keyman\api\tests;
-
-require_once(__DIR__ . '/../tools/base.inc.php');
-require_once(__DIR__ . '/TestUtils.inc.php');
-
-use PHPUnit\Framework\TestCase;
-
-final class CommonFilesTest extends TestCase
-{
-  const commonDir = __DIR__ . '/../_common/';
-  const sites = [['keyman.com'], ['help.keyman.com']];
-
-  public function dataSites() {
-    return self::sites;
-  }
-  /**
-   * Verifies that files in _common folder are identical. In the future, we may use a different way of syncing the common files,
-   * (composer module?, git submodule, or the like) but for now this keeps us in sync at reasonably little cost.
-   *
-   * @dataProvider dataSites
-   */
-  public function testCommonFilesAreIdentical($site): void
-  {
-    $this->setName("testCommonFilesAreIdenticalTo $site");
-
-    $localFiles = glob(self::commonDir . "*");
-
-    if(file_exists(__DIR__ . "/../../$site")) {
-      $remoteDir = __DIR__ . "/../../$site/_common/";
-      foreach($localFiles as $localFile) {
-        $remoteFile = $remoteDir . basename($localFile);
-        $this->assertFileEquals($localFile, $remoteFile, "$localFile != $remoteFile");
-      }
-
-      $remoteFiles = glob($remoteDir . "*");
-      foreach($remoteFiles as $remoteFile) {
-        $localFile = self::commonDir . basename($remoteFile);
-        $this->assertFileExists($localFile, "$localFile does not exist");
-      }
-
-    } else {
-      // On CI, we don't have access to other sites
-      $this->markTestSkipped("Skipping because we don't have access to site $site");
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/ModelSearchTest.php b/tests/ModelSearchTest.php
index c29dcf2..31c1093 100644
--- a/tests/ModelSearchTest.php
+++ b/tests/ModelSearchTest.php
@@ -20,7 +20,7 @@ static function setUpBeforeClass(): void
 
   public function testSimpleResultValidatesAgainstSchema(): void
   {
-    //http://api.keyman.com.local/model?q=sil
+    //http://api.keyman.com.localhost/model?q=sil
     $schema = TestUtils::LoadJSONSchema(ModelSearchTest::SchemaFilename);
     $mssql = \Keyman\Site\com\keyman\api\Tools\DB\DBConnect::Connect();
 
diff --git a/tests/ModelTest.php b/tests/ModelTest.php
index a0e5c32..2fcba55 100644
--- a/tests/ModelTest.php
+++ b/tests/ModelTest.php
@@ -20,7 +20,7 @@ static function setUpBeforeClass(): void
 
   public function testSimpleResultValidatesAgainstSchema(): void
   {
-    //http://api.keyman.com.local/model/gff.am.gff_amharic
+    //http://api.keyman.com.localhost/model/gff.am.gff_amharic
     $schema = TestUtils::LoadJSONSchema(ModelTest::SchemaFilename);
     $mssql = \Keyman\Site\com\keyman\api\Tools\DB\DBConnect::Connect();
 
diff --git a/tests/Search20Test.php b/tests/Search20Test.php
index 8ae27f0..261d548 100644
--- a/tests/Search20Test.php
+++ b/tests/Search20Test.php
@@ -113,23 +113,6 @@ public function testSearchByKeyboardId()
       $this->assertEquals('keyboard_id', $json->keyboards[0]->match->type);
     }
 
-    public function testSearchByLegacyKeyboardId()
-    {
-      $json = $this->s->GetSearchMatches(null, 'legacy:681', 1, 1);
-      $json = json_decode(json_encode($json));
-      $this->schema->in($json);
-      $this->assertEquals(1, $json->context->totalRows);
-      $this->assertEquals('acoli', $json->keyboards[0]->id);
-      $this->assertEquals('legacy_keyboard_id', $json->keyboards[0]->match->type);
-
-      $json = $this->s->GetSearchMatches(null, 'k:legacy:681', 1, 1);
-      $json = json_decode(json_encode($json));
-      $this->schema->in($json);
-      $this->assertEquals(1, $json->context->totalRows);
-      $this->assertEquals('acoli', $json->keyboards[0]->id);
-      $this->assertEquals('legacy_keyboard_id', $json->keyboards[0]->match->type);
-    }
-
     public function testSearchByLanguageBcp47Tag()
     {
       $json = $this->s->GetSearchMatches(null, 'l:id:ach', 1, 1);
diff --git a/tests/TestDBBuild.inc.php b/tests/TestDBBuild.inc.php
index 151b27a..8449822 100644
--- a/tests/TestDBBuild.inc.php
+++ b/tests/TestDBBuild.inc.php
@@ -46,8 +46,9 @@ static function Build()
       // Connect to database. TODO: refactor with DBConnect
       $dci = new \DatabaseConnectionInfo();
 
-      $force = !empty($_SERVER['TEST_REBUILD']);
-      unset($_SERVER['TEST_REBUILD']); // wow, but means this only gets run once :)
+      $env = getenv();
+      $force = !empty($env['TEST_REBUILD']);
+      unset($env['TEST_REBUILD']); // wow, but means this only gets run once :)
 
       $schema = $dci->getActiveSchema();
       try {
diff --git a/tests/TestUtils.inc.php b/tests/TestUtils.inc.php
index 65bf019..3f075ef 100644
--- a/tests/TestUtils.inc.php
+++ b/tests/TestUtils.inc.php
@@ -7,7 +7,7 @@
   use Swaggest\JsonSchema\Context;
 
   class TestUtils {
-    private const DefaultHostname = 'http://api.keyman.com.local';
+    private const DefaultHostname = 'http://localhost';
 
     static function LoadJSONSchema($filename) {
       $options = new Context();
@@ -16,8 +16,9 @@ static function LoadJSONSchema($filename) {
     }
 
     static function Hostname() {
-      if(isset($_SERVER['api_keyman_com_host'])) {
-        return $_SERVER['api_keyman_com_host'];
+      $env = getenv();
+      if(isset($env['api_keyman_com_host'])) {
+        return $env['api_keyman_com_host'];
       }
       return TestUtils::DefaultHostname;
     }
diff --git a/tests/manual/validate-kmw-api-transition.php b/tests/manual/validate-kmw-api-transition.php
index ed3b9ca..e70d8e5 100644
--- a/tests/manual/validate-kmw-api-transition.php
+++ b/tests/manual/validate-kmw-api-transition.php
@@ -6,7 +6,7 @@
   
   if(sizeof($params) > 0 && ($params[0] == '-l' || $params[0] == '--local')) {
     array_shift($params);
-    $api_root = "http://api.keyman.com.local";
+    $api_root = "http://api.keyman.com.localhost";
   } else {
     $api_root = "https://api.keyman.com";
   }
diff --git a/tools/autoload.php b/tools/autoload.php
index 4dcc8d1..02964e1 100644
--- a/tools/autoload.php
+++ b/tools/autoload.php
@@ -1,7 +1,9 @@
 <?php
   spl_autoload_register(function ($class_name) {
     if(preg_match('/^Keyman\\\\Site\\\\com\\\\keyman\\\\api\\\\(.+)/', $class_name, $matches)) {
-      $success = @include(__DIR__ . "/2020/{$matches[1]}.php");
+      // Fix namespace pathing for Linux
+      $filename = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $matches[1]);
+      $success = @include(__DIR__ . "/2020/{$filename}.php");
       if($success === FALSE) {
         debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
         die("Unable to find class $class_name");
@@ -11,7 +13,9 @@
 
   spl_autoload_register(function ($class_name) {
     if(preg_match('/^Keyman\\\\Site\\\\Common\\\\(.+)/', $class_name, $matches)) {
-      $success = @include(__DIR__ . "/../_common/{$matches[1]}.php");
+      // Fix namespace pathing for Linux
+      $filename = str_replace(array('\\', '/'), DIRECTORY_SEPARATOR, $matches[1]);
+      $success = @include(__DIR__ . "/../_common/{$filename}.php");
       if($success === FALSE) {
         debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
         die("Unable to find class $class_name");
diff --git a/tools/db/.gitignore b/tools/db/.gitignore
index 2d8b62f..92d2877 100644
--- a/tools/db/.gitignore
+++ b/tools/db/.gitignore
@@ -1,4 +1,3 @@
 test.php
 localenv.php
 build/cjk/*_import.sql
-activeschema.txt
\ No newline at end of file
diff --git a/tools/db/build/build.inc.php b/tools/db/build/build.inc.php
index 420216f..c53c4cf 100644
--- a/tools/db/build/build.inc.php
+++ b/tools/db/build/build.inc.php
@@ -183,17 +183,20 @@ function createSqlLogin() {
     function wakeUpDatabaseServer() {
       $dci = new DatabaseConnectionInfo();
       $tries = 1;
+      $max_tries = 15;
       while(true) {
-        build_log("Attempting to wake database server (attempt $tries/5)");
+        build_log("Attempting to wake database server at " . $dci->getConnectionString() . " (attempt $tries/$max_tries)");
         try {
           new PDO($dci->getMasterConnectionString(), $dci->getUser(), $dci->getPassword(), [ "CharacterSet" => "UTF-8" ]);
           return true;
         }
         catch( PDOException $e ) {
+          echo "Failed to connect: " . $e->getMessage();
           $tries++;
-          if($tries > 5) {
-            die( "Unable to wake database server after 5 attempts: " . $e->getMessage() );
+          if($tries > $max_tries) {
+            die( "Unable to wake database server after $max_tries attempts: " . $e->getMessage() );
           }
+          sleep(10);
         }
       }
     }
diff --git a/tools/db/build/build_keyboards_script.inc.php b/tools/db/build/build_keyboards_script.inc.php
index f8cb26c..b4cfaba 100644
--- a/tools/db/build/build_keyboards_script.inc.php
+++ b/tools/db/build/build_keyboards_script.inc.php
@@ -70,7 +70,6 @@ function build() {
       return
         $this->generate_keyboard_inserts() .
         $this->generate_keyboard_language_inserts() .
-        $this->generate_keyboard_link_inserts() .
         $this->generate_keyboard_related_inserts();
     }
 
@@ -192,14 +191,14 @@ function generate_keyboard_inserts() {
           {$this->sqlv($keyboard, 'minKeymanVersion')},
           $minKeymanVersion1,
           $minKeymanVersion2,
-          {$this->sqli($keyboard, 'legacyId')},
+          null,
 
           {$this->sqlv($keyboard, 'packageFilename')},
           {$this->sqli($keyboard, 'packageFileSize')},
           {$this->sqlv($keyboard, 'jsFilename')},
           {$this->sqli($keyboard, 'jsFileSize')},
-          {$this->sqlv($keyboard, 'documentationFilename')},
-          {$this->sqli($keyboard, 'documentationFileSize')},
+          null,
+          null,
 
           {$this->sqlb(null, $isRTL)},
           {$this->sqlb(null, $isUnicode)},
@@ -261,37 +260,6 @@ function generate_keyboard_language_inserts() {
 
 GO
 
-END;
-        }
-      }
-
-      return $result;
-    }
-
-    /**
-      Generate an SQL script to insert entries in to the t_keyboard_link table
-    */
-    function generate_keyboard_link_inserts() {
-      $insert = <<<END
-        INSERT t_keyboard_link (
-          keyboard_id,
-          url,
-          name
-        ) VALUES
-END;
-
-      $result = '';
-      foreach($this->keyboards as $keyboard) {
-        if(!isset($keyboard->links)) continue;
-        foreach($keyboard->links as $link) {
-          $result .= <<<END
-$insert
-          ({$this->sqlv($keyboard, 'id')},
-          {$this->sqlv($link, 'url')},
-          {$this->sqlv($link, 'name')});
-
-GO
-
 END;
         }
       }
diff --git a/tools/db/build/create-database.sql b/tools/db/build/create-database.sql
index b823146..6718f99 100644
--- a/tools/db/build/create-database.sql
+++ b/tools/db/build/create-database.sql
@@ -6,6 +6,7 @@ GO
 IF DB_ID('keyboards_database') IS NULL /* keyboards_database will be replaced with predefined database name at build */
 BEGIN
   EXEC('CREATE DATABASE keyboards_database') /* keyboards_database will be replaced with predefined database name at build */
+  EXEC('ALTER DATABASE keyboards_database SET RECOVERY SIMPLE') /* keyboards_database will be replaced with predefined database name at build */
 END
 GO
 
diff --git a/tools/db/localenv.php.in b/tools/db/localenv.php.in
index 5535365..a468003 100644
--- a/tools/db/localenv.php.in
+++ b/tools/db/localenv.php.in
@@ -21,14 +21,3 @@
   //$_SERVER['api_keyman_com_discourse_site']='https://community.software.sil.org';
   //$_SERVER['api_keyman_com_discourse_username']=<your discourse login name>;
 
-  // If you report to google analytics, fill in the keyfile here:
-  /*$_SERVER['api_keyman_com_analytics']='
-  {
-    "project_id": "",
-    "private_key_id": "",
-    "private_key": "",
-    "client_email": "",
-    "client_id": "",
-    "client_x509_cert_url": ""
-  }
-  ';*/
diff --git a/tools/db/servervars.php b/tools/db/servervars.php
index 47c1cd0..e6b70de 100644
--- a/tools/db/servervars.php
+++ b/tools/db/servervars.php
@@ -10,15 +10,33 @@
   require_once(dirname(__FILE__) . '/../../_common/KeymanHosts.php');
   use \Keyman\Site\Common\KeymanHosts;
 
+  function SetKeymanHostsForTest() {
+    if(KeymanHosts::Instance()->Tier() == KeymanHosts::TIER_TEST) {
+      // TEST tier requires specific overrides just for api.keyman.com and
+      // keyman.com in order for tests to pass.
+      //
+      // * api.keyman.com needs to point to our spun-up instance of the site so
+      //   that we can actually make valid REST calls.
+      // * keyman.com needs to be keyman-staging.com so that the test fixtures
+      //   match (this could be cleaned up in the future)
+      KeymanHosts::Instance()->OverrideHost('api_keyman_com', "http://host.docker.internal:8058");
+      KeymanHosts::Instance()->OverrideHost('keyman_com', "https://keyman-staging.com");
+    }
+  }
+
+  SetKeymanHostsForTest();
+
+  $env = getenv();
+
   if (!isset($mssqlpw))
-    $mssqlpw = isset($_SERVER['api_keyman_com_mssql_pw']) ? $_SERVER['api_keyman_com_mssql_pw'] : null;
+    $mssqlpw = isset($env['api_keyman_com_mssql_pw']) ? $env['api_keyman_com_mssql_pw'] : null;
   if (!isset($mssqluser))
-    $mssqluser = isset($_SERVER['api_keyman_com_mssql_user']) ? $_SERVER['api_keyman_com_mssql_user'] : null;
+    $mssqluser = isset($env['api_keyman_com_mssql_user']) ? $env['api_keyman_com_mssql_user'] : null;
 
-  if (!isset($mssqldb)) $mssqldb = $_SERVER['api_keyman_com_mssqldb'];
-  if (!isset($mssqlconninfo)) $mssqlconninfo = $_SERVER['api_keyman_com_mssqlconninfo'];
-  if (!isset($mssql_create_database) && isset($_SERVER['api_keyman_com_mssql_create_database']))
-    $mssql_create_database = $_SERVER['api_keyman_com_mssql_create_database'];
+  if (!isset($mssqldb)) $mssqldb = $env['api_keyman_com_mssqldb'];
+  if (!isset($mssqlconninfo)) $mssqlconninfo = $env['api_keyman_com_mssqlconninfo'];
+  if (!isset($mssql_create_database) && isset($env['api_keyman_com_mssql_create_database']))
+    $mssql_create_database = $env['api_keyman_com_mssql_create_database'];
 
   class DatabaseConnectionInfo
   {
@@ -28,7 +46,7 @@ class DatabaseConnectionInfo
 
     private function filename()
     {
-      return dirname(__FILE__) . '/activeschema.txt';
+      return dirname(__FILE__) . '/../../.data/activeschema.txt';
     }
 
     function __construct()
diff --git a/web.config b/web.config
deleted file mode 100644
index 2b5a348..0000000
--- a/web.config
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <system.webServer>
-    <rewrite>
-      <rules>
-        <!-- For the live site, always force HTTPS -->
-
-        <rule name="Force HTTPS" enabled="true" stopProcessing="true">
-          <match url="(.*)" ignoreCase="false" />
-          <conditions>
-            <add input="{HTTP_HOST}" pattern="^(api\.keyman(-staging)?\.com|localhost|127\.0\.0\.1)" negate="true" />
-            <add input="{HTTPS}" pattern="off" ignoreCase="true" />
-          </conditions>
-          <action type="Redirect" url="https://{HTTP_HOST}{REQUEST_URI}" appendQueryString="true" redirectType="Permanent" />
-        </rule>
-
-        <!-- Rewrites for /script folder: /search -->
-
-        <rule name="/search/2.0" stopProcessing="true">
-          <match url="^search/2\.0" />
-          <action type="Rewrite" url="/script/search/2.0/search.php" />
-        </rule>
-
-        <rule name="/search" stopProcessing="true">
-          <match url="^search(/1\.0)?" />
-          <action type="Rewrite" url="/script/search/1.0/search.php" />
-        </rule>
-
-        <!-- Rewrites for /script folder: /keyboard -->
-
-        <rule name="/keyboard" stopProcessing="true">
-          <match url="^keyboard/(.*)$" />
-          <action type="Rewrite" url="/script/keyboard/keyboard.php?id={R:1}" />
-        </rule>
-
-        <!-- Rewrites for /script folder: /increment-download -->
-
-        <rule name="/increment-download" stopProcessing="true">
-          <conditions>
-            <add input="{REQUEST_METHOD}" matchType="Pattern" pattern="POST" ignoreCase="true" />
-          </conditions>
-          <match url="^increment-download/(.*)$" />
-          <action type="Rewrite" url="/script/increment-download/increment-download.php?id={R:1}" appendQueryString="true" />
-        </rule>
-
-        <!-- Rewrites for /script folder: /model -->
-
-        <rule name="/model?q=..." stopProcessing="true">
-          <match url="^model(/)?$" />
-          <action type="Rewrite" url="/script/model-search/model-search.php" appendQueryString="true" />
-        </rule>
-
-        <rule name="/model" stopProcessing="true">
-          <match url="^model/(.*)$" />
-          <action type="Rewrite" url="/script/model/model.php?id={R:1}" />
-        </rule>
-
-        <!-- Rewrites for /script folder: /version -->
-
-        <rule name="/version/platform/level" stopProcessing="true">
-          <match url="^version(\/([^/]+)(\/([^/]+))?)?$" />
-          <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-          <action type="Rewrite" url="/script/version/version.php?platform={R:2}&amp;level={R:4}" />
-        </rule>
-
-        <rule name="/version" stopProcessing="true">
-          <match url="^version(\/)?$" />
-          <action type="Rewrite" url="/script/version/version.php" />
-        </rule>
-
-        <rule name="/package-version[/1.0]" stopProcessing="true">
-          <match url="^package-version(\/1\.0)?(\/)?$" />
-          <action type="Rewrite" url="/script/package-version/package-version.php" appendQueryString="true" />
-        </rule>
-
-        <!-- Rewrites for /script folder: /cloud to /script/legacy/... -->
-
-        <rule name="Language + keyboard map 4.0" stopProcessing="true">
-            <match url="cloud/(4\.0\/)languages(\/([a-z0-9-]{2,}))(\/([a-z0-9_]+))" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy40.php?context=language&amp;languageid={R:3}&amp;keyboardid={R:5}" />
-        </rule>
-        <rule name="Language map 4.0" stopProcessing="true">
-            <match url="cloud/(4\.0\/)languages(\/([a-z0-9-]{2,}))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy40.php?context=language&amp;languageid={R:3}" />
-        </rule>
-        <rule name="Keyboard + Language Map 4.0" stopProcessing="true">
-            <match url="cloud/(4\.0\/)keyboards(\/([a-z0-9_]+))(\/([a-z0-9-]{2,}))" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy40.php?context=keyboard&amp;keyboardid={R:3}&amp;languageid={R:5}" />
-        </rule>
-        <rule name="Keyboard map 4.0" stopProcessing="true">
-            <match url="cloud/(4\.0\/)keyboards(\/([a-z0-9_]+))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy40.php?context=keyboard&amp;keyboardid={R:3}" />
-        </rule>
-        <rule name="Language + keyboard map 3.0" stopProcessing="true">
-            <match url="cloud/(3\.0\/)languages(\/([a-z0-9-]{2,}))(\/([a-z0-9_]+))" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy30.php?context=language&amp;languageid={R:3}&amp;keyboardid={R:5}" />
-        </rule>
-        <rule name="Language map 3.0" stopProcessing="true">
-            <match url="cloud/(3\.0\/)languages(\/([a-z0-9-]{2,}))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy30.php?context=language&amp;languageid={R:3}" />
-        </rule>
-        <rule name="Keyboard + Language Map 3.0" stopProcessing="true">
-            <match url="cloud/(3\.0\/)keyboards(\/([a-z0-9_]+))(\/([a-z0-9-]{2,}))" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy30.php?context=keyboard&amp;keyboardid={R:3}&amp;languageid={R:5}" />
-        </rule>
-        <rule name="Keyboard map 3.0" stopProcessing="true">
-            <match url="cloud/(3\.0\/)keyboards(\/([a-z0-9_]+))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy30.php?context=keyboard&amp;keyboardid={R:3}" />
-        </rule>
-        <rule name="Language map 2.0" stopProcessing="true">
-            <match url="cloud/(2\.0\/)languages(\/([a-z0-9-]{2,}))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy20.php?context=language&amp;languageid={R:3}" />
-        </rule>
-        <rule name="Keyboard + Language Map 2.0" stopProcessing="true">
-            <match url="cloud/(2\.0\/)keyboards(\/([a-z0-9_]+))(\/([a-z0-9-]{2,}))" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy20.php?context=keyboard&amp;keyboardid={R:3}&amp;languageid={R:5}" />
-        </rule>
-        <rule name="Keyboard map 2.0" stopProcessing="true">
-            <match url="cloud/(2\.0\/)keyboards(\/([a-z0-9_]+))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy20.php?context=keyboard&amp;keyboardid={R:3}" />
-        </rule>
-        <rule name="Language map" stopProcessing="true">
-            <match url="cloud/(1\.0\/)?languages(\/([a-z0-9-]{2,}))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy10.php?context=language&amp;languageid={R:3}" appendQueryString="true" />
-        </rule>
-        <rule name="Keyboard map" stopProcessing="true">
-            <match url="cloud/(1\.0\/)?keyboards(\/([a-z0-9_]+))?" />
-            <conditions logicalGrouping="MatchAll" trackAllCaptures="false" />
-            <action type="Rewrite" url="/script/legacy/legacy10.php?context=keyboard&amp;keyboardid={R:3}" appendQueryString="true" />
-        </rule>
-
-        <!-- Rewrites for /hooks -->
-
-        <rule name="/hooks/keyboards-build-success.json" stopProcessing="true">
-          <match url="hooks/keyboards-build-success.json" />
-          <action type="Rewrite" url="/script/hooks/keyboards-build-success.php?format=application/json" />
-        </rule>
-
-        <rule name="/hooks/keyboards-build-success" stopProcessing="true">
-          <match url="hooks/keyboards-build-success" />
-          <action type="Rewrite" url="/script/hooks/keyboards-build-success.php?format=text/plain" />
-        </rule>
-
-        <!-- Keyman for Windows 14.0+ API endpoints -->
-
-        <rule name="windows/14.0+/update" stopProcessing="true">
-          <match url="^windows/[1-9][0-9]\.[0-9]/update(.*)" />
-          <action type="Rewrite" url="/script/windows/14.0/update/index.php{R:1}" appendQueryString="true" />
-        </rule>
-
-        <!-- Keyman Desktop 10.0, 11.0, 12.0, etc API endpoints -->
-
-        <rule name="desktop/10.0-13.0/update" stopProcessing="true">
-          <match url="^desktop/(10|11|12|13)\.[0-9]/update(.*)" />
-          <action type="Rewrite" url="/script/desktop/10.0/update/index.php{R:2}" appendQueryString="true" />
-        </rule>
-
-        <rule name="desktop/10.0/exception" stopProcessing="true">
-          <!-- Note: this endpoint is also used by developer -->
-          <match url="^desktop/[1-9][0-9]\.[0-9]/exception(.*)" />
-          <action type="Rewrite" url="/script/desktop/10.0/exception/index.php{R:2}" appendQueryString="true" />
-        </rule>
-
-        <rule name="desktop/10.0/isonline" stopProcessing="true">
-          <match url="^desktop/[1-9][0-9]\.[0-9]/isonline(/?)$" />
-          <action type="Rewrite" url="/script/desktop/10.0/isonline/index.php" appendQueryString="true" />
-        </rule>
-
-        <rule name="desktop/10.0/submitdiag" stopProcessing="true">
-          <match url="^desktop/[1-9][0-9]\.[0-9]/submitdiag(/?)$" />
-          <action type="Rewrite" url="/script/desktop/10.0/submitdiag/index.php" appendQueryString="true" />
-        </rule>
-
-        <!-- Keyman Developer 10.0 - 13.0 API endpoints -->
-
-        <rule name="developer/10.0/update" stopProcessing="true">
-          <match url="^developer/(10|11|12|13)\.0/update(.*)" />
-          <action type="Rewrite" url="/script/developer/10.0/update/index.php{R:2}" appendQueryString="true" />
-        </rule>
-
-        <!-- KEyman Developer 14.0+ API endpoints -->
-
-        <rule name="developer/14.0+/update" stopProcessing="true">
-          <match url="^developer/[1-9][0-9]\.[0-9]/update(.*)" />
-          <action type="Rewrite" url="/script/developer/14.0/update/index.php{R:1}" appendQueryString="true" />
-        </rule>
-
-        <!-- Rewrites for 10.0, 11.0, 12.0, 13.0 locale download from tavultesoft.com -->
-
-        <rule name="Reverse Proxy for desktop/10.0-13.0/locale (removed in 14.0)" stopProcessing="true">
-          <match url="^desktop/(10\.0|11\.0|12\.0|13\.0)/locale(.*)" />
-          <action type="Rewrite" url="https://secure.tavultesoft.com/prog/100/downloadlocales/all.php{R:2}" />
-          <serverVariables>
-            <set name="HTTP_X_UNPROXIED_URL" value="https://secure.tavultesoft.com/prog/100/downloadlocales/all.php{R:2}" />
-            <set name="HTTP_X_ORIGINAL_ACCEPT_ENCODING" value="{HTTP_ACCEPT_ENCODING}" />
-            <set name="HTTP_X_ORIGINAL_HOST" value="{HTTP_HOST}" />
-            <set name="HTTP_ACCEPT_ENCODING" value="" />
-          </serverVariables>
-        </rule>
-      </rules>
-      <outboundRules>
-        <rule name="Add Strict-Transport-Security when HTTPS" enabled="true">
-          <match serverVariable="RESPONSE_Strict_Transport_Security" pattern=".*" />
-          <conditions>
-            <add input="{HTTPS}" pattern="on" ignoreCase="true" />
-          </conditions>
-          <action type="Rewrite" value="max-age=31536000" />
-        </rule>
-      </outboundRules>
-    </rewrite>
-  </system.webServer>
-</configuration>