diff --git a/HISTORY.md b/HISTORY.md
index a9a8505d7a..37318fe7f2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -213,6 +213,23 @@
 
 * chore: prepare 15.0 alpha (#4129)
 
+## 14.0.243 beta 2021-02-12
+
+* change(ios/app): Generate offline help from markdown (#4470)
+* fix(windows): tsysinfox64 not signed (#4486)
+* chore(android/app): Update help formatting and images (#4485)
+* fix(android/engine): Display welcome.htm help within the app (#4477)
+* fix(ios): tutorial's link to "Add a Keyboard" links directly to keyboard search (#4491)
+* feat(linux): Improve output of km-package-list-installed (#4481)
+
+## 14.0.242 beta 2021-02-11
+
+* fix(android/engine): Display online keyboard help (#4462)
+* fix(windows): Track modifier changes in UWP apps (#4468)
+* fix(common/resources): Fix help.keyman.com path for commit (#4469)
+* fix(common): create GitHub comments serially (#4472)
+* fix(linux): Fix dependencies on packages (#4464)
+
 ## 14.0.241 beta 2021-02-10
 
 * fix(common/resources): Just use master branch for help.keyman.com (#4459)
diff --git a/VERSION.md b/VERSION.md
index e63595d7c0..2c81c0f477 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-15.0.17
\ No newline at end of file
+15.0.17
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java
index 2d0b9bbc25..6094dab1b2 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java
@@ -1,9 +1,8 @@
 /*
- * Copyright (C) 2019 SIL International. All rights reserved.
+ * Copyright (C) 2019-2021 SIL International. All rights reserved.
  */
 package com.tavultesoft.kmapro;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -11,18 +10,14 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
 import android.app.DialogFragment;
-import android.app.DownloadManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.core.content.FileProvider;
 
-import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.ImageView;
@@ -31,21 +26,14 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.tavultesoft.kmea.ConfirmDialogFragment;
+import com.tavultesoft.kmea.KMHelpFileActivity;
 import com.tavultesoft.kmea.KMManager;
 import com.tavultesoft.kmea.KMKeyboardDownloaderActivity;
-import com.tavultesoft.kmea.cloud.CloudApiTypes;
-import com.tavultesoft.kmea.cloud.CloudDownloadMgr;
-import com.tavultesoft.kmea.cloud.impl.CloudKeyboardPackageDownloadCallback;
-import com.tavultesoft.kmea.cloud.impl.CloudLexicalPackageDownloadCallback;
-import com.tavultesoft.kmea.data.CloudRepository;
-import com.tavultesoft.kmea.data.Dataset;
 import com.tavultesoft.kmea.data.Keyboard;
 import com.tavultesoft.kmea.util.FileUtils;
 import com.tavultesoft.kmea.util.FileProviderUtils;
-import com.tavultesoft.kmea.util.HelpFile;
 import com.tavultesoft.kmea.util.KMLog;
 import com.tavultesoft.kmea.util.MapCompat;
 import com.tavultesoft.kmea.util.QRCodeUtil;
@@ -177,11 +165,11 @@ public final class KeyboardSettingsActivity extends AppCompatActivity {
         } else if (itemTitle.equals(getString(R.string.help_link))) {
           if (FileUtils.isWelcomeFile(customHelpLink)) {
             // Display local welcome.htm help file, including associated assets
-            Intent i = HelpFile.toActionView(context, customHelpLink, packageID);
-
-            if (FileProviderUtils.exists(context) || KMManager.isTestMode()) {
-              startActivity(i);
-            }
+            Intent i = new Intent(context, KMHelpFileActivity.class);
+            // Have to use package ID since we don't store the package name
+            i.putExtra(KMManager.KMKey_PackageID, packageID);
+            i.putExtra(KMManager.KMKey_CustomHelpLink, customHelpLink);
+            startActivity(i);
           } else {
             Intent i = new Intent(Intent.ACTION_VIEW);
             i.setData(Uri.parse(customHelpLink));
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 7019af1c94..15200b4bb1 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.tavultesoft.kmea.BaseActivity;
+import com.tavultesoft.kmea.KMHelpFileActivity;
 import com.tavultesoft.kmea.KMKeyboardDownloaderActivity;
 import com.tavultesoft.kmea.KMManager;
 import com.tavultesoft.kmea.KMManager.KeyboardType;
@@ -35,7 +36,6 @@ import com.tavultesoft.kmea.util.FileProviderUtils;
 import com.tavultesoft.kmea.util.FileUtils;
 import com.tavultesoft.kmea.util.DownloadFileUtils;
 import com.tavultesoft.kmea.util.DownloadIntentService;
-import com.tavultesoft.kmea.util.HelpFile;
 import com.tavultesoft.kmea.util.KMLog;
 import com.tavultesoft.kmea.util.KMPLink;
 
@@ -967,11 +967,11 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     if (customHelpLink != null && !customHelpLink.isEmpty() &&
         packageID != null && !packageID.isEmpty() && FileUtils.isWelcomeFile(customHelpLink)) {
       // Display local welcome.htm help file, including associated assets
-      Intent i = HelpFile.toActionView(context, customHelpLink, packageID);
-
-      if (FileProviderUtils.exists(context)) {
-        startActivity(i);
-      }
+      Intent i = new Intent(this, KMHelpFileActivity.class);
+      // Have to use packageID since we don't store the package name
+      i.putExtra(KMManager.KMKey_PackageID, packageID);
+      i.putExtra(KMManager.KMKey_CustomHelpLink, customHelpLink);
+      startActivity(i);
     }
   }
 
diff --git a/android/KMAPro/kMAPro/src/main/res/values-ann/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-ann/strings.xml
index 1ba8da1447..163349f5fe 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-ann/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-ann/strings.xml
@@ -105,8 +105,6 @@
   <string name="failed_to_extract" comment="Notification that keyboard package failed to unzip">Kpekọt isan̄a isibi</string>
   <!-- Context: KMP Package strings -->
   <string name="install_keyboard_package" comment="Title to install keyboard package">Wop Uwot-nge</string>
-  <!-- Context: KMP Package welcome.htm title -->
-  <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Onu me %1$s</string>
   <!-- Context: KMP Package strings -->
   <string name="install_predictive_text_package" comment="Title to install dictionary package">Wop Ikpa-usem</string>
   <!-- Context: KMP Package strings -->
diff --git a/android/KMAPro/kMAPro/src/main/res/values-de-rDE/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-de-rDE/strings.xml
index 71767f4fa8..6fae23d0b9 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-de-rDE/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-de-rDE/strings.xml
@@ -105,8 +105,6 @@
   <string name="failed_to_extract" comment="Notification that keyboard package failed to unzip">Entpacken fehlgeschlagen</string>
   <!-- Context: KMP Package strings -->
   <string name="install_keyboard_package" comment="Title to install keyboard package">Tastatur installieren</string>
-  <!-- Context: KMP Package welcome.htm title -->
-  <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Willkommen bei %1$s</string>
   <!-- Context: KMP Package strings -->
   <string name="install_predictive_text_package" comment="Title to install dictionary package">Wörterbuch installieren</string>
   <!-- Context: KMP Package strings -->
diff --git a/android/KMAPro/kMAPro/src/main/res/values-fr-rFR/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-fr-rFR/strings.xml
index e1c788b4e8..106dbc741c 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-fr-rFR/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-fr-rFR/strings.xml
@@ -107,8 +107,6 @@
   <string name="failed_to_extract" comment="Notification that keyboard package failed to unzip">Échec de l\'extraction</string>
   <!-- Context: KMP Package strings -->
   <string name="install_keyboard_package" comment="Title to install keyboard package">Installer un clavier</string>
-  <!-- Context: KMP Package welcome.htm title -->
-  <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Bienvenue à %1$s</string>
   <!-- Context: KMP Package strings -->
   <string name="install_predictive_text_package" comment="Title to install dictionary package">Installez un dictionnaire</string>
   <!-- Context: KMP Package strings -->
diff --git a/android/KMAPro/kMAPro/src/main/res/values-km-rKH/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-km-rKH/strings.xml
index e3a757c63b..2baba5b78f 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-km-rKH/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-km-rKH/strings.xml
@@ -104,8 +104,6 @@
   <string name="failed_to_extract" comment="Notification that keyboard package failed to unzip">មិន​អាច​ស្រង់​ចេញបាន​ទេ</string>
   <!-- Context: KMP Package strings -->
   <string name="install_keyboard_package" comment="Title to install keyboard package">ដំឡើង​ក្ដារចុច</string>
-  <!-- Context: KMP Package welcome.htm title -->
-  <string name="welcome_package" comment="Title to welcome.htm page (name and version)">ស្វាគមន៍​មកកាន់ %1$s</string>
   <!-- Context: KMP Package strings -->
   <string name="install_predictive_text_package" comment="Title to install dictionary package">ដំឡើង​បញ្ជី​ពាក្យ</string>
   <!-- Context: KMP Package strings -->
diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index 1285c9f2e7..772d3f0589 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -174,9 +174,6 @@
   <!-- Context: KMP Package strings -->
   <string name="install_keyboard_package" comment="Title to install keyboard package">Install Keyboard</string>
 
-  <!-- Context: KMP Package welcome.htm title -->
-  <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Welcome to %1$s</string>
-
   <!-- Context: KMP Package strings -->
   <string name="install_predictive_text_package" comment="Title to install dictionary package">Install Dictionary</string>
 
diff --git a/android/KMEA/app/src/main/AndroidManifest.xml b/android/KMEA/app/src/main/AndroidManifest.xml
index aab539f437..fe795afa30 100644
--- a/android/KMEA/app/src/main/AndroidManifest.xml
+++ b/android/KMEA/app/src/main/AndroidManifest.xml
@@ -29,6 +29,12 @@
             android:label=""
             android:theme="@style/Theme.AppCompat.Light.Dialog">
         </activity>
+        <activity
+            android:name="com.tavultesoft.kmea.KMHelpFileActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
         <activity
             android:name="com.tavultesoft.kmea.ModelPickerActivity"
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMHelpFileActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMHelpFileActivity.java
new file mode 100644
index 0000000000..38e96792de
--- /dev/null
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KMHelpFileActivity.java
@@ -0,0 +1,175 @@
+/**
+ * Copyright (C) 2021 SIL International. All rights reserved.
+ */
+
+package com.tavultesoft.kmea;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.FileProvider;
+
+import com.tavultesoft.kmea.packages.PackageProcessor;
+import com.tavultesoft.kmea.util.FileProviderUtils;
+import com.tavultesoft.kmea.util.FileUtils;
+import com.tavultesoft.kmea.util.HelpFile;
+
+import java.io.File;
+
+import static android.app.Application.getProcessName;
+
+/**
+ * Display Keyboard help file
+ */
+public class KMHelpFileActivity extends BaseActivity {
+  private static final String TAG = "KMHelpFileActivity";
+  private WebView webView;
+  private Button finishButton;
+  private String pkgID;
+
+  @SuppressLint({"SetJavaScriptEnabled", "InflateParams"})
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    final Context context = this;
+
+    setContentView(R.layout.activity_help_file_layout);
+
+    Bundle bundle = getIntent().getExtras();
+    pkgID = "";
+    String url = "";
+    if (bundle != null) {
+      pkgID = bundle.getString(KMManager.KMKey_PackageID);
+      url = bundle.getString(KMManager.KMKey_CustomHelpLink);
+    }
+
+    finishButton = (Button) findViewById(R.id.finishButton);
+    finishButton.setOnClickListener(new OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        finish();
+        overridePendingTransition(0, android.R.anim.fade_out);
+      }
+    });
+
+    Toolbar toolbar = (Toolbar) findViewById(R.id.titlebar);
+    ActionBar actionBar = getSupportActionBar();
+    if (actionBar != null) {
+      actionBar.setTitle(null);
+      actionBar.setDisplayUseLogoEnabled(false);
+      actionBar.setDisplayShowHomeEnabled(false);
+      actionBar.setDisplayShowTitleEnabled(false);
+      actionBar.setDisplayShowCustomEnabled(true);
+    }
+
+    TextView packageActivityTitle = (TextView) findViewById(R.id.bar_title);
+    String titleStr = String.format(getString(R.string.welcome_package), pkgID);
+    packageActivityTitle.setText(titleStr);
+    packageActivityTitle.setTextColor(getResources().getColor(android.R.color.black));
+
+    webView = (WebView) findViewById(R.id.kmHelpFileWebView);
+    webView.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL);
+    webView.getSettings().setJavaScriptEnabled(true);
+    webView.getSettings().setAllowFileAccess(true);
+    webView.getSettings().setAllowFileAccessFromFileURLs(true);
+    webView.getSettings().setAllowUniversalAccessFromFileURLs(true);
+    webView.getSettings().setUseWideViewPort(true);
+    webView.getSettings().setLoadWithOverviewMode(true);
+    webView.getSettings().setBuiltInZoomControls(true);
+    webView.getSettings().setSupportZoom(true);
+    webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+
+    webView.setWebChromeClient(new WebChromeClient() {
+      public void onProgressChanged(WebView view, int progress) {
+      }
+    });
+    webView.setWebViewClient(new WebViewClient() {
+      @Override
+      public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+      }
+
+      @Override
+      public boolean shouldOverrideUrlLoading(WebView view, String url) {
+        String lowerURL = url.toLowerCase();
+        if (lowerURL.equals("about:blank")) {
+          return true; // never load a blank page, e.g. when the component initializes
+        } else if (FileUtils.hasPDFExtension(url)) {
+          // Special case to view pdf files
+          url = url.replace("file://", "");
+          Intent i = HelpFile.toActionView(context, url, pkgID);
+          if (FileProviderUtils.exists(context) || KMManager.isTestMode()) {
+            startActivity(i);
+            return true;
+          }
+        }
+
+        // Display URL
+        return false;
+      }
+
+      @Override
+      public void onPageStarted(WebView view, String url, Bitmap favicon) {
+      }
+
+      @Override
+      public void onPageFinished(WebView view, String url) {
+        // Inject a meta viewport tag into the head of the file if it doesn't exist
+        webView.loadUrl(
+          "javascript:(function() {" +
+            "if(!document.querySelectorAll('meta[name=viewport]').length) {"+
+            "let meta=document.createElement('meta');"+
+            "meta.name='viewport';"+
+            "meta.content='width=device-width, initial-scale=1';"+
+            "document.head.appendChild(meta);"+
+            "}"+
+            "})()"
+        );
+      }
+    });
+
+    webView.loadUrl("file:///" + url);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    if (webView != null) {
+      webView.reload();
+    }
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+  }
+
+  @Override
+  public void onBackPressed() {
+    if (webView != null && webView.canGoBack()) {
+      webView.goBack();
+    } else {
+      super.onBackPressed();
+    }
+  }
+}
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java
index fc9c22a0d1..006d357635 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/KeyboardInfoActivity.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2017 SIL International. All rights reserved.
+ * Copyright (C) 2017-2021 SIL International. All rights reserved.
  */
 
 package com.tavultesoft.kmea;
@@ -31,9 +31,9 @@ import android.widget.Toast;
 import com.tavultesoft.kmea.data.Keyboard;
 import com.tavultesoft.kmea.util.FileProviderUtils;
 import com.tavultesoft.kmea.util.FileUtils;
-import com.tavultesoft.kmea.util.HelpFile;
 import com.tavultesoft.kmea.util.MapCompat;
 import com.tavultesoft.kmea.util.QRCodeUtil;
+import com.tavultesoft.kmea.KMHelpFileActivity;
 
 // Public access is necessary to avoid IllegalAccessException
 public final class KeyboardInfoActivity extends BaseActivity {
@@ -127,11 +127,11 @@ public final class KeyboardInfoActivity extends BaseActivity {
         if (position == 1) {
           if (FileUtils.isWelcomeFile(customHelpLink)) {
             // Display local welcome.htm help file, including associated assets
-            Intent i = HelpFile.toActionView(context, customHelpLink, packageID);
+            Intent i = new Intent(context, KMHelpFileActivity.class);
+            i.putExtra(KMManager.KMKey_PackageID, packageID);
+            i.putExtra(KMManager.KMKey_CustomHelpLink, customHelpLink);
 
-            if (FileProviderUtils.exists(context)|| KMManager.isTestMode()) {
-              startActivity(i);
-            }
+            startActivity(i);
           } else {
             Intent i = new Intent(Intent.ACTION_VIEW);
             i.setData(Uri.parse(customHelpLink));
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java
index 80f45ed553..be1091966e 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/ModelInfoActivity.java
@@ -1,22 +1,16 @@
 /*
- * Copyright (C) 2017 SIL International. All rights reserved.
+ * Copyright (C) 2017-2021 SIL International. All rights reserved.
  */
 package com.tavultesoft.kmea;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import android.app.DialogFragment;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Typeface;
-import android.net.Uri;
 import android.os.Bundle;
-import androidx.core.content.FileProvider;
-import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.widget.AdapterView;
@@ -24,16 +18,11 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.tavultesoft.kmea.data.CloudRepository;
-import com.tavultesoft.kmea.data.Dataset;
-import com.tavultesoft.kmea.data.Keyboard;
 import com.tavultesoft.kmea.data.LexicalModel;
-import com.tavultesoft.kmea.util.FileUtils;
 import com.tavultesoft.kmea.util.FileProviderUtils;
-import com.tavultesoft.kmea.util.HelpFile;
 import com.tavultesoft.kmea.util.MapCompat;
+import com.tavultesoft.kmea.KMHelpFileActivity;
 
 import static com.tavultesoft.kmea.ConfirmDialogFragment.DialogType.DIALOG_TYPE_DELETE_MODEL;
 
@@ -150,11 +139,11 @@ public final class ModelInfoActivity extends BaseActivity {
         } else if (itemTitle.equals(getString(R.string.help_link))) {
           if (!customHelpLink.equals("")) {
             // Display local welcome.htm help file, including associated assets
-            Intent i = HelpFile.toActionView(context, customHelpLink, packageID);
-
-            if (FileProviderUtils.exists(context) || KMManager.isTestMode()) {
-              startActivity(i);
-            }
+            Intent i = new Intent(context, KMHelpFileActivity.class);
+            // Have to use packageID since we don't store the package name
+            i.putExtra(KMManager.KMKey_PackageID, packageID);
+            i.putExtra(KMManager.KMKey_CustomHelpLink, customHelpLink);
+            startActivity(i);
           } else {
             // We should always have a help file packaged with models.
           }
diff --git a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/util/HelpFile.java b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/util/HelpFile.java
index bea5cbbcb0..d3cda63a95 100644
--- a/android/KMEA/app/src/main/java/com/tavultesoft/kmea/util/HelpFile.java
+++ b/android/KMEA/app/src/main/java/com/tavultesoft/kmea/util/HelpFile.java
@@ -1,3 +1,7 @@
+/**
+ * Copyright (C) 2021 SIL International. All rights reserved.
+ */
+
 package com.tavultesoft.kmea.util;
 
 import android.content.ClipData;
@@ -18,25 +22,18 @@ import java.io.FileFilter;
 
 public final class HelpFile {
   private static final String TAG = "HelpFile";
-  private static final String[] ASSET_MIME_TYPES =  {
-    ClipDescription.MIMETYPE_TEXT_HTML,
-    "application/pdf",
-    "text/css",
-    "image/gif",
-    "image/jpeg",
-    "image/png"};
 
   /**
-   * Utility to pass a help file and all associated assets to an Intent for Intent.ACTION_VIEW
+   * Utility to pass a pdf help file for Intent.ACTION_VIEW
    * @param context
-   * @param helpFile Full path string of the html file to view
+   * @param helpFile Full path string of the pdf file to view
    * @param packageID String of the package ID
    * @return Intent
    */
   public static Intent toActionView(Context context, String helpFile, String packageID) {
     Intent i = new Intent(Intent.ACTION_VIEW);
 
-    if (FileUtils.isWelcomeFile(helpFile) && ! KMManager.isTestMode()) {
+    if (FileUtils.hasPDFExtension(helpFile) && ! KMManager.isTestMode()) {
       File customHelp = new File(new File(helpFile).getAbsolutePath());
       i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
       // Starting with Android N, you can't pass file:// to intents, so we use FileProvider
@@ -44,41 +41,8 @@ public final class HelpFile {
         final String authority = FileProviderUtils.getAuthority(context);
         Uri contentUri = FileProvider.getUriForFile(
           context, authority, customHelp);
-        i.setDataAndType(contentUri, "text/html");
+        i.setDataAndType(contentUri, "application/pdf");
 
-        // Grant read permission to all the files in the package so embedded assets can be viewed
-        ClipData clipData = new ClipData(null, ASSET_MIME_TYPES, new ClipData.Item(contentUri));
-
-        // Exclude html help files and JS files. Treat rest of the files as assets
-        FileFilter _fileFilter = new FileFilter() {
-          @Override
-          public boolean accept(File pathname) {
-            String name = pathname.getName();
-            if (pathname.isFile() && (FileUtils.isReadmeFile(name) ||
-              FileUtils.isWelcomeFile(name) || FileUtils.hasJavaScriptExtension(name))) {
-              return false;
-            }
-            return true;
-          }
-        };
-
-        String base  = helpFile.contains("packages") ? "packages" : "models";
-        File packageDir = new File(
-          context.getDir("data", Context.MODE_PRIVATE), base + File.separator + packageID + File.separator);
-        File[] files = packageDir.listFiles(_fileFilter);
-        for(File assetFile : files) {
-          Uri assetUri = FileProvider.getUriForFile(
-            context, authority, assetFile);
-          // Special handling for PDF
-          if (FileUtils.hasPDFExtension(assetUri.toString())) {
-            clipData.addItem(new ClipData.Item(assetUri));
-          } else {
-            clipData.addItem(new ClipData.Item(assetUri));
-          }
-        }
-
-        // Associate assets in clipData to the intent
-        i.setClipData(clipData);
         i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         i.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
diff --git a/android/KMEA/app/src/main/res/layout/activity_help_file_layout.xml b/android/KMEA/app/src/main/res/layout/activity_help_file_layout.xml
new file mode 100644
index 0000000000..48efc25f92
--- /dev/null
+++ b/android/KMEA/app/src/main/res/layout/activity_help_file_layout.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+
+  <include layout="@layout/titlebar" />
+
+  <WebView
+    android:id="@+id/kmHelpFileWebView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_below="@+id/titlebar"
+    android:layout_above="@+id/buttonBar" />
+
+  <LinearLayout
+    android:id="@+id/buttonBar"
+    style="?android:attr/buttonBarStyle"
+    android:layout_alignParentBottom="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <!-- Spacer to pad buttons to the right -->
+    <View
+      android:layout_width="0dp"
+      android:layout_height="0dp"
+      android:layout_weight="1" />
+
+    <Button
+      android:id="@+id/finishButton"
+      style="@style/Widget.AppCompat.Button.Borderless.Colored"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/label_ok"
+      android:elevation="1dp"
+      android:singleLine="true"
+      android:layout_marginStart="10dp" android:layout_marginEnd="15dp">
+      <requestFocus/>
+    </Button>
+
+  </LinearLayout>
+
+</RelativeLayout>
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/titlebar.xml b/android/KMEA/app/src/main/res/layout/titlebar.xml
similarity index 100%
rename from android/KMAPro/kMAPro/src/main/res/layout/titlebar.xml
rename to android/KMEA/app/src/main/res/layout/titlebar.xml
diff --git a/android/KMEA/app/src/main/res/values-ann/strings.xml b/android/KMEA/app/src/main/res/values-ann/strings.xml
index 5a73b08c3d..11c7ba2c31 100644
--- a/android/KMEA/app/src/main/res/values-ann/strings.xml
+++ b/android/KMEA/app/src/main/res/values-ann/strings.xml
@@ -63,6 +63,8 @@
     <string name="keyboard_picker_new_keyboard" comment="Mark a language name that's newly installed in keyboard list">[aya] %1$s</string>
     <!-- Context: Keyboard Info and Keyboard Settings -->
     <string name="keyboard_qr_code" comment="QR Code description">      Gwuku iman̄ yi kè òbọkọ\nuwot-nge yi me ofifi okwukwut</string>
+    <!-- Context: Keyboard Help welcome.htm title -->
+    <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Onu me %1$s</string>
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Wèek ikpa-usem òje me lek bọkọ tap</string>
     <!-- Context: Model Updates -->
diff --git a/android/KMEA/app/src/main/res/values-de-rDE/strings.xml b/android/KMEA/app/src/main/res/values-de-rDE/strings.xml
index b9a06bd466..452d732bf2 100644
--- a/android/KMEA/app/src/main/res/values-de-rDE/strings.xml
+++ b/android/KMEA/app/src/main/res/values-de-rDE/strings.xml
@@ -63,6 +63,8 @@
     <string name="keyboard_picker_new_keyboard" comment="Mark a language name that's newly installed in keyboard list">[neu] %1$s</string>
     <!-- Context: Keyboard Info and Keyboard Settings -->
     <string name="keyboard_qr_code" comment="QR Code description">      Scannen Sie diesen Code, um diese\nTastatur auf einem anderen Gerät zu laden</string>
+    <!-- Context: KMP Package welcome.htm title -->
+    <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Willkommen bei %1$s</string>
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Suche nach zugehörigem Wörterbuch zum Herunterladen</string>
     <!-- Context: Model Updates -->
diff --git a/android/KMEA/app/src/main/res/values-fr-rFR/strings.xml b/android/KMEA/app/src/main/res/values-fr-rFR/strings.xml
index b5d6816e82..58e4805793 100644
--- a/android/KMEA/app/src/main/res/values-fr-rFR/strings.xml
+++ b/android/KMEA/app/src/main/res/values-fr-rFR/strings.xml
@@ -63,6 +63,8 @@
     <string name="keyboard_picker_new_keyboard" comment="Mark a language name that's newly installed in keyboard list">[nouveau] %1$s</string>
     <!-- Context: Keyboard Info and Keyboard Settings -->
     <string name="keyboard_qr_code" comment="QR Code description">      Scannez ce code pour charger ce clavier\nsur un autre appareil</string>
+    <!-- Context: Keyboard Help welcome.htm title -->
+    <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Bienvenue à %1$s</string>
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Vérification du dictionnaire associé à télécharger</string>
     <!-- Context: Model Updates -->
diff --git a/android/KMEA/app/src/main/res/values-km-rKH/strings.xml b/android/KMEA/app/src/main/res/values-km-rKH/strings.xml
index 42a7a39dfc..f6b833b134 100644
--- a/android/KMEA/app/src/main/res/values-km-rKH/strings.xml
+++ b/android/KMEA/app/src/main/res/values-km-rKH/strings.xml
@@ -60,6 +60,8 @@
     <string name="uninstall_keyboard" comment="Label for uninstalling keyboard">លុប​ក្ដារចុច</string>
     <!-- Context: Keyboard Info and Keyboard Settings -->
     <string name="keyboard_picker_new_keyboard" comment="Mark a language name that's newly installed in keyboard list">[ថ្មី] %1$s</string>
+    <!-- Context: Keyboard Help welcome.htm title -->
+    <string name="welcome_package" comment="Title to welcome.htm page (name and version)">ស្វាគមន៍​មកកាន់ %1$s</string>
     <!-- Context: Keyboard Info and Keyboard Settings -->
     <string name="keyboard_qr_code" comment="QR Code description">      ស្កេនកូដ​នេះដើម្បី​ផ្ទុក​ក្ដារចុចនេះ\n​នៅ​លើ​ឧបករណ៍​ផ្សេង</string>
     <!-- Context: Query for associated dictionary -->
diff --git a/android/KMEA/app/src/main/res/values/strings.xml b/android/KMEA/app/src/main/res/values/strings.xml
index 43c626951f..982a3cc79b 100644
--- a/android/KMEA/app/src/main/res/values/strings.xml
+++ b/android/KMEA/app/src/main/res/values/strings.xml
@@ -102,6 +102,11 @@
     <string name="keyboard_qr_code" comment="QR Code description">
       Scan this code to load this\nkeyboard on another device</string>
 
+
+    <!-- Context: Keyboard Help welcome.htm title -->
+    <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Welcome to %1$s</string>
+
+
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Checking for associated dictionary to download</string>
 
diff --git a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java b/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java
index 21fcec27cc..e0e23b58ed 100644
--- a/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java
+++ b/android/KMEA/app/src/test/java/com/tavultesoft/kmea/view/KeyboardPickerTest.java
@@ -9,6 +9,7 @@ import android.widget.ListView;
 import androidx.test.core.app.ApplicationProvider;
 
 import com.tavultesoft.kmea.KMManager;
+import com.tavultesoft.kmea.KMHelpFileActivity;
 import com.tavultesoft.kmea.KeyboardInfoActivity;
 import com.tavultesoft.kmea.KeyboardPickerActivity;
 import com.tavultesoft.kmea.R;
@@ -183,7 +184,7 @@ public class KeyboardPickerTest {
       // check result intent to be a weblink to open
       Intent actual2 = Shadows.shadowOf(_info).getNextStartedActivity();
       Assert.assertNotNull(actual2);
-      Assert.assertEquals(actual2.getAction(),Intent.ACTION_VIEW);
+      Assert.assertEquals("com.tavultesoft.kmea.KMHelpFileActivity", actual2.getComponent().getClassName());
     }
     finally {
       if(_controller2!=null)
diff --git a/android/README.md b/android/README.md
index a1e5b6703b..c1af6669ee 100644
--- a/android/README.md
+++ b/android/README.md
@@ -4,6 +4,7 @@
 * Android Studio 4.1+
 * Java SE Development Kit 8 
 * [Node.js](https://nodejs.org/) 8.9+ (for building KeymanWeb)
+* [Pandoc](#Install-Pandoc) for generating offline help
 
 ## Install Java
 It is recommended to use openJDK because of oracle license issues.
diff --git a/android/build-help.sh b/android/build-help.sh
index 91e6eb5c18..02e236e903 100644
--- a/android/build-help.sh
+++ b/android/build-help.sh
@@ -71,7 +71,7 @@ displayInfo "" \
 
 cd $KEYMAN_ROOT/android/help
 
-MDLUA="$THIS_DIR/htmlink.lua"
+MDLUA="$KEYMAN_ROOT/resources/build/htmlink.lua"
 MD=`find -name "*.md"`
 DESTHTM="$THIS_DIR/KMAPro/kMAPro/src/main/assets/info"
 
diff --git a/android/help/android_images/dist-readme-ap.png b/android/help/android_images/dist-readme-ap.png
deleted file mode 100644
index 1a8d116863..0000000000
Binary files a/android/help/android_images/dist-readme-ap.png and /dev/null differ
diff --git a/android/help/android_images/dist-readme-at.png b/android/help/android_images/dist-readme-at.png
deleted file mode 100644
index d6af1b5c84..0000000000
Binary files a/android/help/android_images/dist-readme-at.png and /dev/null differ
diff --git a/android/help/android_images/dist-welcome-ap.png b/android/help/android_images/dist-welcome-ap.png
deleted file mode 100644
index 8d753979b1..0000000000
Binary files a/android/help/android_images/dist-welcome-ap.png and /dev/null differ
diff --git a/android/help/android_images/dist-welcome-at.png b/android/help/android_images/dist-welcome-at.png
deleted file mode 100644
index 9ef2ce4b37..0000000000
Binary files a/android/help/android_images/dist-welcome-at.png and /dev/null differ
diff --git a/android/help/android_images/dl-success-ap.png b/android/help/android_images/dl-success-ap.png
index 847ba5e4ee..a8ba037415 100644
Binary files a/android/help/android_images/dl-success-ap.png and b/android/help/android_images/dl-success-ap.png differ
diff --git a/android/help/android_images/dl-success-at.png b/android/help/android_images/dl-success-at.png
deleted file mode 100644
index d47af615e8..0000000000
Binary files a/android/help/android_images/dl-success-at.png and /dev/null differ
diff --git a/android/help/android_images/khmer-readme-a.png b/android/help/android_images/khmer-readme-a.png
index 3d6d1799df..6ed6c1ae72 100644
Binary files a/android/help/android_images/khmer-readme-a.png and b/android/help/android_images/khmer-readme-a.png differ
diff --git a/android/help/android_images/khmer-welcome-a.png b/android/help/android_images/khmer-welcome-a.png
index faeeff79e1..63db0dc29c 100644
Binary files a/android/help/android_images/khmer-welcome-a.png and b/android/help/android_images/khmer-welcome-a.png differ
diff --git a/android/help/android_images/settings-language-ap.png b/android/help/android_images/settings-language-ap.png
index c8c678d94e..fdb386571a 100644
Binary files a/android/help/android_images/settings-language-ap.png and b/android/help/android_images/settings-language-ap.png differ
diff --git a/android/help/basic/installing-custom-packages.md b/android/help/basic/installing-custom-packages.md
index 9b3ab55400..dc2971db99 100644
--- a/android/help/basic/installing-custom-packages.md
+++ b/android/help/basic/installing-custom-packages.md
@@ -42,7 +42,7 @@ This will be displayed at the confirmation to install the keyboard package.
 If "readme.htm" is not included, a generic page with the package ID and package version will be shown. Click the
 **"Install"** button to install the entire keyboard package.
 
-![](../android_images/dist-readme-ap.png)
+![](../android_images/khmer-readme-a.png)
 
 Step 5) All the keyboards in the package are installed as a group. In this example, the package only has the
 "Khmer Angkor" keyboard, so it becomes the active keyboard. For custom dictionary packages, only one dictionary
@@ -51,7 +51,7 @@ will be installed.
 If the keyboard package includes Welcome documentation, it will be displayed after the keyboard package is installed.
 This documentation helps you to get started using the keyboard.
 
-![](../android_images/dist-welcome-ap.png)
+![](../android_images/khmer-welcome-a.png)
 
 Click the **"OK"** button to finish installing the keyboard. You should be able to select it from the Keyman globe
 and start typing with it in any app.
diff --git a/android/help/context/menu-phone.md b/android/help/context/menu-phone.md
index 2288644cbb..6db638c3d8 100644
--- a/android/help/context/menu-phone.md
+++ b/android/help/context/menu-phone.md
@@ -2,7 +2,7 @@
 title: Keyman for Android (Phone Layout)
 ---
 
-|   | Keyboard Keys (Keyboard Present) |
+|   | Keyboard Keys <br/>(Keyboard Present) |
 |---|---|
 | ![](../android_images/globe-ap.png) | Select another language/keyboard |
 | ![](../android_images/hide-keyboard-ap.png) | Hide the keyboard |
@@ -11,6 +11,11 @@ title: Keyman for Android (Phone Layout)
 | ![](../android_images/shift-ap.png) | Shift key. Long press this key to access the <kbd>CTRL</kbd>, <kbd>ALT</kbd> and <kbd>CTRL</kbd><kbd>ALT</kbd> keys (which can access additional key layers) |
 | ![](../android_images/touch-hold-ap.png) | Keys with a small dot in the top right corner indicate a long press key. Access further functionality by long pressing the key |
 | ![](../android_images/share-a.png) | Share your text with other apps like Messages, Gmail, or Twitter. Some versions of Android also let you copy your text to the clipboard. |
+
+----
+
+|   | Toolbar Icons
+|---|---|
 | ![](../android_images/browser-a.png) | Open the Keyman Browser to use the web in your language |
 | ![](../android_images/menu-icon-a.png) | Open the menu for additional options |
 | ![](../android_images/font-size-a.png) | Adjust the font size |
diff --git a/android/help/context/menu-tablet.md b/android/help/context/menu-tablet.md
index 30c46c8f05..cebf6bfda1 100644
--- a/android/help/context/menu-tablet.md
+++ b/android/help/context/menu-tablet.md
@@ -2,7 +2,7 @@
 title: Keyman for Android (Tablet Layout)
 ---
 
-|   | Keyboard Keys (Keyboard Present) |
+|   | Keyboard Keys <br/>(Keyboard Present) |
 |---|---|
 | ![](../android_images/globe-at.png) | Select another language/keyboard |
 | ![](../android_images/hide-keyboard-at.png) | Hide the keyboard |
@@ -10,6 +10,11 @@ title: Keyman for Android (Tablet Layout)
 | ![](../android_images/return-at.png) | Return |
 | ![](../android_images/shift-at.png) | Shift key. Long press this key to access the <kbd>CTRL</kbd>, <kbd>ALT</kbd> and <kbd>CTRL</kbd><kbd>ALT</kbd> keys (which can access additional key layers) |
 | ![](../android_images/touch-hold-at.png) | Keys with a small dot in the top right corner indicate a long press key. Access further functionality by long pressing the key |
+
+----
+
+|   | Toolbar Icons
+|---|---|
 | ![](../android_images/share-a.png) | Share your text with other atps like Messages, Gmail, or Twitter. Some versions of Android also let you copy your text to the clipboard. |
 | ![](../android_images/browser-a.png) | Open the Keyman Browser to use the web in your language |
 | ![](../android_images/menu-icon-a.png) | Open the menu for additional options |
diff --git a/common/core/web/keyboard-processor/src/text/outputTarget.ts b/common/core/web/keyboard-processor/src/text/outputTarget.ts
index 87c0382ab6..64c12ea5cf 100644
--- a/common/core/web/keyboard-processor/src/text/outputTarget.ts
+++ b/common/core/web/keyboard-processor/src/text/outputTarget.ts
@@ -288,7 +288,8 @@ namespace com.keyman.text {
 
       this.text = text ? text : "";
       var defaultLength = this.text._kmwLength();
-      this.caretIndex = caretPos ? caretPos : defaultLength;
+      // Ensures that `caretPos == 0` is handled correctly.
+      this.caretIndex = typeof caretPos == "number" ? caretPos : defaultLength;
     }
 
     // Clones the state of an existing EditableElement, creating a Mock version of its state.
diff --git a/ios/.gitignore b/ios/.gitignore
index 2f451173f7..ff589919ee 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -17,9 +17,12 @@ engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyman-sentr
 Keyman 2*
 Carthage
 
+# Generated offline help
+keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources
+
 # Explicitly ignores just the SWKeyboard scheme; testing against different
 # targets makes a lot of noise.
 **/SWKeyboard.scheme
 
 # Ignores exported localization files.
-en.xcloc
\ No newline at end of file
+en.xcloc
diff --git a/ios/README.md b/ios/README.md
index 107ce7725d..dd5ff1afdf 100644
--- a/ios/README.md
+++ b/ios/README.md
@@ -3,13 +3,20 @@
 ## Prerequisites
 * Xcode 9.1
 * iOS 8+
+* [Node.js](https://nodejs.org/) 8.9+ (for building the embedded KeymanWeb engine)
 * SwiftLint (`brew install swiftlint`)
 * Carthage (`brew install carthage`)
-* [Node.js](https://nodejs.org/) 8.9+ (for building KeymanWeb)
+  - If using Xcode 12 or later, note that you may need to use the instructions found at https://github.com/Carthage/Carthage/blob/master/Documentation/Xcode12Workaround.md
+  - We plan to update to use of Carthage 0.37's .xcframeworks solution early in the 15.0 development cycle once 14.0 has successfully released, which will negate the need for the workaround mentioned above.
+* Pandoc (`brew install pandoc`)
+  - Used solely to generate offline help.
 * Coreutils (`brew install coreutils`)
 * sentry-cli (`brew install getsentry/tools/sentry-cli`) to utilize Sentry-based error reporting
 * jq (`brew install jq`)
 
+Note that the `brew` command mentioned above is Homebrew, which may be found at https://brew.sh/.
+While not strictly necessary, it certainly simplifies installing the prerequisites above.
+
 ## Keyman App
 
 The source for our published iOS Keyman app is found within the **keyman/** subdirectory. This project only contains
diff --git a/ios/build-help.sh b/ios/build-help.sh
index 6dbd8408d6..1049226306 100755
--- a/ios/build-help.sh
+++ b/ios/build-help.sh
@@ -1,47 +1,108 @@
 #!/bin/bash
 
-# Uses the open-source `wget` utility to create an embedding-friendly offline mirror
-# equivalent of the online iOS help.
+# Set sensible script defaults:
+# set -e: Terminate script if a command returns an error
+set -e
+# set -u: Terminate script if an unset variable is used
+set -u
 
-HELP_ROOT=keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")"
+. "$(dirname "$THIS_SCRIPT")/../resources/build/build-utils.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
 
-VERSION=`cat ../resources/VERSION.md`
+QUIET=0
 
-# If TIER is set to "alpha", use the previous version.  Help is usually only updated during
-# the "beta" process.
-if [ -z $TIER ]; then
-  # Prevents an error message on the next check.  Also, manual runs will likely be during beta.
-  TIER=beta
+. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+
+THIS_DIR="$(dirname "$THIS_SCRIPT")"
+
+display_usage() {
+  echo "build.sh [--no-clean] target [...target]"
+  echo "Builds help documentation for Keyman for iPhone and iPad"
+  echo "Targets:"
+  echo "  * htm or html: convert documentation to html using pandoc"
+  echo
+  echo " --no-clean: don't clean target folder before building"
+}
+
+DO_HTM=false
+DO_CLEAN=true
+
+# Debug flags
+DO_HTM_CONVERSION=true
+
+#
+# Parse args
+#
+
+shopt -s nocasematch
+
+while [[ $# -gt 0 ]] ; do
+  key="$1"
+  case $key in
+    htm | html)
+      DO_HTM=true
+      ;;
+    --no-clean)
+      DO_CLEAN=false
+      ;;
+    *)
+      display_usage
+      exit 1
+  esac
+  shift # past argument
+done
+
+if ! $DO_HTM ; then
+  display_usage
+  exit 1
 fi
 
-if [ $TIER = "alpha" ]; then
-  # More readable:  (major).minor
-  [[ "$VERSION" =~ ([0-9]+)\.[0-9]+ ]]
-  # Construct a decremented version string with .minor set to .0
-  VERSION="$((${BASH_REMATCH[1]}-1)).0"
+displayInfo "" \
+  "DO_HTM: $DO_HTM" \
+  "DO_CLEAN: $DO_CLEAN" \
+  ""
+
+#
+# Compile all .md to .html
+#
+
+cd $KEYMAN_ROOT/ios/help
+
+MDLUA="$KEYMAN_ROOT/resources/build/htmlink.lua"
+MD=`find . -name "*.md"`
+DESTHTM="$THIS_DIR/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources"
+
+if $DO_HTM; then
+  #
+  # Clean existing folder
+  #
+
+  if $DO_CLEAN; then
+    rm -rf "$DESTHTM" || true # We don't want to die when we clean an empty folder
+  fi
+  mkdir -p "$DESTHTM"
+
+  #
+  # Generate HTML files from Markdown
+  #
+
+  if $DO_HTM_CONVERSION; then
+    for INFILE in $MD; do
+      OUTFILE="$DESTHTM/${INFILE%.md}.html"
+      echo "Processing $INFILE to $(basename "$OUTFILE")"
+      mkdir -p "$(dirname "$OUTFILE")"
+      pandoc -s --lua-filter="$MDLUA" -t html -o "$OUTFILE" $INFILE
+    done
+  fi
+
+  #
+  # Copy Images
+  #
+  cd $KEYMAN_ROOT/ios/help/
+  mkdir -p "$DESTHTM/ios_images"
+  cp ios_images/* "$DESTHTM/ios_images/"
+
 fi
-
-# Clear previous help file downloads (if they exist)
-if [ -d "$HELP_ROOT" ]; then
-  rm -r "$HELP_ROOT"
-fi
-
-# Create local mirror of the help page subdirectory.
-# We don't need /font/deploy folder resources, so they're excluded here.
-# One of the .css files auto-includes them otherwise.
-wget --mirror \
-     --convert-links \
-     --wait=2 \
-     --keep-session-cookies \
-     --page-requisites \
-     --no-parent \
-     --restrict-file-names=windows \
-     --exclude-directories /font/deploy \
-     --directory-prefix="$HELP_ROOT" \
-     --no-directories \
-     --default-page=index.php \
-     --adjust-extension \
-     "help.keyman.com/products/iphone-and-ipad/$VERSION/index.php?embed=ios"
-
-# Results in a flat-structured mirror of the iphone-and-ipad/$VERSION folder,
-# together with all needed resources within the 'site' folder.
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift
index 019b86d0c6..359e2f283e 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Settings/InstalledLanguagesViewController.swift
@@ -439,8 +439,8 @@ public class InstalledLanguagesViewController: UITableViewController, UIAlertVie
 }
 
 extension InstalledLanguagesViewController {
-  
-  @objc func addClicked(_ sender: Any) {
+
+  public func launchKeyboardSearch() {
     let keyboardSearchVC = KeyboardSearchViewController(keyboardSelectionBlock: KeyboardSearchViewController.defaultDownloadClosure() { result in
       switch result {
         case .cancelled:
@@ -459,5 +459,9 @@ extension InstalledLanguagesViewController {
 
     navigationController!.pushViewController(keyboardSearchVC, animated: true)
   }
+
+  @objc func addClicked(_ sender: Any) {
+    launchKeyboardSearch()
+  }
 }
 
diff --git a/ios/help/about/history.md b/ios/help/about/history.md
new file mode 100644
index 0000000000..3a0b9af3a6
--- /dev/null
+++ b/ios/help/about/history.md
@@ -0,0 +1,8 @@
+---
+title: Version History
+---
+
+A frequent updated changelog for Keyman is kept at [help.keyman.com/version-history](https://help.keyman.com/version-history/) on the Keyman Help website.
+
+## Related Topics
+* [What's New](whatsnew)
diff --git a/ios/help/about/index.md b/ios/help/about/index.md
new file mode 100644
index 0000000000..71ead99252
--- /dev/null
+++ b/ios/help/about/index.md
@@ -0,0 +1,8 @@
+---
+title: About Keyman
+---
+
+* [Welcome to Keyman](welcome)
+* [What's New](whatsnew)
+* [System Requirements](system-requirements)
+* [Version History](history)
diff --git a/ios/help/about/system-requirements.md b/ios/help/about/system-requirements.md
new file mode 100644
index 0000000000..183545ac5f
--- /dev/null
+++ b/ios/help/about/system-requirements.md
@@ -0,0 +1,9 @@
+---
+title: System Requirements - Keyman for iPhone and iPad Help
+---
+
+## Minimum System Requirements
+
+### Minimum iOS Version
+Keyman for iPhone and iPad will run on Apple iPhones and iPads that have a minimum version of
+iOS 9.
diff --git a/ios/help/about/welcome.md b/ios/help/about/welcome.md
new file mode 100644
index 0000000000..0835b4ca28
--- /dev/null
+++ b/ios/help/about/welcome.md
@@ -0,0 +1,11 @@
+---
+title: Welcome to Keyman
+---
+
+Thank you for installing Keyman for iPhone and iPad. Whether you're a new or returning user, 
+we believe you will appreciate the significant enhancements in this latest version of Keyman for iPhone and iPad.
+
+## What is Keyman for iPhone and iPad?
+Keyman for iPhone and iPad lets you type in over 600 languages on Apple iPhones and iPads.
+
+[Click here](../start) to get started
diff --git a/ios/help/about/whatsnew.md b/ios/help/about/whatsnew.md
new file mode 100644
index 0000000000..05b0f72359
--- /dev/null
+++ b/ios/help/about/whatsnew.md
@@ -0,0 +1,13 @@
+---
+title: What's New
+---
+
+Here are some of the new features we have added to Keyman for iPhone and iPad 14.0:
+
+* Simpler and smoother keyboard search
+* Localizable UI through [translate.keyman.com](https://translate.keyman.com)
+* Consolidated crash reporting to [sentry.keyman.com](https://sentry.keyman.com)
+* Choose associated language(s) when keyboard is installed (#3437)
+* Improved batching of keyboard and dictionary downloads (#3458)
+* Improved corrections and predictions (#3555)
+* Match user input capital letters when offering suggestions (#3845)
diff --git a/ios/help/basic/index.md b/ios/help/basic/index.md
new file mode 100644
index 0000000000..0a5cbcc11d
--- /dev/null
+++ b/ios/help/basic/index.md
@@ -0,0 +1,12 @@
+---
+title: Basic Help
+---
+
+* [Switching Between Keyboards](switching-between-keyboards)
+
+* [Installing Custom Keyboards](installing-custom-keyboards)
+* [Sharing Keyboards](sharing-keyboards)
+
+* [Using the Keyman Browser](using-keyman-browser)
+
+* [Removing Keyboards](uninstalling-keyboards)
diff --git a/ios/help/basic/installing-custom-keyboards.md b/ios/help/basic/installing-custom-keyboards.md
new file mode 100644
index 0000000000..e56a240cb6
--- /dev/null
+++ b/ios/help/basic/installing-custom-keyboards.md
@@ -0,0 +1,55 @@
+---
+title: Installing Custom Keyboards - Keyman for iPhone and iPad Help
+---
+
+The following steps can also be used to install a dictionary package.
+
+###Download the File
+If downloading a custom keyboard from the internet, click the link to your custom keyboard package file.
+
+For this example, we'll install a custom keyboard from a link in Safari.  Our example keyboard is for the GFF Amharic 7 keyboard.
+
+![](../ios_images/dist-url-screen-i.png)
+
+Safari will display an option to open the KMP file with Keyman.
+
+![](../ios_images/dist-kmp-open-i.png)
+
+Click **Open in "Keyman"** to continue.
+
+### Finding the File (iOS 13+ only)
+Installation is also possible from email clients and other sources.
+Once you download the file and save it to your device, look for an
+**Open in "Keyman"** option or use the
+Install From File option in Keyman seen below.
+
+![](../ios_images/add-keyboard-i2.png)
+
+Once this option is selected, a file browser will appear.  By default, it will show the most
+  recently downloaded files that can be installed.
+
+![](../ios_images/add-keyboard-file-i.png)
+
+If you have difficulty finding the right file, consider using the **Browse**
+option at the bottom-right.  Once you select it, you should then be greeted with the screen shown in
+the section below.
+
+### Installing the Package
+Either approach seen above will start the installation process.  From there, Keyman
+for iPhone and iPad will parse the metadata in the package. Some packages include
+documentation that will be displayed at this time.
+
+![](../ios_images/dist-welcome-i.png)
+
+Click the **"Install"** button at the top right.
+
+The keyboard from the keyboard package will then be successfully installed!
+
+![](../ios_images/dist-kmp-success-i.png)
+
+All the keyboards in the package are installed as a group. In this example, the package only has the "GFF Amharic 7"
+keyboard, so it becomes the active keyboard.
+
+![](../ios_images/dist-install1-i.png)
+
+To learn how to create a custom installable keyboard, [click here](http://help.keyman.com/developer/current-version/guides/distribute/).
diff --git a/ios/help/basic/sharing-keyboards.md b/ios/help/basic/sharing-keyboards.md
new file mode 100644
index 0000000000..8cd217ab55
--- /dev/null
+++ b/ios/help/basic/sharing-keyboards.md
@@ -0,0 +1,48 @@
+---
+title: Sharing Keyboards - Keyman for iPhone and iPad Help
+---
+
+### Sharing the File
+If you have installed a custom keyboard or dictionary from a file, Keyman keeps a copy
+of that file on your device.  You can find these copies in the iOS Files app.
+
+![](../ios_images/file-share-1i.png)
+
+Simply select the "Keyman" folder to view these files.
+
+![](../ios_images/file-share-2i.png)
+
+From here, longpress the file for the keyboard or dictionary you wish to share, then
+click **Share** to view sharing options.
+
+### Sharing via QR code
+For keyboards and dictionaries downloaded directly through the app,
+you can provide friends with a scannable QR code.  First, find the resource
+through the Settings menu under Installed Languages.
+
+![](../ios_images/add-keyboard-i2.png)
+
+![](../ios_images/add-keyboard-i3.png)
+
+![](../ios_images/qr-code-share-1i.png)
+
+When you select the keyboard, a page like the following should appear:
+
+![](../ios_images/qr-code-share-2i.png)
+
+Note that QR codes are only provided for certain keyboards and dictionaries
+at this time.
+
+### Installing from QR code
+To install from QR code, simply launch your device's Camera app and point
+it at the code, as seen below.
+
+![](../ios_images/qr-code-share-3i.png)
+
+Selecting the notification seen at the top will lead you to the following page:
+
+![](../ios_images/qr-code-share-4i.png)
+
+Select the big **Install on iPhone** (or
+**Install on iPad**) option will then download
+the file for easy installation.  (Refer to [Installing custom keyboards](installing-custom-keyboards) as necessary.)
diff --git a/ios/help/basic/switching-between-keyboards.md b/ios/help/basic/switching-between-keyboards.md
new file mode 100644
index 0000000000..5189121e7d
--- /dev/null
+++ b/ios/help/basic/switching-between-keyboards.md
@@ -0,0 +1,25 @@
+---
+title: Switching between keyboards - Keyman for iPhone and iPad Help
+---
+
+Keyboard switching is always activated by using the following key:
+
+![](../ios_images/globe.png)
+
+  This will bring up a list of all currently installed languages (the default is English USA). If you have already downloaded additional languages, they will appear here. Simply select them and the keyboard will re-appear with the new language.
+
+### The In-App Menu
+![](../ios_images/in-app-picker-i.png)
+
+Simply select any keyboard to activate it and return to the previous screen.
+
+### The System Keyboard Menu
+
+![](../ios_images/system-picker-i.png)
+
+This menu only displays when the 'globe' key is touched and held.
+
+The "Close Keyman" option will activate the next available non-Keyman system keyboard.
+
+A quick tap on the "globe" key will instead transition to the next available installed keyboard
+without displaying the menu.
diff --git a/ios/help/basic/uninstalling-keyboards.md b/ios/help/basic/uninstalling-keyboards.md
new file mode 100644
index 0000000000..4f1af7ae24
--- /dev/null
+++ b/ios/help/basic/uninstalling-keyboards.md
@@ -0,0 +1,29 @@
+---
+title: Uninstalling Keyboards - Keyman for iPhone and iPad Help
+---
+
+To uninstall a keyboard, follow these steps.
+
+### Access "Installed Languages"
+First, open the "Settings" menu.
+
+![](../ios_images/add-keyboard-i.png)
+
+The "Installed Languages" menu found here manages your installed keyboards and dictionaries.
+
+![](../ios_images/add-keyboard-i2.png)
+
+You should then see the following screen:
+
+![](../ios_images/add-keyboard-i3.png)
+
+### Removing the Keyboard
+Start by selecting the language for the keyboard you wish to uninstall.
+
+![](../ios_images/delete-keyboard-i.png)
+
+Swipe left on the keyboard you want to remove.  You'll see a button to **Delete**.
+
+![](../ios_images/delete-keyboard-i2.png)
+
+Click the **Delete** button to uninstall the keyboard.
diff --git a/ios/help/basic/using-keyman-browser.md b/ios/help/basic/using-keyman-browser.md
new file mode 100644
index 0000000000..9a587b8b33
--- /dev/null
+++ b/ios/help/basic/using-keyman-browser.md
@@ -0,0 +1,12 @@
+---
+title: Using the Keyman Browser - Keyman for iPhone and iPad Help
+---
+
+Step 1) Click the Keyman Browser button in the Keyman app
+
+Step 2) Enter the URL of a website to visit into the address bar, for example **google.com**.  Keyman Browser will load
+the page and detect your language if it is present, and reformat it to show your language instead of square boxes.
+
+Step 3) Use the bookmark button to save the current page for browsing later.
+
+Step 4) Use the Globe icon to swap between languages.
diff --git a/ios/help/context/index.md b/ios/help/context/index.md
new file mode 100644
index 0000000000..99e41dd65c
--- /dev/null
+++ b/ios/help/context/index.md
@@ -0,0 +1,24 @@
+---
+title: Keyman for iPhone and iPad Help
+---
+
+|    | Keyboard Keys <br/>(Keyboard Present) |
+|---|---|
+| ![](../ios_images/globe.png) | Install or select another language/keyboard |
+| ![](../ios_images/hide-keyboard.png) | Hide the keyboard |
+| ![](../ios_images/backspace.png) | Backspace |
+| ![](../ios_images/return.png) | Return |
+| ![](../ios_images/shift.png) | Shift key. Long press this key to access the <kbd>CTRL</kbd>, <kbd>ALT</kbd> and <kbd>CTRL</kbd><kbd>ALT</kbd> keys (which can access additional key layers) |
+| ![](../ios_images/touch-hold.png) | Keys with a small dot in the top right corner indicate a long press key. Access further functionality by long pressing the key |
+
+----
+
+|    | Toolbar Icons </th>
+|---|---|
+| ![](../ios_images/share.png) | Share your text via Mail, Text, Facebook or Twitter |
+| ![](../ios_images/browser-icon.png) | Open the Keyman Browser |
+| ![](../ios_images/menu-icon.png) | Open the menu for additional options |
+| ![](../ios_images/font-size.png) | Adjust the font size |
+| ![](../ios_images/delete.png) | Delete all current text |
+| ![](../ios_images/get-started.png) | Open the initial setup screen |
+| ![](../ios_images/info.png) | Load the Keyman help page |
diff --git a/ios/help/index.md b/ios/help/index.md
new file mode 100644
index 0000000000..8602639a08
--- /dev/null
+++ b/ios/help/index.md
@@ -0,0 +1,35 @@
+---
+title: Keyman for iPhone and iPad 14.0 Help
+---
+
+## [About Keyman](about/)
+* [Welcome to Keyman](about/welcome)
+* [What's New](about/whatsnew)
+* [System Requirements](about/system-requirements)
+* [Version History](about/history)
+
+## [Getting Started](start/)
+* [How To - Adding a Keyboard](start/installing-keyboards)
+* [How To - Installing Keyman as a System Keyboard](start/installing-system-keyboard)
+
+## [Using the Menu](context/)
+
+## Ask for Help
+* [Ask other users in the SIL Keyman Community](https://community.software.sil.org/c/keyman)
+
+## Help Topics
+### [Troubleshooting](troubleshooting/)
+* [How To - Installing fonts](troubleshooting/installing-fonts)
+* [How To - Integrating Keyman for iPhone and iPad](troubleshooting/integrating)
+
+### [Using Keyman for iPhone and iPad](basic/)
+* [Switching Between Keyboards](basic/switching-between-keyboards)
+* [Installing Custom Keyboards](basic/installing-custom-keyboards)
+* [Sharing Keyboards](basic/sharing-keyboards)
+* [Using the Keyman Browser](basic/using-keyman-browser)
+* [Removing Keyboards](basic/uninstalling-keyboards)
+
+## Further Help
+For more information on Keyman, [keyman.com](https://keyman.com).
+
+For more information on Keyman for iPhone and iPad, visit [keyman.com/iphone-and-ipad](https://keyman.com/iphone-and-ipad/)
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-file-i.b0b4249fc27f737685a10fa6781db8b6.png b/ios/help/ios_images/add-keyboard-file-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-file-i.b0b4249fc27f737685a10fa6781db8b6.png
rename to ios/help/ios_images/add-keyboard-file-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i.47ed580b93a138e29e9c9ad70e00d25f.png b/ios/help/ios_images/add-keyboard-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i.47ed580b93a138e29e9c9ad70e00d25f.png
rename to ios/help/ios_images/add-keyboard-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i2.f815f73c0363f547b5c756ebcdb4a89a.png b/ios/help/ios_images/add-keyboard-i2.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i2.f815f73c0363f547b5c756ebcdb4a89a.png
rename to ios/help/ios_images/add-keyboard-i2.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i3.3509794b85cff04330f9f5449df2f874.png b/ios/help/ios_images/add-keyboard-i3.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i3.3509794b85cff04330f9f5449df2f874.png
rename to ios/help/ios_images/add-keyboard-i3.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i4.961fbda76f16aca5b91afd600f4f9df1.png b/ios/help/ios_images/add-keyboard-i4.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i4.961fbda76f16aca5b91afd600f4f9df1.png
rename to ios/help/ios_images/add-keyboard-i4.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i5.f41b6636a605786bafa435d2cf52267f.png b/ios/help/ios_images/add-keyboard-i5.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/add-keyboard-i5.f41b6636a605786bafa435d2cf52267f.png
rename to ios/help/ios_images/add-keyboard-i5.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/backspace.e7aa44e2e9f4ccd68dfffd7cdae23d1f.png b/ios/help/ios_images/backspace.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/backspace.e7aa44e2e9f4ccd68dfffd7cdae23d1f.png
rename to ios/help/ios_images/backspace.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/browser-icon.af5dfe566575261f1ea8164481323cb4.png b/ios/help/ios_images/browser-icon.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/browser-icon.af5dfe566575261f1ea8164481323cb4.png
rename to ios/help/ios_images/browser-icon.png
diff --git a/ios/help/ios_images/confirm-dl.png b/ios/help/ios_images/confirm-dl.png
new file mode 100644
index 0000000000..b2f42cba7d
Binary files /dev/null and b/ios/help/ios_images/confirm-dl.png differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/delete-keyboard-i.e69d65b22ce139e0ba20a1ba705a28cd.png b/ios/help/ios_images/delete-keyboard-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/delete-keyboard-i.e69d65b22ce139e0ba20a1ba705a28cd.png
rename to ios/help/ios_images/delete-keyboard-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/delete-keyboard-i2.ec40fd5e372cbac2dcb4266fb7ed79f7.png b/ios/help/ios_images/delete-keyboard-i2.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/delete-keyboard-i2.ec40fd5e372cbac2dcb4266fb7ed79f7.png
rename to ios/help/ios_images/delete-keyboard-i2.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/delete.3a5deb2cca38d2fceafdab4ecc07dd5d.png b/ios/help/ios_images/delete.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/delete.3a5deb2cca38d2fceafdab4ecc07dd5d.png
rename to ios/help/ios_images/delete.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-install1-i.9f5bb46e89bbdcf2bbe406da41ce6771.png b/ios/help/ios_images/dist-install1-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-install1-i.9f5bb46e89bbdcf2bbe406da41ce6771.png
rename to ios/help/ios_images/dist-install1-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-kmp-open-i.6a948c2a5b45cf7ad8d430cfd4c275af.png b/ios/help/ios_images/dist-kmp-open-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-kmp-open-i.6a948c2a5b45cf7ad8d430cfd4c275af.png
rename to ios/help/ios_images/dist-kmp-open-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-kmp-success-i.ebdf47a9e455838a09060ad92abcbf4e.png b/ios/help/ios_images/dist-kmp-success-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-kmp-success-i.ebdf47a9e455838a09060ad92abcbf4e.png
rename to ios/help/ios_images/dist-kmp-success-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-url-screen-i.58b4bbebb629e6152eb43ece3451fb3c.png b/ios/help/ios_images/dist-url-screen-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-url-screen-i.58b4bbebb629e6152eb43ece3451fb3c.png
rename to ios/help/ios_images/dist-url-screen-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-welcome-i.e4fac681e32f983734f73b37f3b445da.png b/ios/help/ios_images/dist-welcome-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/dist-welcome-i.e4fac681e32f983734f73b37f3b445da.png
rename to ios/help/ios_images/dist-welcome-i.png
diff --git a/ios/help/ios_images/dl-success.png b/ios/help/ios_images/dl-success.png
new file mode 100644
index 0000000000..e61f1eded2
Binary files /dev/null and b/ios/help/ios_images/dl-success.png differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/file-share-1i.6b5cb90a3fe79c777ae3e71db9d389c4.png b/ios/help/ios_images/file-share-1i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/file-share-1i.6b5cb90a3fe79c777ae3e71db9d389c4.png
rename to ios/help/ios_images/file-share-1i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/file-share-2i.b5ac36c325ecebb21ae10a44ee80a7e2.png b/ios/help/ios_images/file-share-2i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/file-share-2i.b5ac36c325ecebb21ae10a44ee80a7e2.png
rename to ios/help/ios_images/file-share-2i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl1.b8983c24d229e8bfaef5757e8cf61579.png b/ios/help/ios_images/font-dl1.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl1.b8983c24d229e8bfaef5757e8cf61579.png
rename to ios/help/ios_images/font-dl1.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl2.e89447124a646205302905cf75903b84.png b/ios/help/ios_images/font-dl2.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl2.e89447124a646205302905cf75903b84.png
rename to ios/help/ios_images/font-dl2.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl3.8ed35f744cca7be7ef8c0930744b713a.png b/ios/help/ios_images/font-dl3.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl3.8ed35f744cca7be7ef8c0930744b713a.png
rename to ios/help/ios_images/font-dl3.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl4.713ea3fe6632dc78a7d943305efca977.png b/ios/help/ios_images/font-dl4.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl4.713ea3fe6632dc78a7d943305efca977.png
rename to ios/help/ios_images/font-dl4.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl5.89bddef8908a51a5f56890f0ad93c673.png b/ios/help/ios_images/font-dl5.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-dl5.89bddef8908a51a5f56890f0ad93c673.png
rename to ios/help/ios_images/font-dl5.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-size.ad6bf9de6369ea97531dfc845b92547a.png b/ios/help/ios_images/font-size.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/font-size.ad6bf9de6369ea97531dfc845b92547a.png
rename to ios/help/ios_images/font-size.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/get-started.148a309221b6ae085ccbc3892614c3b3.png b/ios/help/ios_images/get-started.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/get-started.148a309221b6ae085ccbc3892614c3b3.png
rename to ios/help/ios_images/get-started.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/globe.b98948bb94a60ffb1822a9f8c6b355e2.png b/ios/help/ios_images/globe.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/globe.b98948bb94a60ffb1822a9f8c6b355e2.png
rename to ios/help/ios_images/globe.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/hide-keyboard.010579769b43952703da6147f8225501.png b/ios/help/ios_images/hide-keyboard.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/hide-keyboard.010579769b43952703da6147f8225501.png
rename to ios/help/ios_images/hide-keyboard.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/in-app-picker-i.0a1e8e542953df06cc90590f16d6e52f.png b/ios/help/ios_images/in-app-picker-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/in-app-picker-i.0a1e8e542953df06cc90590f16d6e52f.png
rename to ios/help/ios_images/in-app-picker-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/info.ac50440ebab389e55bad424d2aef4f3d.png b/ios/help/ios_images/info.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/info.ac50440ebab389e55bad424d2aef4f3d.png
rename to ios/help/ios_images/info.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings.fa7bb95bf3f13c7777484dcdaab9dd0a.png b/ios/help/ios_images/keyman-settings.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings.fa7bb95bf3f13c7777484dcdaab9dd0a.png
rename to ios/help/ios_images/keyman-settings.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings2.01cbeb0ac2121190250eadcdb38e9c27.png b/ios/help/ios_images/keyman-settings2.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings2.01cbeb0ac2121190250eadcdb38e9c27.png
rename to ios/help/ios_images/keyman-settings2.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings3.228f5978261f580be7b6ac285b59c995.png b/ios/help/ios_images/keyman-settings3.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings3.228f5978261f580be7b6ac285b59c995.png
rename to ios/help/ios_images/keyman-settings3.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings4.d6965eba9a73ea210512c32c69ec6981.png b/ios/help/ios_images/keyman-settings4.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings4.d6965eba9a73ea210512c32c69ec6981.png
rename to ios/help/ios_images/keyman-settings4.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings5.eb3048ad1e8bb9e24016134d6f1a9956.png b/ios/help/ios_images/keyman-settings5.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings5.eb3048ad1e8bb9e24016134d6f1a9956.png
rename to ios/help/ios_images/keyman-settings5.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings6.72000b5e1174fb6898febb017a63eb6d.png b/ios/help/ios_images/keyman-settings6.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyman-settings6.72000b5e1174fb6898febb017a63eb6d.png
rename to ios/help/ios_images/keyman-settings6.png
diff --git a/ios/help/ios_images/lang-list.png b/ios/help/ios_images/lang-list.png
new file mode 100644
index 0000000000..a4f966467e
Binary files /dev/null and b/ios/help/ios_images/lang-list.png differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/menu-icon.3ba89748b61f4ad9d363b9d0000c21cd.png b/ios/help/ios_images/menu-icon.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/menu-icon.3ba89748b61f4ad9d363b9d0000c21cd.png
rename to ios/help/ios_images/menu-icon.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-1i.712a0fe2abd4897b44a7b16ada1eaeda.png b/ios/help/ios_images/qr-code-share-1i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-1i.712a0fe2abd4897b44a7b16ada1eaeda.png
rename to ios/help/ios_images/qr-code-share-1i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-2i.fdd13bba60d1e46353290256e00f663a.png b/ios/help/ios_images/qr-code-share-2i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-2i.fdd13bba60d1e46353290256e00f663a.png
rename to ios/help/ios_images/qr-code-share-2i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-3i.7391cc9a2f049740cb6512d1e74273ff.png b/ios/help/ios_images/qr-code-share-3i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-3i.7391cc9a2f049740cb6512d1e74273ff.png
rename to ios/help/ios_images/qr-code-share-3i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-4i.b7bd5f4cea227ffa9e72bfb3554f2fb0.png b/ios/help/ios_images/qr-code-share-4i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/qr-code-share-4i.b7bd5f4cea227ffa9e72bfb3554f2fb0.png
rename to ios/help/ios_images/qr-code-share-4i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/return.bdf81704b5532f32581ad2b7533a46a9.png b/ios/help/ios_images/return.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/return.bdf81704b5532f32581ad2b7533a46a9.png
rename to ios/help/ios_images/return.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/share.a6c8dd88ab8dbb2614442fcce23f4f27.png b/ios/help/ios_images/share.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/share.a6c8dd88ab8dbb2614442fcce23f4f27.png
rename to ios/help/ios_images/share.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/shift.2cab323b121fe156b13ad0d6262f7852.png b/ios/help/ios_images/shift.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/shift.2cab323b121fe156b13ad0d6262f7852.png
rename to ios/help/ios_images/shift.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/system-picker-i.7d584a3ef7e6ff7826353b2e112af3ae.png b/ios/help/ios_images/system-picker-i.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/system-picker-i.7d584a3ef7e6ff7826353b2e112af3ae.png
rename to ios/help/ios_images/system-picker-i.png
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/touch-hold.42dd80d1666945835f79a9c3f5d05d55.png b/ios/help/ios_images/touch-hold.png
similarity index 100%
rename from ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/touch-hold.42dd80d1666945835f79a9c3f5d05d55.png
rename to ios/help/ios_images/touch-hold.png
diff --git a/ios/help/ios_images/uninstall-delete-i.png b/ios/help/ios_images/uninstall-delete-i.png
new file mode 100644
index 0000000000..eb66a11b5b
Binary files /dev/null and b/ios/help/ios_images/uninstall-delete-i.png differ
diff --git a/ios/help/ios_images/uninstall-list-i.png b/ios/help/ios_images/uninstall-list-i.png
new file mode 100644
index 0000000000..110a63a96c
Binary files /dev/null and b/ios/help/ios_images/uninstall-list-i.png differ
diff --git a/ios/help/start/index.md b/ios/help/start/index.md
new file mode 100644
index 0000000000..55d9e1f64a
--- /dev/null
+++ b/ios/help/start/index.md
@@ -0,0 +1,6 @@
+---
+title: Getting Started
+---
+
+* [How To - Adding a Keyboard](installing-keyboards)
+* [How To - Installing Keyman as a System Keyboard](installing-system-keyboard)
diff --git a/ios/help/start/installing-keyboards.md b/ios/help/start/installing-keyboards.md
new file mode 100644
index 0000000000..2d01475a66
--- /dev/null
+++ b/ios/help/start/installing-keyboards.md
@@ -0,0 +1,35 @@
+---
+title: Adding keyboards - Keyman for iPhone and iPad Help
+---
+
+To install resources for use with a new language, follow these steps.
+
+### Access "Installed Languages"
+First, open the "Settings" menu.
+
+![](../ios_images/add-keyboard-i.png)
+
+The "Installed Languages" menu found here manages your installed keyboards and dictionaries.
+
+![](../ios_images/add-keyboard-i2.png)
+
+You should then see the following screen:
+
+![](../ios_images/add-keyboard-i3.png)
+
+
+### Finding Your Keyboard
+Click the **+** at the top-right to open the keyboard catalog.
+
+![](../ios_images/add-keyboard-i4.png)
+
+From there, select the language and keyboard you want to install.
+
+A list of all available languages will appear. Scroll through this list until you find the language you want to install. 
+Some languages may have multiple keyboards - for example we have 10 different Tamil keyboards.
+
+A popup will then ask for confirmation.  Hit the **Download** button.
+
+![](../ios_images/add-keyboard-i5.png)
+
+The new keyboard will then be installed and available for use.
diff --git a/ios/help/start/installing-system-keyboard.md b/ios/help/start/installing-system-keyboard.md
new file mode 100644
index 0000000000..d4cf98d6e8
--- /dev/null
+++ b/ios/help/start/installing-system-keyboard.md
@@ -0,0 +1,41 @@
+---
+title: Installing the Keyman System Keyboard - Keyman for iPhone and iPad Help
+---
+
+Open the 'Settings' App and go to 'General' > 'Keyboard'.
+
+![](../ios_images/keyman-settings5.png)
+
+Touch 'Keyboards'.
+
+![](../ios_images/keyman-settings6.png)
+
+### Enabling Keyman
+To activate Keyman as a system keyboard, touch 'Add New Keyboard...'
+
+![](../ios_images/keyman-settings.png)
+
+Touch 'Keyman' under THIRD-PARTY KEYBOARDS.
+
+![](../ios_images/keyman-settings2.png)
+
+Touch 'Keyman - Keyman'.
+
+![](../ios_images/keyman-settings3.png)
+
+Turn on the 'Allow Full Access' toggle and confirm.
+
+![](../ios_images/keyman-settings4.png)
+
+Your Keyman keyboards will now be available throughout your entire device. You can switch between Keyman keyboards and 
+the default iOS keyboard layout by touching the globe key of the keyboard whenever you are typing.
+
+![](../ios_images/globe.png)
+
+### On "Allow Full Access"
+After opening the Keyman system keyboard for the first time in an app, you can turn off the "Allow Full Access" option
+again.
+
+You may need to temporarily switch this on again in the future for app updates and for some changes to keyboard preferences.
+
+It may always be safely deactivated immediately after opening the system keyboard again in an app.
diff --git a/ios/help/troubleshooting/index.md b/ios/help/troubleshooting/index.md
new file mode 100644
index 0000000000..2f31716c95
--- /dev/null
+++ b/ios/help/troubleshooting/index.md
@@ -0,0 +1,7 @@
+---
+title: Troubleshooting
+---
+
+* [How To - Installing fonts](installing-fonts)
+
+* [How To - Integrating Keyman for iPhone and iPad](integrating)
diff --git a/ios/help/troubleshooting/installing-fonts.md b/ios/help/troubleshooting/installing-fonts.md
new file mode 100644
index 0000000000..183b722c82
--- /dev/null
+++ b/ios/help/troubleshooting/installing-fonts.md
@@ -0,0 +1,27 @@
+---
+title: Installing fonts - Keyman for iPhone and iPad Help
+---
+
+Some keyboards require special fonts that do not come standard with your iPhone or iPad. 
+For keyboards that use these fonts, the Keyman app will provide a download of the font to install onto your device, 
+meaning all apps will be able to correctly display the font. To install the font, touch **Install**.
+
+![](../ios_images/font-dl1.png)
+
+You will then be taken to your device settings, and asked to install a profile for the font. Touch **Install**.
+
+![](../ios_images/font-dl2.png)
+
+Then <span class="command">Install</span> again in the Consent page.
+
+![](../ios_images/font-dl3.png)
+
+Once the profile is installed, touch <span class="command">Done</span>.
+
+![](../ios_images/font-dl4.png)
+
+And then <span class="command">Touch now to return to Keyman</span>.
+
+![](../ios_images/font-dl5.png)
+
+The font is now successfully installed, and will display correctly throughout your device!
diff --git a/ios/help/troubleshooting/integrating.md b/ios/help/troubleshooting/integrating.md
new file mode 100644
index 0000000000..516503d091
--- /dev/null
+++ b/ios/help/troubleshooting/integrating.md
@@ -0,0 +1,8 @@
+---
+title: How To - Integrating Keyman for iPhone and iPad
+---
+
+## Integrate Keyman with your App or Website
+If you are interested in learning how Keyman can be integrated into your own app or
+website, visit [keyman.com/engine](https://keyman.com/engine)
+
diff --git a/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift b/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift
index f0721834bc..31f63e104b 100644
--- a/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift
+++ b/ios/keyman/Keyman/Keyman/InfoViewController/InfoViewController.swift
@@ -43,27 +43,29 @@ class InfoViewController: UIViewController, UIWebViewDelegate {
   }
 
   func reloadKeymanHelp() {
-    let networkStatus = networkReachable?.connection
-    switch networkStatus {
-    case Reachability.Connection.none?:
+    if let networkStatus = networkReachable?.connection {
+      switch networkStatus {
+      case Reachability.Connection.none, Reachability.Connection.unavailable:
+        loadFromLocal()
+      default:
+        loadFromServer()
+      }
+    } else {
       loadFromLocal()
-    default:
-      loadFromServer()
     }
   }
 
   private func loadFromLocal() {
     let offlineHelpBundle = Bundle(path: Bundle.main.path(forResource: "OfflineHelp", ofType: "bundle")!)!
 
-    // Yes, .php.html.  That's how `wget` is set to retrieve it, since Safari won't recognize the contents
-    // without the .html ending, it seems.
-    let filePath = offlineHelpBundle.path(forResource: "index.php", ofType: "html", inDirectory: nil)
+    // Safari won't recognize the contents without the .html ending.
+    let filePath = offlineHelpBundle.path(forResource: "index", ofType: "html", inDirectory: nil)
     webView.loadRequest(URLRequest(url: URL.init(fileURLWithPath: filePath!)))
   }
 
   private func loadFromServer() {
     let appVersion = Version.current.majorMinor
-    let url = "https://help.keyman.com/products/iphone-and-ipad/\(appVersion.plainString)/?embed=ios"
+    let url =  "\(KeymanHosts.HELP_KEYMAN_COM)/products/iphone-and-ipad/\(appVersion.plainString)/"
     webView.loadRequest(URLRequest(url: URL(string: url)!))
     log.debug("Info page URL: \(url)")
   }
diff --git a/ios/keyman/Keyman/Keyman/MainViewController.swift b/ios/keyman/Keyman/Keyman/MainViewController.swift
index 323af5544e..b708befd8e 100644
--- a/ios/keyman/Keyman/Keyman/MainViewController.swift
+++ b/ios/keyman/Keyman/Keyman/MainViewController.swift
@@ -536,7 +536,10 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
     let installedLanguagesVC = InstalledLanguagesViewController()
     nc.pushViewController(installedLanguagesVC, animated: true)
 
-    self.present(nc, animated: true)
+    self.present(nc, animated: true) {
+      // Requires a host NavigationViewController, hence calling it afterward.
+      installedLanguagesVC.launchKeyboardSearch()
+    }
   }
 
   @objc func actionButtonClick(_ sender: Any) {
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/NotoSans-Regular-Ascii.ttf b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/NotoSans-Regular-Ascii.ttf
deleted file mode 100644
index f221c4a87a..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/NotoSans-Regular-Ascii.ttf and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/app-info.8f6cb12701af2facf8c6dd7c729c65bc.css b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/app-info.8f6cb12701af2facf8c6dd7c729c65bc.css
deleted file mode 100644
index 3fbe3544d2..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/app-info.8f6cb12701af2facf8c6dd7c729c65bc.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/***********************
-	Wrapper CSS
-***********************/
-
-h2{
-	font-size: 22pt;
-	font-weight: 400;
-	margin: 30px 0px 15px 0px;
-	text-align: center;
-	color: #BA2034;
-}
-
-
-p img{
-	margin-top: 10px !important;
-	display: block !important;
-	margin-left: auto !important;
-	margin-right: auto !important;
-	margin-bottom: 10px !important;
-}
-
-table{
-	width: 100% !important;
-	margin-bottom: 50px !important;
-}
-
-
-td{
-	text-align: left !important;
-	vertical-align: middle !important;
-	padding: 10px !important;
-}
-
-th{
-	font-weight: bold !important;
-	font-size: 14pt !important;
-	padding: 15px 0px 5px 0px !important;
-}
-
-.command{
-	font-weight: bold !important;
-	color: #69B7D3 !important;
-}
-
-@media all and (min-width: 10px) and (max-width: 720px){
-	#section2 img{
-		min-width: 40px;
-	}
-}
-
-/**
-	Removes existing max-width property settings from images in tables.
-	They overly shrink the images on the main iOS symbol glossary.
- */
-#section2 td img {
-	max-width: unset;
-}
-
-
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/embed.5f7dc4fec739bda98e73bbe078e4f770.css b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/embed.5f7dc4fec739bda98e73bbe078e4f770.css
deleted file mode 100644
index 8a291613a8..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/embed.5f7dc4fec739bda98e73bbe078e4f770.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.embed-on .content-online {
-    display: none;
-}
-
-.embed-off .content-in-app {
-    display: none;
-}
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico
deleted file mode 100644
index 671c7c9156..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/fonts.css b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/fonts.css
deleted file mode 100644
index c72972eed5..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/fonts.css
+++ /dev/null
@@ -1,139 +0,0 @@
-@font-face {
-	font-family:GeezWeb;
-	font-style:normal;
-	font-weight:normal;
-	src:url('https://s.keyman.com/font/deploy/wookianos.ttf') format('truetype');
-}
-@font-face {
-	font-family:MyanmarWeb;
-	font-style:normal;
-	font-weight:normal;
-	src:url('https://s.keyman.com/font/deploy/Padauk.ttf') format('truetype');
-}
-/*@font-face {
-	font-family:LatinWeb;
-	font-style:normal;
-	font-weight:normal;
-	src:url('https://s.keyman.com/font/deploy/DejaVuSans.ttf') format('truetype');
-}*/
-@font-face {
-	font-family:OriyaWeb;
-	font-style:normal;
-	font-weight:normal;
-	src:url('https://s.keyman.com/font/deploy/utkalm.ttf') format('truetype');
-}
-@font-face {
-	font-family:SinhalaWeb;
-	font-style:normal;
-	font-weight:normal;
-	src:url('https://s.keyman.com/font/deploy/kaputaunicode.ttf') format('truetype');
-}
-@font-face {
-	font-family:TamilWeb;
-	font-style:normal;
-	font-weight:normal;
-	src:url('https://s.keyman.com/font/deploy/aava1.ttf') format('truetype');
-}
-@font-face {
-	font-family:CherokeeWeb;
-	font-style:normal;
-	font-weight:normal;
-	src:url('https://s.keyman.com/font/deploy/digohweli_1_7.ttf') format('truetype');
-}
-@font-face {
-    font-family: SindhiWeb;
-    font-style:  normal;
-    font-weight: normal;
-    src: url('https://s.keyman.com/font/deploy/MBKhursheed10.6.ttf')  format("truetype");
-}
-@font-face {
-  font-family: TibetanWeb;
-  font-style:  normal;
-  font-weight: normal;
-  src: url('https://s.keyman.com/font/deploy/CTRC-Uchen.ttf')  format("truetype");
-}
-@font-face {
-    font-family: LaoWeb;
-    font-style:  normal;
-    font-weight: normal;
-    src: url('https://s.keyman.com/font/deploy/SAYSETT0.eot'); 
-    src: url('https://s.keyman.com/font/deploy/SAYSETT0.eot?#iefix') format('embedded-opentype'), 
-    url('https://s.keyman.com/font/deploy/saysettha_web.woff') format('woff'), 
-    url('https://s.keyman.com/font/deploy/saysettha_OT.ttf') format('truetype');         
-}
-@font-face {
-    font-family: PashtoWeb;
-    font-style:  normal;
-    font-weight: normal;
-    src: url('https://s.keyman.com/font/deploy/LateefRegOT.ttf')  format("truetype");
-}
-
-@font-face {
-  font-family: "Noto Nastaliq Urdu Draft";
-  src: url('https://s.keyman.com/font/deploy/NotoNastaliqUrduDraft.ttf') format("truetype");
-}
-
-/* Amharic */
-:lang(amh).lang-example {
-	font-family: GeezWeb;
-}
-/* Burmese */
-:lang(mya).lang-example {
-	font-family: MyanmarWeb;
-}
-/* Cherokee */
-:lang(chr).lang-example {
-	font-family: CherokeeWeb;
-}
-/* Lao */
-:lang(lao).lang-example {
-	font-family: LaoWeb;
-}
-/* Malayalam
-:lang(mal).lang-example {
-	font-family: GeezWeb;
-} */
-
-/* Marathi
-:lang(mar).lang-example {
-	font-family: GeezWeb;
-} */
-/* Oriya */
-:lang(ori).lang-example {
-	font-family: OriyaWeb;
-}
-/* Sindhi */
-:lang(snd).lang-example {
-	font-family: SindhiWeb;
-}
-/* Sinhala */
-:lang(sin).lang-example {
-	font-family: SinhalaWeb;
-}
-
-/* Tamil */
-:lang(tam).lang-example {
-	font-family: TamilWeb;
-}
-/* Tibetan */
-:lang(bod).lang-example {
-	font-family: TibetanWeb;
-}
-/* Tigrigna */
-:lang(tir).lang-example {
-	font-family: GeezWeb;
-}
-
-:lang(egy).language, .hiero{
-  font-family:EgyptianWeb !important;
-}
-
-.lang2:lang(urd) {
-  font-family: "Noto Nastaliq Urdu Draft";
-  font-weight: normal;
-}
-
-#hiero{
-	position: relative;
-	top: 2px;
-}
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/headerbar.5b66d10475396d1a17cb0d687f794262.png b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/headerbar.5b66d10475396d1a17cb0d687f794262.png
deleted file mode 100644
index f61db79b21..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/headerbar.5b66d10475396d1a17cb0d687f794262.png and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/helpIcon.e6531e8bf34d0f667dac699db8f7438f.png b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/helpIcon.e6531e8bf34d0f667dac699db8f7438f.png
deleted file mode 100644
index 8178e4ff76..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/helpIcon.e6531e8bf34d0f667dac699db8f7438f.png and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/index.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/index.php.html
deleted file mode 100644
index ff5e90e9bf..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/index.php.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="app-info.8f6cb12701af2facf8c6dd7c729c65bc.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2 class="content-in-app">Getting Started</h2>
-<h2 class="content-online">Keyman for iPhone and iPad</h2>
-
-<p>
-   The Keyman App lets you type in over 600 languages. To get started, here are some helpful hints:
-   <table>
-       <tr>
-         <th colspan="2"><h3>Keyboard Keys <br/>(Keyboard Present)</h3></th>
-       </tr>
-       <tr>
-           <td><img src="globe.b98948bb94a60ffb1822a9f8c6b355e2.png" /></td>
-           <td>Install or select another language/keyboard</td>
-       </tr>
-       <tr>
-           <td><img src="hide-keyboard.010579769b43952703da6147f8225501.png" /></td>
-           <td>Hide the keyboard</td>
-       </tr>
-       <tr>
-           <td><img src="backspace.e7aa44e2e9f4ccd68dfffd7cdae23d1f.png" /></td>
-           <td>Backspace</td>
-       </tr>
-       <tr>
-           <td><img src="return.bdf81704b5532f32581ad2b7533a46a9.png" /></td>
-           <td>Return</td>
-       </tr>
-       <tr>
-           <td><img src="shift.2cab323b121fe156b13ad0d6262f7852.png" /></td>
-           <td>Shift key. Long press this key to access the CTRL, ALT and CTRL ALT keys (which can access additional
-             key layers)</td>
-       </tr>
-       <tr>
-           <td><img src="touch-hold.42dd80d1666945835f79a9c3f5d05d55.png" /></td>
-           <td>Keys with a small dot in the top right corner indicate a long press key. Access further functionality
-             by long pressing the key</td>
-       </tr>
-       <tr>
-         <th colspan="2"><h3>Toolbar Icons</h3></th>
-       </tr>
-       <tr>
-           <td><img src="share.a6c8dd88ab8dbb2614442fcce23f4f27.png" /></td>
-           <td>Share your text via Mail, Text, Facebook or Twitter</td>
-       </tr>
-       <tr>
-           <td><img src="browser-icon.af5dfe566575261f1ea8164481323cb4.png" /></td>
-           <td>Open the Keyman Browser</td>
-       </tr>
-       <tr>
-           <td><img src="menu-icon.3ba89748b61f4ad9d363b9d0000c21cd.png" /></td>
-           <td>Open the menu for additional options</td>
-       </tr>
-       <tr>
-           <td><img src="font-size.ad6bf9de6369ea97531dfc845b92547a.png" /></td>
-           <td>Adjust the font size</td>
-       </tr>
-       <tr>
-           <td><img src="delete.3a5deb2cca38d2fceafdab4ecc07dd5d.png" /></td>
-           <td>Delete all current text</td>
-       </tr>
-       <tr>
-           <td><img src="get-started.148a309221b6ae085ccbc3892614c3b3.png" /></td>
-           <td>Open the initial setup screen</td>
-       </tr>
-       <tr>
-           <td><img src="info.ac50440ebab389e55bad424d2aef4f3d.png" /></td>
-           <td>Load this help page</td>
-       </tr>
-   </table>
-</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-in-app">Getting Started</li>
-  <li class="content-online">Keyman for iPhone and iPad help home</li>
-  <li><a href="installing-keyboards.php.html">Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>
-<h2>Integrate Keyman with your App or Website</h2>
-<p>
-   If you are interested in learning how Keyman can be integrated into your own app or website, visit <a href="http://www.keyman.com/engine/">www.keyman.com/engine</a>
-</p>
-<h2>Further Help</h2>
-<p>
-   For more information on Keyman, visit <a href="http://keyman.com">www.keyman.com</a>
-</p>
-
-<div class="content-online">
-<h2>Version History</h2>
-<p><a href='https://help.keyman.com/products/iphone-and-ipad/version-history'>Full version history</a></p>
-</div>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/index.php@embed=ios.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/index.php@embed=ios.html
deleted file mode 100644
index ab3c169f7e..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/index.php@embed=ios.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-        <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="app-info.8f6cb12701af2facf8c6dd7c729c65bc.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2 class="content-in-app">Getting Started</h2>
-<h2 class="content-online">Keyman for iPhone and iPad</h2>
-
-<p>
-   The Keyman App lets you type in over 600 languages. To get started, here are some helpful hints:
-   <table>
-       <tr>
-         <th colspan="2"><h3>Keyboard Keys <br/>(Keyboard Present)</h3></th>
-       </tr>
-       <tr>
-           <td><img src="globe.b98948bb94a60ffb1822a9f8c6b355e2.png" /></td>
-           <td>Install or select another language/keyboard</td>
-       </tr>
-       <tr>
-           <td><img src="hide-keyboard.010579769b43952703da6147f8225501.png" /></td>
-           <td>Hide the keyboard</td>
-       </tr>
-       <tr>
-           <td><img src="backspace.e7aa44e2e9f4ccd68dfffd7cdae23d1f.png" /></td>
-           <td>Backspace</td>
-       </tr>
-       <tr>
-           <td><img src="return.bdf81704b5532f32581ad2b7533a46a9.png" /></td>
-           <td>Return</td>
-       </tr>
-       <tr>
-           <td><img src="shift.2cab323b121fe156b13ad0d6262f7852.png" /></td>
-           <td>Shift key. Long press this key to access the CTRL, ALT and CTRL ALT keys (which can access additional
-             key layers)</td>
-       </tr>
-       <tr>
-           <td><img src="touch-hold.42dd80d1666945835f79a9c3f5d05d55.png" /></td>
-           <td>Keys with a small dot in the top right corner indicate a long press key. Access further functionality
-             by long pressing the key</td>
-       </tr>
-       <tr>
-         <th colspan="2"><h3>Toolbar Icons</h3></th>
-       </tr>
-       <tr>
-           <td><img src="share.a6c8dd88ab8dbb2614442fcce23f4f27.png" /></td>
-           <td>Share your text via Mail, Text, Facebook or Twitter</td>
-       </tr>
-       <tr>
-           <td><img src="browser-icon.af5dfe566575261f1ea8164481323cb4.png" /></td>
-           <td>Open the Keyman Browser</td>
-       </tr>
-       <tr>
-           <td><img src="menu-icon.3ba89748b61f4ad9d363b9d0000c21cd.png" /></td>
-           <td>Open the menu for additional options</td>
-       </tr>
-       <tr>
-           <td><img src="font-size.ad6bf9de6369ea97531dfc845b92547a.png" /></td>
-           <td>Adjust the font size</td>
-       </tr>
-       <tr>
-           <td><img src="delete.3a5deb2cca38d2fceafdab4ecc07dd5d.png" /></td>
-           <td>Delete all current text</td>
-       </tr>
-       <tr>
-           <td><img src="get-started.148a309221b6ae085ccbc3892614c3b3.png" /></td>
-           <td>Open the initial setup screen</td>
-       </tr>
-       <tr>
-           <td><img src="info.ac50440ebab389e55bad424d2aef4f3d.png" /></td>
-           <td>Load this help page</td>
-       </tr>
-   </table>
-</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-in-app">Getting Started</li>
-  <li class="content-online">Keyman for iPhone and iPad help home</li>
-  <li><a href="installing-keyboards.php.html">Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>
-<h2>Integrate Keyman with your App or Website</h2>
-<p>
-   If you are interested in learning how Keyman can be integrated into your own app or website, visit <a href="http://www.keyman.com/engine/">www.keyman.com/engine</a>
-</p>
-<h2>Further Help</h2>
-<p>
-   For more information on Keyman, visit <a href="http://keyman.com">www.keyman.com</a>
-</p>
-
-<div class="content-online">
-<h2>Version History</h2>
-<p><a href='https://help.keyman.com/products/iphone-and-ipad/version-history'>Full version history</a></p>
-</div>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-custom-keyboards.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-custom-keyboards.php.html
deleted file mode 100644
index 320ef4bff5..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-custom-keyboards.php.html
+++ /dev/null
@@ -1,197 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Installing Custom Keyboards - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/installing-custom-keyboards'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Installing Custom Keyboards</h2>
-
-<h3>Download the File</h3>
-<p>
-  If downloading a custom keyboard from the internet, click the link to your custom keyboard package file.
-</p>
-<p>
-  For this example, we'll install a custom keyboard from a link in Safari.  Our example keyboard is for the GFF Amharic 7 keyboard.
-</p>
-<p>
-  <img src="dist-url-screen-i.58b4bbebb629e6152eb43ece3451fb3c.png">
-</p>
-<p>
-  Safari will display an option to open the KMP file with Keyman.<br/>
-</p>
-<p>
-  <img src="dist-kmp-open-i.6a948c2a5b45cf7ad8d430cfd4c275af.png">
-</p>
-<p>
-  Click <span class="command">Open in "Keyman"</span> to continue.
-</p>
-<h3>Finding the File (iOS 11+ only)</h3>
-<p>
-  Installation is also possible from email clients and other sources.
-  Once you download the file and save it to your device, look for an
-  <span class="command">Open in "Keyman"</span> option or use the
-  Install From File option in Keyman seen below.
-</p>
-<p>
-  <img src="add-keyboard-i2.f815f73c0363f547b5c756ebcdb4a89a.png">
-</p>
-<p>
-  Once this option is selected, a file browser will appear.  By default, it will show the most
-  recently downloaded files that can be installed.
-</p>
-<p>
-  <img src="add-keyboard-file-i.b0b4249fc27f737685a10fa6781db8b6.png">
-</p>
-<p>
-  If you have difficulty finding the right file, consider using the <span class="command">Browse</span>
-  option at the bottom-right.  Once you select it, you should then be greeted with the screen shown in
-  the section below.
-</p>
-
-<h3>Installing the Package</h3>
-<p>
-  Either approach seen above will start the installation process.  From there, Keyman
-  for iPhone and iPad will parse the metadata in the package. Some packages include
-  documentation that will be displayed at this time.
-</p>
-<p>
-  <img src="dist-welcome-i.e4fac681e32f983734f73b37f3b445da.png">
-</p>
-<p>
-  Click the <span class="command">"Install"</span> button at the top right.
-</p>
-<p>
-The keyboard from the keyboard package will then be successfully installed!
-</p>
-<p>
-  <img src="dist-kmp-success-i.ebdf47a9e455838a09060ad92abcbf4e.png">
-</p>
-<p>
-  All the keyboards in the package are installed as a group. In this example, the package only has the "GFF Amharic 7"
-  keyboard, so it becomes the active keyboard.
-</p>
-<p>
-  <img src="dist-install1-i.9f5bb46e89bbdcf2bbe406da41ce6771.png">
-</p>
-
-<p>
-  To learn how to create a custom installable keyboard, <a href="http://help.keyman.com/developer/current-version/guides/distribute/">click here</a>.
-</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>
-          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-fonts.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-fonts.php.html
deleted file mode 100644
index dc4438b7e2..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-fonts.php.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Installing fonts - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/installing-fonts'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="app-info.8f6cb12701af2facf8c6dd7c729c65bc.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Installing Fonts</h2>
-
-<p>
-   Some keyboards require special fonts that do not come standard with your iPhone or iPad. For keyboards that use these fonts, the Keyman app will provide a download of the font to install onto your device, meaning all apps will be able to correctly display the font. To install the font, touch <span class="command">Install</span>.
-   <br/>
-   <img src="font-dl1.b8983c24d229e8bfaef5757e8cf61579.png" />
-   <br/><br/>
-   You will then be taken to your device settings, and asked to install a profile for the font. Touch <span class="command">Install</span>.
-   <br/>
-   <img src="font-dl2.e89447124a646205302905cf75903b84.png" />
-   <br/><br/>
-   Then <span class="command">Install</span> again in the Consent page.
-   <br/>
-   <img src="font-dl3.8ed35f744cca7be7ef8c0930744b713a.png" />
-   <br/><br/>
-   Once the profile is installed, touch <span class="command">Done</span>.
-   <br/>
-   <img src="font-dl4.713ea3fe6632dc78a7d943305efca977.png" />
-   <br/><br/>
-   And then <span class="command">Touch now to return to Keyman</span>.
-   <br/>
-   <img src="font-dl5.89bddef8908a51a5f56890f0ad93c673.png" />
-   <br/><br/>
-   The font is now successfully installed, and will display correctly throughout your device!
-</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>
-          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-keyboards.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-keyboards.php.html
deleted file mode 100644
index d37053ad7a..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-keyboards.php.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Adding keyboards - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/installing-keyboards'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Adding Keyboards</h2>
-
-<p>
-   To install resources for use with a new language, follow these steps.
-</p>
-  <h3>Access "Installed Languages"</h3>
-  <p>First, open the "Settings" menu.</p>
-  <p>
-  <img src="add-keyboard-i.47ed580b93a138e29e9c9ad70e00d25f.png" />
-  </p>
-  <p>
-  The "Installed Languages" menu found here manages your installed keyboards and dictionaries.
-  </p>
-  <p>
-  <img src="add-keyboard-i2.f815f73c0363f547b5c756ebcdb4a89a.png" />
-  </p>
-  <p>You should then see the following screen:</p>
-  <p>
-  <img src="add-keyboard-i3.3509794b85cff04330f9f5449df2f874.png" />
-  </p>
-
-  <h3>Finding Your Keyboard</h3>
-  <p>Click the <span class="command">+</span> at the top-right to open the keyboard catalog.</p>
-  <p>
-    <img src="add-keyboard-i4.961fbda76f16aca5b91afd600f4f9df1.png" />
-  </p>
-  <p>From there, select the language and keyboard you want to install.</p>
-  <p>A list of all available languages will appear. Scroll through this list until you find the language you want to install. Some languages may have multiple keyboards - for example we have 10 different Tamil keyboards.</p>
-  <p>A popup will then ask for confirmation.  Hit the <span class="command">Download</span> button.</p>
-  <p>
-    <img src="add-keyboard-i5.f41b6636a605786bafa435d2cf52267f.png" />
-  </p>
-  <p>The new keyboard will then be installed and available for use.</p>
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-system-keyboard.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-system-keyboard.php.html
deleted file mode 100644
index be101586fb..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/installing-system-keyboard.php.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Installing the Keyman System Keyboard - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/installing-system-keyboard'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Installing the Keyman System Keyboard</h2>
-
-<p>
-    Open the 'Settings' App and go to 'General' > 'Keyboard'.
-</p>
-<p>
-<img src="keyman-settings5.eb3048ad1e8bb9e24016134d6f1a9956.png" />
-</p>
-<p>
-    Touch 'Keyboards'.
-</p>
-<p>
-<img src="keyman-settings6.72000b5e1174fb6898febb017a63eb6d.png" />
-</p>
-<h3>Enabling Keyman</h3>
-<p>
-    To activate Keyman as a system keyboard, touch 'Add New Keyboard...'
-</p>
-<p>
-<img src="keyman-settings.fa7bb95bf3f13c7777484dcdaab9dd0a.png" />
-</p>
-<p>
-    Touch 'Keyman' under THIRD-PARTY KEYBOARDS.
-</p>
-<p>
-<img src="keyman-settings2.01cbeb0ac2121190250eadcdb38e9c27.png" />
-</p>
-<p>
-    Touch 'Keyman - Keyman'.
-</p>
-<p>
-<img src="keyman-settings3.228f5978261f580be7b6ac285b59c995.png" />
-</p>
-<p>
-    Turn on the 'Allow Full Access' toggle and confirm.
-</p>
-<p>
-<img src="keyman-settings4.d6965eba9a73ea210512c32c69ec6981.png" />
-</p>
-<p>
-    Your Keyman keyboards will now be available throughout your entire device. You can switch between Keyman keyboards and the default iOS keyboard layout by touching the globe key of the keyboard whenever you are typing.
-</p>
-<p>
-<img src="globe.b98948bb94a60ffb1822a9f8c6b355e2.png" />
-</p>
-<h3>On "Allow Full Access"</h3>
-<p>After opening the Keyman system keyboard for the first time in an app, you can turn off the "Allow Full Access" option
-again.
-</p>
-<p>
-  You may need to temporarily switch this on again in the future for app updates and for some changes to keyboard preferences.
-</p>
-<p>
-  It may always be safely deactivated immediately after opening the system keyboard again in an app.
-</p>
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css
deleted file mode 100644
index f8aeee7bca..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css
+++ /dev/null
@@ -1,95 +0,0 @@
-@import 'fonts.css';
-
-#section2 h3, #section2 h2{
-  color: #B92034;
-  margin-top: 10px;
-}
-
-#section2 a{
-  color: #B92034;
-}
-
-#section2 h3{
-  margin-top: 30px;
-}
-
-#section2 h4{
-  font-weight: bold;
-  margin: 10px 10px;
-}
-
-#section2 img{
-  margin: 0px;
-}
-
-.lang2{
-  line-height: 1.2;
-  font-size: 150% !important;
-}
-
-#keymanExample{
-  background: #E0E0FF;
-  border: solid 2px #69B7D2;
-  padding: 10px;
-}
-
-#keymanExample tr td{
-  padding: 0px 30px;
-}
-
-#keymanExample tr th{
-  font-weight: bold;
-}
-
-#keymanExample img{
-  margin: 5px 2px 0px 2px;
-  position: relative;
-  top: 3px;
-}
-
-#osk .desktop.kmw-osk-inner-frame {
-  background: rgb(204,204,204);
-  padding: 4px 0;
-}
-
-#osk .desktop.kmw-osk-inner-frame .kmw-key-square {
-  
-  border-bottom: solid 2px rgb(204,204,204);
-}
-
-.highlightKeys .key-print { display: none }
-.highlightKeys img {
-  vertical-align: baseline;
-  margin: 0 2px 0 0;
-  background-image: url('keys3.gif');
-  height: 15px; width: 15px;
-  margin: 2px !important;
-}
-
-.grid tr {
-    font-weight: normal;
-    height: 55px;
-    text-align: center;
-}
-
-td samp {
-    font-size: 24pt;
-}
-samp {
-    color: #0000FF;
-    font-family: "Times New Roman";
-}
-.grid td, .grid th {
-    border-bottom: 1px solid #DDDDDD;
-    padding: 2px 5px;
-}
-
-.grid th{
-  vertical-align: bottom;
-  font-weight: bold;
-}
-
-.navheader{
-  margin-top: 20px;
-}
-
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js
deleted file mode 100644
index 7b1b1e79ab..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js
+++ /dev/null
@@ -1,250 +0,0 @@
-if(typeof KeyRenderer == 'undefined')
-{
-  var KeyRenderer = new function()
-  {
-    var site = '/cdn/dev';
-
-    this.render = function(s)
-    {
-      return "<span class='highlightKeys'>" + this.renderInternal(s, true) + "</span>";
-    }
-      
-    this.renderInternal = function(s, includePrintable)
-    {
-      var i = 0, r = '';
-      var spkey = {PgUp:'pgup',PgDn:'pgdn',Left:'left',Right:'right',Up:'up',Down:'down',Ins:'ins',Del:'del',Home:'home',End:'end',
-        Enter:'enter',Tab:'tab',Esc:'esc',Caps:'caps',Shift:'shift2',Ctrl:'ctrl2',Alt:'alt2',Bksp:'bksp'};
-      while(i < s.length)
-      {
-        var endspan = false;
-        var ch = s.charAt(i);
-        if(ch == '[' && i < s.length-1)
-        {
-          i++; ch = s.charAt(i);
-          if(ch != '[')
-          {
-            /* Ctrl+Shift+Alt+key */
-            var t = '';
-            while(s.charAt(i) != ']' && i < s.length)
-            {
-              t += s.charAt(i);
-              i++;
-            }
-            var n = t.indexOf('&'),t1=t;
-            if(n >= 0)
-            {
-              ch = t.substr(n,t.length-n);
-              t = t.substr(0,n);
-            }
-            else
-            {
-              ch = t.charAt(t.length-1);
-              t = t.substr(0, t.length-1);
-            }
-            r += "<span class='key-grp'>";
-            
-            var x = t1.indexOf('!'),u='',ks,kn;
-            if(x >= 0)
-            {            
-              ks = t1.substr(x+1,t1.length-x-1);
-              kn = spkey[ks];
-              if(kn) 
-              { 
-                u = "<img src='"+site+"/img/keys/tr.gif' title='"+ks+"' alt='"+ks+"' class='key-"+kn+"' />";
-                t = t.substr(0,x); ch = '*';
-              }
-            }
-            
-            if(t.indexOf('C') >= 0) r += "<img src='"+site+"/img/keys/tr.gif' title='Ctrl' alt='Ctrl' class='key-ctrl' />";
-            if(t.indexOf('S') >= 0) r += "<img src='"+site+"/img/keys/tr.gif' title='Shift' alt='Shift' class='key-shift' />";
-            if(t.indexOf('A') >= 0) r += "<img src='"+site+"/img/keys/tr.gif' title='Alt' alt='Alt' class='key-alt' />";
-            
-            r += u;
-            endspan = true;
-          }
-        }
-        if(!endspan || ch != '*')
-        {
-          if(ch.substr(0,1) == '&')
-          {
-            if(ch == '&')
-            {
-              ch = '';
-              while(s.charAt(i) != ';' && i < s.length)
-              {
-                ch += s.charAt(i);
-                i++;
-              }
-              ch += ';';
-            }
-            if(ch == '&lt;') ch = '<';
-            else if(ch == '&gt;') ch = '>';
-            else if(ch == '&amp;') ch = '&';
-            else if(ch == '&quot;') ch = '"';
-          }
-          chv = ch.charCodeAt(0);
-          r += "<img src='"+site+"/img/keys/tr.gif' class='key-"+chv.toString()+"' title='"+this.encodeEntities(ch)+"' alt='"+this.encodeEntities(ch)+"' />";
-        }
-        if(endspan) r += "</span>";
-        i++;
-      }
-        
-      if(includePrintable)
-      {
-        r += "<span class='key-print'>";
-        i = 0;
-        while(i < s.length)
-        {
-          endspan = false;
-          ch = s.charAt(i);
-          if(ch == '[' && i < s.length-1)
-          {
-            i++; ch = s.charAt(i);
-            if(ch != '[')
-            {
-              /* Ctrl+Shift+Alt+key */
-              t = '';
-              while(s.charAt(i) != ']' && i < s.length)
-              {
-                t += s.charAt(i);
-                i++;
-              }
-              var t1 = t;
-              ch = t.charAt(t.length-1);
-              t = t.substr(0, t.length-1);
-              r += "<span class='key-grp'>";
- 
-              var x = t1.indexOf('!'),u='',ks,kn;
-              if(x >= 0)
-              {            
-                ks = t1.substr(x+1,t1.length-x-1);
-                kn = spkey[ks];
-                if(kn) 
-                { 
-                  u = ks;
-                  t = t.substr(0,x); ch = '*';
-                }
-              }
-              
-              if(t.indexOf('C') >= 0) r += "Ctrl+";
-              if(t.indexOf('S') >= 0) r += "Shift+";
-              if(t.indexOf('A') >= 0) r += "Alt+";
-              endspan = true;
-              
-              r += u;
-            }
-          }
-          if(!endspan || ch != '*')
-            if(ch == ' ') r += "<span class='key-grp'>Space</span>"; else r += this.encodeEntities(ch);
-          if(endspan) r += "</span>";
-          i++;
-        }
-        r += "</span>";
-      }
-    
-      return r;
-    }
-      
-    this.encodeEntities = function(s)
-    {
-      return s.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('"', '&quot;').replace("'", '&#39;');
-    }
-    
-    this.getElementsByClassName = function(className, tag, elm)
-    {
-      if (document.getElementsByClassName) {
-	getElementsByClassName = function (className, tag, elm) {
-	  elm = elm || document;
-	  var elements = elm.getElementsByClassName(className),
-	  nodeName = (tag)? new RegExp("\\b" + tag + "\\b", "i") : null,
-	  returnElements = [],
-	  current;
-	  for(var i=0, il=elements.length; i<il; i+=1){
-	    current = elements[i];
-	    if(!nodeName || nodeName.test(current.nodeName)) {
-	      returnElements.push(current);
-	    }
-	  }
-	  return returnElements;
-	};
-      }
-      else if (document.evaluate) {
-	getElementsByClassName = function (className, tag, elm) {
-	  tag = tag || "*";
-	  elm = elm || document;
-	  var classes = className.split(" "),
-	  classesToCheck = "",
-	  xhtmlNamespace = "http://www.w3.org/1999/xhtml",
-	  namespaceResolver = (document.documentElement.namespaceURI === xhtmlNamespace)? xhtmlNamespace : null,
-	  returnElements = [],
-	  elements,
-	  node;
-	  for(var j=0, jl=classes.length; j<jl; j+=1){
-	    classesToCheck += "[contains(concat(' ', @class, ' '), ' " + classes[j] + " ')]";
-	  }
-	  try	{
-	    elements = document.evaluate(".//" + tag + classesToCheck, elm, namespaceResolver, 0, null);
-	  }
-	  catch (e) {
-	    elements = document.evaluate(".//" + tag + classesToCheck, elm, null, 0, null);
-	  }
-	  while ((node = elements.iterateNext())) {
-	    returnElements.push(node);
-	  }
-	  return returnElements;
-	};
-      }
-      else {
-	getElementsByClassName = function (className, tag, elm) {
-	  tag = tag || "*";
-	  elm = elm || document;
-	  var classes = className.split(" "),
-	  classesToCheck = [],
-	  elements = (tag === "*" && elm.all)? elm.all : elm.getElementsByTagName(tag),
-	  current,
-	  returnElements = [],
-	  match;
-	  for(var k=0, kl=classes.length; k<kl; k+=1){
-	    classesToCheck.push(new RegExp("(^|\\s)" + classes[k] + "(\\s|$)"));
-	  }
-	  for(var l=0, ll=elements.length; l<ll; l+=1){
-	    current = elements[l];
-	    match = false;
-	    for(var m=0, ml=classesToCheck.length; m<ml; m+=1){
-	      match = classesToCheck[m].test(current.className);
-	      if (!match) {
-		break;
-	      }
-	    }
-	    if (match) {
-	      returnElements.push(current);
-	    }
-	  }
-	  return returnElements;
-	};
-      }
-      return getElementsByClassName(className, tag, elm);
-    };
-    
-    
-    this.renderAll = function()
-    {
-      var elems = KeyRenderer.getElementsByClassName('keys');
-      for(var i = 0; i < elems.length; i++)
-      {
-        elems[i].innerHTML = KeyRenderer.render(elems[i].innerHTML);
-      }
-      //<script>document.writeln(KeyRenderer.render('hf'));</script>
-    }
-    
-  }
-
-  if(window.attachEvent)
-  {
-    window.attachEvent('onload', KeyRenderer.renderAll);
-  }
-  else if(window.addEventListener)
-  {
-    window.addEventListener('load', KeyRenderer.renderAll, false);
-  }
-}
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys.298336161ce24cc84fd19fc4ecb6f7ae.css b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys.298336161ce24cc84fd19fc4ecb6f7ae.css
deleted file mode 100644
index cc4193f1c0..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys.298336161ce24cc84fd19fc4ecb6f7ae.css
+++ /dev/null
@@ -1,126 +0,0 @@
-/* example and key images */
-
-.highlightExample {color: blue; font-weight: bold; }
-.highlightKeys {color: blue; font-weight: bold;}
-
-.highlightKeys .key-print { display: none }
-.highlightKeys img { margin: 0 2px 0 0; background-image: url('keys2.gif'); height: 15px; width: 15px; }
-.highlightKeys .key-grp { margin: 0 4px; }
-.highlightKeys .key-shift { width: 41px !important; margin-right: 0px !important; background-position: 0 -45px; }
-.highlightKeys .key-ctrl { width: 33px !important; margin-right: 0px !important; background-position: -41px -45px; }
-.highlightKeys .key-alt { width: 32px !important; margin-right: 0px !important; background-position: -74px -45px; }
-.highlightKeys .key-32 { width: 37px !important; }
-
-.key-33 { background-position: -37px 0px; }
-.key-34 { background-position: -52px 0px; }
-.key-35 { background-position: -67px 0px; }
-.key-36 { background-position: -82px 0px; }
-.key-37 { background-position: -97px 0px; }
-.key-38 { background-position: -112px 0px; }
-.key-39 { background-position: -127px 0px; }
-.key-40 { background-position: -142px 0px; }
-.key-41 { background-position: -157px 0px; }
-.key-42 { background-position: -172px 0px; }
-.key-43 { background-position: -187px 0px; }
-.key-44 { background-position: -202px 0px; }
-.key-45 { background-position: -217px 0px; }
-.key-46 { background-position: -232px 0px; }
-.key-47 { background-position: -247px 0px; }
-.key-48 { background-position: -262px 0px; }
-.key-49 { background-position: -277px 0px; }
-.key-50 { background-position: -292px 0px; }
-.key-51 { background-position: -307px 0px; }
-.key-52 { background-position: -322px 0px; }
-.key-53 { background-position: -337px 0px; }
-.key-54 { background-position: -352px 0px; }
-.key-55 { background-position: -367px 0px; }
-.key-56 { background-position: -382px 0px; }
-.key-57 { background-position: -397px 0px; }
-.key-58 { background-position: -412px 0px; }
-.key-59 { background-position: -427px 0px; }
-.key-60 { background-position: -442px 0px; }
-.key-61 { background-position: -457px 0px; }
-.key-62 { background-position: -472px 0px; }
-.key-63 { background-position: -487px 0px; }
-.key-64 { background-position: 0px -15px; }
-.key-65 { background-position: -15px -15px; }
-.key-66 { background-position: -30px -15px; }
-.key-67 { background-position: -45px -15px; }
-.key-68 { background-position: -60px -15px; }
-.key-69 { background-position: -75px -15px; }
-.key-70 { background-position: -90px -15px; }
-.key-71 { background-position: -105px -15px; }
-.key-72 { background-position: -120px -15px; }
-.key-73 { background-position: -135px -15px; }
-.key-74 { background-position: -150px -15px; }
-.key-75 { background-position: -165px -15px; }
-.key-76 { background-position: -180px -15px; }
-.key-77 { background-position: -195px -15px; }
-.key-78 { background-position: -210px -15px; }
-.key-79 { background-position: -225px -15px; }
-.key-80 { background-position: -240px -15px; }
-.key-81 { background-position: -255px -15px; }
-.key-82 { background-position: -270px -15px; }
-.key-83 { background-position: -285px -15px; }
-.key-84 { background-position: -300px -15px; }
-.key-85 { background-position: -315px -15px; }
-.key-86 { background-position: -330px -15px; }
-.key-87 { background-position: -345px -15px; }
-.key-88 { background-position: -360px -15px; }
-.key-89 { background-position: -375px -15px; }
-.key-90 { background-position: -390px -15px; }
-.key-91 { background-position: -405px -15px; }
-.key-92 { background-position: -420px -15px; }
-.key-93 { background-position: -435px -15px; }
-.key-94 { background-position: -450px -15px; }
-.key-95 { background-position: -465px -15px; }
-.key-96 { background-position: 0px -30px; }
-.key-97 { background-position: -15px -30px; }
-.key-98 { background-position: -30px -30px; }
-.key-99 { background-position: -45px -30px; }
-.key-100 { background-position: -60px -30px; }
-.key-101 { background-position: -75px -30px; }
-.key-102 { background-position: -90px -30px; }
-.key-103 { background-position: -105px -30px; }
-.key-104 { background-position: -120px -30px; }
-.key-105 { background-position: -135px -30px; }
-.key-106 { background-position: -150px -30px; }
-.key-107 { background-position: -165px -30px; }
-.key-108 { background-position: -180px -30px; }
-.key-109 { background-position: -195px -30px; }
-.key-110 { background-position: -210px -30px; }
-.key-111 { background-position: -225px -30px; }
-.key-112 { background-position: -240px -30px; }
-.key-113 { background-position: -255px -30px; }
-.key-114 { background-position: -270px -30px; }
-.key-115 { background-position: -285px -30px; }
-.key-116 { background-position: -300px -30px; }
-.key-117 { background-position: -315px -30px; }
-.key-118 { background-position: -330px -30px; }
-.key-119 { background-position: -345px -30px; }
-.key-120 { background-position: -360px -30px; }
-.key-121 { background-position: -375px -30px; }
-.key-122 { background-position: -390px -30px; }
-.key-123 { background-position: -405px -30px; }
-.key-124 { background-position: -420px -30px; }
-.key-125 { background-position: -435px -30px; }
-.key-126 { background-position: -450px -30px; }
-
-.highlightKeys .key-shift2 { width: 30px !important; margin-right: -2px !important; background-position: 0 -45px; }
-.highlightKeys .key-ctrl2  { width: 22px !important; margin-right: -2px !important; background-position: -41px -45px; }
-.highlightKeys .key-alt2   { width: 20px !important; margin-right: -2px !important; background-position: -74px -45px; }
-.highlightKeys .key-pgup   { width: 28px !important; margin-right: -2px !important; background-position: -236px -45px; }
-.highlightKeys .key-pgdn   { width: 28px !important; margin-right: -2px !important; background-position: -208px -45px; }
-.highlightKeys .key-up     { width: 15px !important; margin-right: -2px !important; background-position: -309px -45px; }
-.highlightKeys .key-down   { width: 15px !important; margin-right: -2px !important; background-position: -294px -45px; }
-.highlightKeys .key-left   { width: 15px !important; margin-right: -2px !important; background-position: -279px -45px; }
-.highlightKeys .key-right  { width: 15px !important; margin-right: -2px !important; background-position: -264px -45px; }
-.highlightKeys .key-ins    { width: 20px !important; margin-right: -2px !important; background-position: -147px -45px; }
-.highlightKeys .key-del    { width: 20px !important; margin-right: -2px !important; background-position: -167px -45px; }
-.highlightKeys .key-home   { width: 32px !important; margin-right: -2px !important; background-position: -324px -45px; }
-.highlightKeys .key-end    { width: 21px !important; margin-right: -2px !important; background-position: -187px -45px; }
-.highlightKeys .key-enter  { width: 30px !important; margin-right: -2px !important; background-position: -356px -45px; }
-.highlightKeys .key-esc    { width: 20px !important; margin-right: -2px !important; background-position: -106px -45px; }
-.highlightKeys .key-tab    { width: 21px !important; margin-right: -2px !important; background-position: -126px -45px; }
-.highlightKeys .key-caps   { width: 28px !important; margin-right: -2px !important; background-position: -386px -45px; }
-.highlightKeys .key-bksp   { width: 29px !important; margin-right: -2px !important; background-position: -414px -45px; }
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys2.gif b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys2.gif
deleted file mode 100644
index 58b560cfaf..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys2.gif and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys3.gif b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys3.gif
deleted file mode 100644
index 713efa4219..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/keys3.gif and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/logo2.d8805a27a5c0399d234f1f84aca74cae.png b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/logo2.d8805a27a5c0399d234f1f84aca74cae.png
deleted file mode 100644
index 4ae5da5a2b..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/logo2.d8805a27a5c0399d234f1f84aca74cae.png and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/robots.txt.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/robots.txt.html
deleted file mode 100644
index 63f46b7023..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/robots.txt.html
+++ /dev/null
@@ -1,270 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Page not found</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-        <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="https://help.keyman.com/cdn/deploy/css/prism.55afb45bf5122d60a3eb357cf92ea6da.css">
-      <link rel="stylesheet" type="text/css" href="https://help.keyman.com/cdn/deploy/css/prism-keyman.dc4681c64685f18fff10cd5fe6ca2a9f.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown" data-section="_includes">
-<div id="phone-menu">
-    <div id="phone-menu-inner">
-        <div class="phone-menu-item">
-            <h3>Product Support</h3>
-            <ul>
-                <li><a href="https://help.keyman.com/products/desktop/">Keyman Desktop</a></li>
-                <li><a href="https://help.keyman.com/products/mac/">Keyman for macOS</a></li>
-                <li><a href="https://help.keyman.com/products/linux/">Keyman for Linux</a></li>
-                <li><a href="https://help.keyman.com/products/web/">Keymanweb.com</a></li>
-                <li><a href="https://help.keyman.com/products/iphone-and-ipad/">Keyman for iPhone and iPad</a></li>
-                <li><a href="https://help.keyman.com/products/android/">Keyman for Android</a></li>
-                <li><a href="https://help.keyman.com/products/bookmarklet/">Keyman Bookmarklet</a></li>
-            </ul>
-        </div>
-        <div class="phone-menu-item">
-            <h3>Keyboard Support</h3>
-            <ul>
-                <li><a href="https://help.keyman.com/keyboard">Keyboard Home</a></li>
-           </ul>
-        </div>
-        <div class="phone-menu-item">
-            <h3>Developer Support</h3>
-            <ul>
-             <li><a href="https://help.keyman.com/developer">Developer Home</a></li>
-                <li><a href="https://help.keyman.com/developer/current-version/">Keyman Developer</a></li>
-                <li><a href="https://help.keyman.com/developer/engine/web/">Keyman Engine for Web</a></li>
-                <li><a href="https://help.keyman.com/developer/engine/iphone-and-ipad/">Keyman Engine for iPhone and iPad</a></li>
-                <li><a href="https://help.keyman.com/developer/engine/android/">Keyman Engine for Android</a></li>
-                <li><a href="https://help.keyman.com/developer/engine/desktop/">Keyman Engine for Desktop</a></li>
-                <li><a href="https://help.keyman.com/developer/cloud/">Keyman Cloud</a></li>
-            </ul>
-        </div>
-        <div class="phone-menu-item">
-            <h3>Contact and Search</h3>
-            <ul>
-               <li><a href="http://keyman.com/contact">Contact Us</a></li>
-               <li><a href="https://help.keyman.com/search/">Search Help</a></li>
-           </ul>
-        </div>
-        <div class="phone-menu-item">
-            <h3>Keyman.com Homepage</h3>
-            <ul>
-               <li><a href="http://keyman.com">Keyman.com</a></li>
-           </ul>
-        </div>
-    </div>
-</div><div id="container">
-    <div class="header">
-        <img id="show-phone-menu" src="https://help.keyman.com/cdn/deploy/img/phonehide.ca5b6569ec86dfcbdff8ca4008c96283.png" />
-        <a id="home-link" href="https://help.keyman.com/"><img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' /></a>
-        <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-        <a id="help" href="http://keyman.com"><p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png"></a>
-    </div>
-    <div id="top-menu-bg"></div>
-    <div id="top-menu1">
-        <a href="https://help.keyman.com/"><img id="top-menu-icon" src="https://help.keyman.com/cdn/deploy/img/icon1.c7a2600d263e5bfc94580e153ddd38f0.png" /></a>
-        <div class="menu-wrapper">
-            <div class="menu-item" id="keyboards">
-                <h3><a href="https://help.keyman.com/products/">Product Support</a><span class="header-triangle"><img src="https://help.keyman.com/cdn/deploy/img/img_trans.ccca81506160a8ccf8003ae57a97b115.png" /></span></h3>
-                <div class="menu-item-dropdown">
-                    <div class="menu-dropdown-inner">
-                        <ul>
-                            <li><a href="https://help.keyman.com/products/desktop/">Keyman Desktop</a></li>
-                            <li><a href="https://help.keyman.com/products/mac/">Keyman for macOS</a></li>
-                            <li><a href="https://help.keyman.com/products/linux/">Keyman for Linux</a></li>
-                            <li><a href="https://help.keyman.com/products/web/">Keymanweb.com</a></li>
-                            <li><a href="https://help.keyman.com/products/iphone-and-ipad/">Keyman for iPhone and iPad</a></li>
-                            <li><a href="https://help.keyman.com/products/android/">Keyman for Android</a></li>
-                            <li><a href="https://help.keyman.com/products/bookmarklet/">Keyman Bookmarklet</a></li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="menu-item" id="products">
-                <a href="https://help.keyman.com/keyboard/" ><h3>Keyboard Documentation</h3></a>
-            </div>
-            <div class="menu-item" id="developers">
-                <h3><a href="https://help.keyman.com/developer/">Developer Home</a><span class="header-triangle"><img src="https://help.keyman.com/cdn/deploy/img/img_trans.ccca81506160a8ccf8003ae57a97b115.png" /></span></h3>
-                <div class="menu-item-dropdown">
-                    <div class="menu-dropdown-inner">
-                        <ul>
-                            <li><a href="https://help.keyman.com/developer/current-version/">Keyman Developer</a></li>
-                            <li><a href="https://help.keyman.com/developer/language/">Keyman Keyboard Language</a></li>
-                            <li><a href="https://help.keyman.com/developer/engine/web/">Keyman Engine for Web</a></li>
-                            <li><a href="https://help.keyman.com/developer/engine/iphone-and-ipad/">Keyman Engine for iOS</a></li>
-                            <li><a href="https://help.keyman.com/developer/engine/android/">Keyman Engine for Android</a></li>
-                            <li><a href="https://help.keyman.com/developer/engine/desktop/">Keyman Engine for Desktop</a></li>
-                            <li><a href="https://help.keyman.com/developer/cloud/">Keyman Cloud</a></li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="menu-item" id="tavultesoft">
-                <a href="http://keyman.com/contact/" ><h3>Contact Us</h3></a>
-            </div>
-
-            <div class="menu-pseudo-item" id="menu-search">
-              <form action="https://help.keyman.com/search/" method="get" role="search">
-                <div class="search-wrap">
-                  <label for="main-q" class="offscreen">Search</label>
-                  <input type="search" id="main-q" name="q" placeholder="Search" data-value="" value="" />
-                  <button type="submit" class="offscreen">Search</button>
-                </div>
-              </form>
-            </div>
-
-          </div>
-        <img id="top-menu-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" />
-    </div>
-    <div id="phone-header-spacer"></div><div id="breadcrumbTrail"><a href="https://help.keyman.com/">help.keyman.com</a> > Robots.txt </div><div class="main no-index">
-  <div id="section2">
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>    <div class="column-right">
-      <div id="toc">
-        <h3>On this page</h3>
-        <div id="toc-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article><h1>Page not found</h1>
-
-<p>Sorry, we couldn't find the page <a href="robots.txt.html">/robots.txt</a>.</p>
-
-<p>Please use the blue Support tab at the bottom of this page to tell us about this problem.</p>
-
-<h2>Search Keyman Help</h2>
-
-<script>
-  (function() {
-    var cx = '010681075583534798483:ox2qukyiv9c';
-    var gcse = document.createElement('script');
-    gcse.type = 'text/javascript';
-    gcse.async = true;
-    gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
-        '//cse.google.com/cse.js?cx=' + cx;
-    var s = document.getElementsByTagName('script')[0];
-    s.parentNode.insertBefore(gcse, s);
-  })();
-</script>
-<gcse:searchbox-only as_sitesearch='help.keyman.com' resultsUrl="/search/"></gcse:searchbox-only>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third">
-            <h2 class="footer-third-title">Keep me updated</h2>
-            <!-- Begin MailChimp Signup Form -->
-            <div id="mc_embed_signup">
-              <form action="https://keyman.us1.list-manage.com/subscribe/post?u=99fcab2b035a8a51cd2158ca9&amp;id=7ccdac1e32" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
-                  <div class="mc-field-group">
-                      <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL" placeholder="email" />
-                  </div>
-                  <div id="mce-responses" class="clear">
-                      <div class="response" id="mce-error-response" style="display:none"></div>
-                      <div class="response" id="mce-success-response" style="display:none"></div>
-                  </div>
-                  <div class="button subscribe">
-                      <h2>Subscribe</h2>
-                  </div>
-              </form>
-            </div>
-            <!--End mc_embed_signup-->
-            <br>
-            <div id="privacy-policy"><a href="https://keyman.com/privacy/">Privacy policy</a></div>
-        </div>
-        <div class="footer-third" id="footer-social">
-            <h2 class="footer-third-title">Keep in touch</h2>
-            <div>
-              <a href="https://facebook.com/KeymanApp" target="_blank" data-icon='&#xf203;'>Facebook</a>
-              <a href="https://twitter.com/keyman" target="_blank" data-icon='&#xf202;'>Twitter</a>
-              <a href="https://blog.keyman.com/" target="_blank" data-icon='&#xf413;'>Keyman blog</a>
-              <a href="https://github.com/keymanapp" target="_blank" data-icon='&#xf200;'>GitHub</a>
-              <a href="https://community.software.sil.org/c/keyman" target="_blank" id='footer-community'>Keyman Community</a>
-            </div>
-        </div>
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-        </div>
-    </div>
-</div>
-<div class="footer-tab-holder" id='footer-tab-support'>
-  <div class="footer-tab"><h4><a href='https://community.software.sil.org/c/keyman'>Support</a></h4></div>
-</div>
-<div class="footer-tab-holder" id='footer-tab-edit'>
-  <div class="footer-tab"><h4><a href='https://github.com/keymanapp/help.keyman.com/edit/master/_includes/errors/404.php' target='_blank'>Edit page</a></h4></div>
-</div>
-<div id="KeymanWebControl"></div>
-<script src='https://help.keyman.com/cdn/deploy/js/prism.b6c0ca5aacea8b4ace76ee75c055b483.js'></script>
-<script src='https://help.keyman.com/cdn/deploy/js/prism-keyman.1120908df1836e51af84b16d311406a8.js'></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/search-icon.png b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/search-icon.png
deleted file mode 100644
index f72be105f3..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/search-icon.png and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/sharing-keyboards.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/sharing-keyboards.php.html
deleted file mode 100644
index 16ffc3a7c9..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/sharing-keyboards.php.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Sharing Keyboards - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-        <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Sharing Keyboards</h2>
-
-<h3>Sharing the File</h3>
-<p>
-  If you have installed a custom keyboard or dictionary from a file, Keyman keeps a copy
-  of that file on your device.  You can find these copies in the iOS Files app.
-</p>
-<p>
-  <img src="file-share-1i.6b5cb90a3fe79c777ae3e71db9d389c4.png">
-</p>
-<p>
-  Simply select the "Keyman" folder to view these files.
-</p>
-<p>
-  <img src="file-share-2i.b5ac36c325ecebb21ae10a44ee80a7e2.png">
-</p>
-<p>
-  From here, longpress the file for the keyboard or dictionary you wish to share, then
-  click <span class="command">Share</span> to view sharing options.
-</p>
-<h3>Sharing via QR code</h3>
-<p>
-  For keyboards and dictionaries downloaded directly through the app,
-  you can provide friends with a scannable QR code.  First, find the resource
-  through the Settings menu under Installed Languages.
-</p>
-<p>
-  <img src="add-keyboard-i2.f815f73c0363f547b5c756ebcdb4a89a.png">
-</p>
-<p>
-  <img src="add-keyboard-i3.3509794b85cff04330f9f5449df2f874.png">
-</p>
-<p>
-  <img src="qr-code-share-1i.712a0fe2abd4897b44a7b16ada1eaeda.png">
-</p>
-<p>
-  When you select the keyboard, a page like the following should appear:
-</p>
-<p>
-  <img src="qr-code-share-2i.fdd13bba60d1e46353290256e00f663a.png">
-</p>
-<p>
-  Note that QR codes are only provided for certain keyboards and dictionaries
-  at this time.
-</p>
-<h3>Installing from QR code</h3>
-<p>
-  To install from QR code, simply launch your device's Camera app and point
-  it at the code, as seen below.
-</p>
-<p>
-  <img src="qr-code-share-3i.7391cc9a2f049740cb6512d1e74273ff.png">
-</p>
-<p>
-  Selecting the notification seen at the top will lead you to the following page:
-</p>
-<p>
-  <img src="qr-code-share-4i.b7bd5f4cea227ffa9e72bfb3554f2fb0.png">
-</p>
-<p>
-  Select the big <span class="command">Install on iPhone</span> (or
-  <span class="command">Install on iPad</span>) option will then download
-  the file for easy installation.  (Refer to <a href='installing-custom-keyboards.php.html'>
-    Installing custom keyboards</a> as necessary.)
-</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>
-          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png
deleted file mode 100644
index 4f862a9617..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/social-logos.ttf b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/social-logos.ttf
deleted file mode 100644
index e8013681b9..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/social-logos.ttf and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/switching-between-keyboards.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/switching-between-keyboards.php.html
deleted file mode 100644
index 0f4dac8d5a..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/switching-between-keyboards.php.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Switching between keyboards - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/switching-between-keyboards'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Switching between Keyboards</h2>
-
-<p>
-   Keyboard switching is always activated by using the following key:
-</p>
- <p>
-   <img src="globe.b98948bb94a60ffb1822a9f8c6b355e2.png" />
- </p>
-<p>
-  This will bring up a list of all currently installed languages (the default is English USA). If you have already downloaded additional languages, they will appear here. Simply select them and the keyboard will re-appear with the new language.
-</p>
-<h3>The In-App Menu</h3>
-<p>
-  <img src="in-app-picker-i.0a1e8e542953df06cc90590f16d6e52f.png" />
-</p>
-<p>Simply select any keyboard to activate it and return to the previous screen.</p>
-<h3>The System Keyboard Menu</h3>
-<p>
-  <img src="system-picker-i.7d584a3ef7e6ff7826353b2e112af3ae.png" />
-</p>
-<p>This menu only displays when the 'globe' key is touched and held.</p>
-<p>The "Close Keyman" option will activate the next available non-Keyman system keyboard.</p>
-<p>A quick tap on the "globe" key will instead transition to the next available installed keyboard
-  without displaying the menu.</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/template.5f4056fcb922f05667eb19e3809c64db.css b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/template.5f4056fcb922f05667eb19e3809c64db.css
deleted file mode 100644
index 9c17521cfd..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/template.5f4056fcb922f05667eb19e3809c64db.css
+++ /dev/null
@@ -1,1852 +0,0 @@
-/**************************************
- * CSS RESET
- * ***********************************/
-
-/* http://meyerweb.com/eric/tools/css/reset/
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-  padding-left: 10px;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-}
-
-tbody {
-    display: table-row-group;
-    vertical-align: middle;
-}
-
-table td{
-	padding: 4px;
-}
-
-html{
-		font-family: 'Cabin', sans-serif;
-		color: #333;
-}
-
-html p,
-html dd,
-html li {
-  font-family: 'Calibri', sans-serif;
-  font-size: 14pt;
-}
-
-body {
-	line-height: inherit;
-}
-
-/**************************************
- * Language Section CSS
- * ***********************************/
-
-@import 'fonts.css';
-
-/**************************************
- * Page Layout CSS
- * ***********************************/
-
-html{
-    cursor: default;
-    background: #fff;
-}
-
-.wrapper {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-#section2 .wrapper {
-    overflow-x: auto; /* fixes content too wide leading to content dropping below index, but not ideal, temp fix better than previous */
-    margin-left: 220px;
-    margin-right: 316px; /* leave space for the short menu */
-}
-
-:not(div.interface-hierarchy) blockquote {
-  margin-left: 32px;
-  margin-bottom: 16px;
-  background: rgba(242,242,242,0.9);
-  padding: 4px;
-  border-radius: 4px;
-}
-
-div.interface-hierarchy {
-  padding: 0px 10px 10px 10px;
-  line-height: 1.4;
-  font-size: 14pt;
-}
-
-div.interface-hierarchy blockquote {
-  padding-left: 20px;
-}
-
-.no-toc #section2 .wrapper {
-  margin-right: auto;
-}
-
-.no-index #section2 .wrapper {
-  margin-left: auto;
-}
-
-@media only screen and (min-width: 1440px) {
-  body #section2 {
-    float: none;
-    max-width: 1400px;
-    margin-left: auto;
-    margin-right: auto;
-    display: block;
-  }
-}
-
-@media only screen and (min-width: 1640px) {
-  body #section2 {
-    float: none;
-    max-width: 1600px;
-    margin-left: auto;
-    margin-right: auto;
-    display: block;
-	}
-
-	body #index {
-		width: 256px;
-	}
-
-	#section2 .wrapper {
-		margin-left: 316px;
-	}
-}
-
-@media only screen and (min-width: 1024px) and (max-width: 1279px) {
-  #section2 .wrapper {
-    margin-right: 20px;
-  }
-}
-
-.menu-wrapper {
-  width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.button{
-    float: left;
-    width: 200px;
-    height: 40px;
-    line-height: 40px;
-    border-radius: 6px;
-    text-align: center;
-    margin: 20px;
-    cursor: pointer;
-    box-shadow: 1px 1px 2px #3e3e3e;
-}
-
-.button a{
-    text-decoration: none;
-}
-
-.button h2{
-    color: #fff;
-}
-
-#container{
-	min-height: 100%;
-	width: 100%;
-}
-
-.main{
-	float: left;
-	width: 100%;
-}
-
-.valign-outer{
-	height: 100%;
-	width: 100%;
-	overflow: hidden;
-	display: table;
-	position: static;
-}
-
-.valign-middle{
-	display: table-cell;
-	vertical-align: middle;
-	width: 100%;
-	position: static;
-}
-
-.center{
-	text-align: center;
-}
-
-.command{
-	font-weight: 400;
-	color: #69B7D2;
-}
-
-.inline{
-	text-align: center;
-}
-
-.red{
-	color: #B92034;
-}
-
-.underline{
-	border-bottom: 1px solid #B92034;
-	margin-bottom: 15px;
-	padding-bottom: 0px !important;
-}
-
-.caption{
-	text-align: center;
-	font-size: 11pt;
-	font-weight: 600;
-	margin-top: -15px;
-	padding: 0px 10px;
-}
-
-.people-text{
-	font-size: 12pt !important;
-}
-
-.testimonial{
-	display: block;
-	margin: 20px;
-	background: #fff;
-	border-radius: 14px;
-	padding: 30px 20px;
-	box-shadow: 1px 1px 4px #000;
-	font-style: italic;
-	color: #6e6e6e;
-}
-
-.caption a{
-	text-decoration: underline;
-	color: #B92034;
-}
-
-.contact-social{
-	position: relative;
-	top: 12px;
-}
-
-/**********************************
- * HEADER CSS
- *********************************/
-
-.header{
-    float: left;
-    width: 100%;
-    background: #f2f2f2;
-    display: block;
-    z-index: 5;
-}
-
-#show-phone-menu{
-	display: none;
-}
-
-#logo{
-    margin-left: 30px;
-    float: left;
-}
-
-#no-menu-spacer{
-	float: left;
-	width: 100%;
-	height: 20px;
-	display: block;
-}
-
-#header-bottom{
-    width: 100%;
-    height: 8px;
-    display: block;
-}
-
-#help{
-	width: 160px;
-	position: absolute;
-	top: 35px;
-	left: 100%;
-	margin-left: -160px;
-	text-decoration: none;
-}
-
-#help p{
-	float: left;
-	font-size: 14pt;
-	color: #000;
-	vertical-align: top;
-	text-decoration: underline;
-}
-
-#help img{
-	float: left;
-	margin-left: 10px;
-}
-
-#breadcrumbTrail{
-	float: left;
-	margin: 10px 10px 20px 40px;
-	background: #f2f2f2;
-	padding: 10px;
-	border-radius: 4px;
-	font-size: 10pt;
-}
-
-#breadcrumbTrail a{
-	color: #B92034;
-}
-
-/* Version Selector */
-
-#version-selector {
-	float: right;
-	margin: 10px 312px 20px 10px;
-	background: #f2f2f2;
-	padding: 10px;
-	border-radius: 4px;
-	font-size: 10pt;
-}
-
-#version-selector div {
-	display: none;
-}
-
-#version-selector:hover div {
-	display: block;
-	position: absolute;
-	margin-top: 10px;
-	margin-left: -10px;
-	box-shadow: 0px 0px 4px rgba(0,0,0,0.4);
-	border-radius: 2px;
-	z-index: 2;
-	background: #f2f2f2;
-	padding: 10px;
-}
-
-#version-selector div span {
-	display: block;
-	padding: 4px 10px;
-}
-
-#version-selector div a {
-	display: block;
-	color: #b92034;
-	padding: 4px 10px;
-}
-
-#version-selector div a:hover {
-	color: #b92034;
-	background: rgba(224,224,224,0.9);
-}
-
-/**************************************
- * TOP MENU 1 CSS
- * ***********************************/
-
-#top-menu1{
-	float: left;
-	width: 100%;
-	height: 50px;
-	background: #f2f2f2;
-	position: absolute;
-	z-index: 2;
-	top: 66px;
-	padding-top: 12px;
-}
-
-#top-menu-bg{
-	position:relative;
-	top:-8px;
-	width:100%;
-	padding-top: 12px;
-	height:50px;
-	float: left;
-	background:white;
-}
-
-#top-menu1.faded-menu {
-	position: fixed;
-	top: 0;
-	background: rgba(242,242,242,0.9);
-}
-
-#top-menu-icon{
-	float: left;
-	position: absolute;
-	top: 13px;
-	left: 30px;
-	display: none;
-}
-
-#top-menu-icon2{
-	float: left;
-	position: absolute;
-	top: 25px;
-	left: 100%;
-	margin-left: -57px;
-	display: none;
-}
-
-#top-menu1 .menu-item{
-	float: left;
-	width: 240px;
-	height: 50px;
-	text-align: center;
-	line-height: 50px;
-	overflow-y: visible;
-}
-
-#top-menu1 .menu-item:hover, #top-menu1 .menu-item img:hover, #top-menu1 .menu-item h3:hover, #top-menu1 .menu-item h3:hover a{
-	color: #B92034;
-}
-
-#top-menu1 .menu-item:nth-child(odd):hover{
-	background: #f2f2f2;
-	box-shadow: 1px 1px 4px #000;
-	position: relative;
-	z-index: 2;
-}
-
-#top-menu1 .menu-item:hover .menu-item-dropdown{
-	display: block !important;
-}
-
-#top-menu1 .menu-item:hover .header-triangle img{
-	background: url('triangle.png') 17px 0;
-}
-
-#top-menu1 .menu-item a{
-	color: #000;
-	text-decoration: none;
-}
-
-#top-menu1 .menu-item h3 a:hover{
-	color: #B92034;
-}
-
-#top-menu1 .menu-item h3{
-	font-weight: 600;
-	color: #000;
-}
-
-.header-triangle img{
-	margin-left: 5px;
-	height: 9px;
-	width: 17px;
-	background: url('triangle.png') 0 0;
-}
-
-#top-menu1 .menu-item .menu-item-sub{
-	float: right;
-}
-
-#top-menu-bottom{
-    width: 100%;
-    height: 8px;
-    display: block;
-}
-
-.menu-item-dropdown{
-	width: 240px;
-	position: relative;
-	left: -5px;
-	z-index: 3;
-	display: none;
-	text-align: left;
-	padding: 0px 5px 5px 5px;
-	overflow: hidden;
-}
-
-.menu-dropdown-inner{
-	width: 240px;
-	background: #f2f2f2;
-	margin-bottom: 10px;
-	padding-bottom: 10px;
-	box-shadow: 1px 1px 4px #000;
-}
-
-.menu-item-dropdown h4{
-	color: #000;
-	border-bottom: 1px solid #000;
-	margin: 0px 10px;
-	padding-top: 10px;
-	font-weight: 600;
-	line-height: 1.5em;
-}
-
-.menu-item-dropdown h4:first-child{
-	border-top: none;
-}
-
-.menu-item-dropdown form{
-	width: 100%;
-	height: 30px;
-	padding: 10px 0px;
-}
-
-#language-search{
-	float: left;
-	width: 139px;
-	height: 28px;
-	border-radius: 0px;
-	border: solid 1px gray;
-	margin-left: 10px;
-	padding-left: 10px;
-}
-
-#search-submit{
-	float: left;
-	position: relative;
-	left: -1px;
-}
-
-.menu-item-dropdown ul{
-	padding-top: 10px;
-}
-
-.menu-item-dropdown ul li{
-	padding: 0px;
-	text-align: left;
-	line-height: 1.8em;
-	width: 220px;
-	margin: 0px 10px;
-}
-
-.menu-item-dropdown ul li a{
-	color: #B92034 !important;
-	font-weight: 500;
-	font-size: 11pt;
-	display: inline-block;
-	width: 100%;
-	height: 100%;
-	padding: 0px 10px;
-}
-
-.menu-item-dropdown ul li:hover a{
-	text-decoration: underline !important;
-}
-
-.menu-item-dropdown ul li:hover{
-	background: #e2e2e2;
-}
-
-.beta{
-	display: inline-block;
-	font-size:8pt;
-	color:#000;
-	position:relative;
-	top:-6px;left:3px
-}
-
-#phone-menu{
-	display: none;
-}
-
-#phone-header-spacer{
-	display: none;
-}
-
-/* Search Box */
-
-.search-wrap {
-  right: 0;
-  top: 0;
-  position: absolute;
-  margin: 21px 32px 21px 21px;
-}
-
-input[type="search"] {
-  -webkit-appearance: textfield;
-  appearance: textfield;
-  -moz-appearance: textfield;
-}
-
-.search-wrap input {
-  width: 22px;
-  -moz-transition: all 0.3s ease-out;
-  -webkit-transition: all 0.3s ease-out;
-  transition: all 0.3s ease-out;
-  padding: 4px 22px 4px 4px;
-  background-color: #6D6C6F;
-  border-radius: 6px;
-  border: none;
-  background-image: url('search-icon.png');
-  background-repeat: no-repeat;
-  background-position: right 4px;
-  color: white;
-}
-.search-wrap input:focus {
-  width: 200px;
-  -moz-transition: all 0.3s ease-out;
-  -webkit-transition: all 0.3s ease-out;
-  transition: all 0.3s ease-out;
-}
-
-.search-wrap .offscreen {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-
-/**********************************
- * FOOTER CSS
- *********************************/
-
-.footer{
-    float: left;
-    width: 100%;
-    text-align: center;
-    background: #A4A8AB;
-}
-
-.footer .wrapper {
-  width: auto;
-  display: inline-block;
-  margin: 0;
-  text-align: left;
-}
-
-.footer-third{
-    float: left;
-    width: 320px;
-    margin-left: 4px;
-    margin-right: 4px;
-}
-
-.footer-third-title{
-    margin-top: 30px;
-    text-align: center;
-    font-size: 18pt;
-    color: #fff;
-    margin-bottom: 25px;
-}
-
-.footer-third form{
-    width: 320px;
-}
-
-.footer-third form input{
-	-webkit-appearance: none;
-	padding: 0px;
-    float: left;
-    height: 38px;
-    width: 200px;
-    padding-left: 10px;
-    font-size: 14pt;
-    border-radius: 6px;
-    border-bottom-right-radius: 0px;
-    border-top-right-radius: 0px;
-    box-shadow: none;
-    border: 1px solid #FFFFFF;
-    margin-left: 10px;
-}
-
-.footer-third form input:focus{
-    outline: 0;
-}
-
-.subscribe{
-    width: 90px;
-    margin: 0px;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-    background: #666666;
-    box-shadow: none;
-}
-
-.subscribe h2{
-	font-size: 16px;
-	margin: 0px;
-	padding: 0px;
-	font-weight: normal;
-}
-
-.subscribe:hover{
-    background: #888888;
-}
-
-#footer-mailchimp br {
-  clear: both;
-}
-
-/*
- social-logos font from https://github.com/Automattic/social-logos, GPLv2
- */
-@font-face {
-  font-family: "social-logos";
-  src: url("social-logos.ttf");
-  font-weight: normal;
-  font-style: normal;
-}
-
-/*
- Noto Sans Regular Ascii font is the ASCII portion of NotoSans-Regular
- from https://www.google.com/get/noto/, SIL Open Font License v1.1
- Generated with: pyftsubset ../fonts/Noto_Sans/NotoSans-Regular.ttf --unicodes=U+0020-007F
- */
-@font-face {
-  font-family: "NotoSans-Regular-Ascii";
-  src: url("NotoSans-Regular-Ascii.ttf");
-  font-weight: normal;
-  font-style: normal;
-}
-
-[data-icon]:before {
-  font-family: "social-logos" !important;
-  content: attr(data-icon);
-  font-style: normal !important;
-  font-weight: normal !important;
-  font-variant: normal !important;
-  text-transform: none !important;
-  line-height: 1;
-  padding-right: 4px;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale; }
-
-#footer-social {
-  text-align: center;
-}
-
-#footer-social a {
-  display: block;
-  text-decoration: none;
-  color: #666666;
-  font-size: 14pt;
-  padding: 4px;
-}
-
-#footer-social a:hover {
-  color: #444444;
-}
-
-#privacy-policy {
-  text-align: center;
-  margin-top: 32px;
-  display: block;
-}
-
-#privacy-policy a {
-  display: block;
-  text-decoration: none;
-  color: white;
-  font-size: 12pt;
-}
-
-#privacy-policy a:hover {
-  color: #444444;
-}
-
-#footer-social div {
-  display: inline-block;
-  text-align: left;
-  margin-bottom: 24px;
-}
-
-#footer-social a#footer-community {
-  padding-left: 27px;
-}
-
-.sil-logo a, .sil-logo a:visited {
-  color: white;
-  text-decoration: none;
-}
-
-.sil-logo a:hover {
-  color: white;
-  text-decoration: underline;
-}
-
-.sil-logo{
-  text-align: center;
-  margin-top: 20px;
-}
-
-.sil-logo p{
-    color: #fff;
-    font-size: 12pt;
-    margin-top: 10px;
-}
-
-/**********************************
- * SECTION 2 CSS
- *********************************/
-
-#section2{
-	display: inline;
-}
-
-#section2 h1{
-	text-align: left;
-	font-size: 28pt;
-	padding: 40px 10px 10px 10px;
-}
-
-#section2 h2{
-	font-size: 20pt;
-	line-height: 1.4;
-	padding: 32px 10px 10px 10px;
-}
-
-#section2 h3{
-	font-size: 16pt;
-	font-weight: 600;
-	padding: 16px 10px 10px 10px;
-}
-
-#section2 h4{
-  font-size: 14pt;
-  font-weight: 600;
-  padding: 4px 10px 4px 10px;
-}
-
-#section2 p, #section2 dl, #section2 .itemizedlist {
-	padding: 0px 10px 10px 10px;
-	line-height: 1.4;
-	font-size: 14pt;
-}
-
-#section2 p a{
-	color: #B92034;
-	text-decoration: underline;
-	cursor: pointer;
-	font-weight: 600;
-	line-height: 1.4;
-}
-
-#section2 li{
-	margin-left: 30px;
-	list-style: disc;
-	list-style-position: outside;
-	line-height: 1.4;
-  font-size: 14pt;
-}
-
-#section2 p.context-main-image {
-  text-align: center;
-  margin-left: -12px;
-}
-
-#section2 p.context-main-image img,
-#section2 img.context-main-image {
-  box-shadow: 0px 4px 12px rgba(0,0,0,0.75);
-  border-radius: 4px;
-}
-
-/*#section2 img{
-	margin: 10px;
-}*/
-
-#section2 img.center{
-	margin-left: auto;
-	margin-right: auto;
-	display: block;
-}
-
-#section2 img.inline {
-  margin: 0;
-}
-
-#section2 .itemizedlist li{
-	list-style-position: outside;
-}
-
-#section2 li {
-  margin-bottom: 12px;
-}
-
-/* TODO: deprecate this since prismjs handles it. This also conflicts with the line-numbers plugin */
-#section2 pre[class*="language-"] {
-  margin-left: 9px;
-  margin-right: 9px;
-  padding: 9px;
-  line-height: 1.4;
-}
-
-#section2 pre[class*="language-"] code[class*="language-"] {
-  line-height: 1.4;
-}
-
-.product-index {
-	text-align: center;
-}
-
-.product{
-	margin-bottom: 10px;
-	margin-top: 20px;
-	background: #e3e3e3;
-	text-align: center;
-	max-height: 362px;
-	display: inline-block;
-	vertical-align: top;
-	width: 300px;
-	min-height: 295px;
-	padding: 0px 5px 10px 5px;
-	margin-left: 5px;
-	margin-right: 5px;
-}
-
-.product:hover {
-	background: #D6D6D6;
-	cursor: pointer;
-}
-
-.product a{
-	text-decoration: none;
-	color: #000;
-	display: inline-block;
-}
-
-.product h3{
-	margin-bottom: 6px;
-	font-size: 16pt;
-	color: #B92034;
-	text-align: center;
-}
-
-.product p{
-	padding: 0 8px;
-	line-height: 1.3;
-	color: #333;
-}
-
-.product p{
-	text-align: left;
-	font-size: 12pt !important;
-	height: 130px;
-}
-
-#engine-support-list{
-	margin-bottom: 20px;
-	columns: 2;
-	-webkit-columns: 2;
-	-moz-columns: 2;
-}
-
-#keyboard-support-list{
-	margin-bottom: 20px;
-	columns: 4;
-	-webkit-columns: 4;
-	-moz-columns: 4;
-}
-
-#product-support-list{
-	columns: 3;
-	-webkit-columns: 3;
-	-moz-columns: 3;
-	text-align: center;
-}
-
-#version-history{
-	text-align: center;
-}
-
-#keyboard-support-list li, #product-support-list li, #engine-support-list li, #version-history li{
-	list-style: none !important;
-}
-
-#keyboard-support-list li a, #product-support-list li a, #engine-support-list li a, #version-history li a{
-	color: #B92034;
-	text-decoration: underline;
-}
-
-/* Font styling limited to Ascii characters */
-kbd {
-    background: none repeat scroll 0 0 #CCCCD0;
-    border: 1px solid #808080;
-    border-radius: 4px;
-    color: #000000;
-    font-family: "NotoSans-Regular-Ascii";
-    font-size: 13px;
-    font-weight: bold;
-    margin: 0 1px;
-    padding: 0px 0px 0px;
-    min-width: 1.5em;
-    text-align: center;
-    vertical-align: bottom;
-    display: inline-block;
-}
-
-/* Make the <kbd> element look like an iOS key. */
-kbd.ios {
-    background-color: #fafafa; /* faaa fa fa fa fa faaaa far better... */
-    border: 0;
-    box-shadow: /* Hard shadow */     0 1px rgba(0,0,0,0.4),
-                /* Diffuse shadow */  0 1px 4px rgba(0,0,0,0.2),
-                /* Highlight */ inset 0 1px white;
-    border-radius: 4px;
-    font-weight: 500;
-}
-
-#section2 aside {
-  margin: 12px;
-  background: #e3e5e6;
-  border-radius: 6px;
-  padding: 1px 0;
-}
-
-#section2 aside h2,
-#section2 aside h3 {
-  padding-top: 8px;
-}
-
-.list-of-tables {
-    display: none;
-}
-
-.bold{
-	font-weight: bold;
-}
-
-.programlisting{
-	font-family: -moz-fixed;
-	font-family: "Courier New", Courier, monospace;
-	background: #f2f2f2;
-	padding: 5px;
-	line-height: 1.3;
-	margin: 10px;
-	overflow-x: auto;
-}
-
-.navheader, .navfooter{
-	width: auto;
-	margin: 0px 10px;
-}
-
-ol li a{
-	color: #B92034;
-}
-
-.tip{
-	background: #f2f2f2;
-	border-radius: 6px;
-	padding: 20px;
-	margin: 10px 30px;
-}
-
-.tip .title{
-	margin-top: 0px !important;
-}
-
-.informaltable table{
-	background: #f2f2f2;
-	margin: 10px;
-}
-
-.informaltable td, .informaltable th{
-	border: 1px solid gray;
-	padding: 5px;
-}
-
-.note{
-	border: 1px solid #F3E5DE;
-}
-
-.note .title{
-	margin-top: 0px !important;
-	padding-top: 5px;
-	background-color: #F3E5DE;
-}
-
-.display{
-	background: #f2f2f2;
-}
-
-.display td, .display th{
-	border: solid 1px gray;
-	padding: 5px;
-}
-
-.display th{
-	font-weight: bold;
-}
-
-table.display {
-  margin-bottom: 12px;
-}
-
-table.platform {
-  margin-left: 10px;
-  margin-bottom: 12px;
-}
-
-.platform th {
-  background: #f2f2f2;
-  font-weight: bold;
-}
-
-.platform td, .platform th {
-  border: solid 1px gray;
-  padding: 5px;
-  text-align: center;
-}
-
-#osk,
-#osk-phone,
-#osk-tablet{
-	position: relative;
-	z-index: -2;
-}
-
-#osk .kmw-osk-inner-frame{
-	height: 320px !important;
-	font-size: 2em !important;
-  padding: 4px 0 4px 4px;
-}
-
-#osk-phone .kmw-osk-inner-frame{
-  padding-top: 6px !important;
-	height: 256px !important;
-  width: 528px !important;
-	font-size: 1.5em !important;
-}
-
-#osk-tablet .kmw-osk-inner-frame{
-  padding-top: 6px !important;
-	width: 726px !important;
-  height: 372px !important;
-	font-size: 1.5em !important;
-}
-
-#osk-container,
-#osk-phone-container,
-#osk-tablet-container {
-  display: none;
-}
-
-body[data-device='Windows'] #osk-container,
-body[data-device='Windows'] #osk-phone-container,
-body[data-device='Windows'] #osk-tablet-container {
-  display: block;
-}
-
-body[data-device='iPhone'] #osk-phone-container,
-body[data-device='Android'] #osk-phone-container {
-  display: block;
-}
-
-body[data-device='iPad'] #osk-tablet-container,
-body[data-device='Android'] #osk-tablet-container {
-  display: block;
-}
-
-body[data-device='Unknown'] #osk-container,
-body[data-device='Unknown'] #osk-phone-container,
-body[data-device='Unknown'] #osk-tablet-container {
-  display: block;
-}
-
-/**********************************
- * PHONE MENU CSS
- *********************************/
-
-#show-phone-menu{
-	display: none;
-	float: left;
-	margin: 10px;
-	position: relative;
-	z-index: 6;
-}
-#phone-menu{
-	position: fixed;
-	top: 49px;
-	left: 0px;
-	z-index: 6;
-	width: 80%;
-	height: 100%;
-}
-#phone-menu-inner{
-	width: 100%;
-	height: 100%;
-	overflow-y: scroll;
-	padding-bottom: 40%;
-	-webkit-overflow-scrolling:touch;
-	border-right: solid 4px #C1C1C1;
-	background: #fff;
-}
-.phone-menu-item{
-	float: left;
-	width: 100%;
-	height: auto;
-	padding: 10px 0px;
-	background: #f2f2f2;
-}
-.phone-menu-item:last-child{
-	margin-bottom: 60px;
-}
-.phone-menu-item h3{
-	font-size: 14pt;
-	font-weight: bold;
-	margin: 0px 10px;
-	border-bottom: solid 1px #000;
-}
-.phone-menu-item form{
-	margin-top: 10px;
-}
-#language-search2{
-	float: left;
-	width: 144px;
-	height: 30px;
-	margin-left: 10px;
-	border-radius: 0px;
-	border: solid 1px gray;
-	padding: 0px;
-	padding-left: 10px;
-	font-size: 12pt;
-}
-#search-submit2{
-	float: left;
-	position: relative;
-	left: -1px;
-	border-radius: 0px;
-}
-.phone-menu-item ul{
-	padding: 10px;
-}
-.phone-menu-item ul li{
-	line-height: 1.8em;
-}
-.phone-menu-item ul li a{
-	text-decoration: underline;
-	color: #B92034;
-}
-#show-phone-menu-spacer{
-	display: none;
-	float: left;
-}
-
- /**************************************
- * FOOTER TABS
- * ***********************************/
-
-.footer-tab-holder{
-	width: 70px;
-	height: 20px;
-	padding: 9px;
-	position: fixed;
-	top: 100%;
-	left: 100%;
-	z-index: 4;
-}
-
-#footer-tab-support {
-	margin-left: -340px;
-}
-
-#footer-tab-edit {
-	margin-left: -260px;
-}
-
-.footer-tab{
-	float: right;
-	position: relative;
-	font-size: 10pt;
-	top: -34px;
-	right: -10px;
-	background: #69B7D2;
-	height: 20px;
-	padding: 5px 0px;
-	text-align: center;
-	border-top-left-radius: 7px;
-	border-top-right-radius: 7px;
-	width: 70px;
-	margin-left: 210px;
-	cursor: pointer;
-	border-top: solid 1px #444;
-	border-left: solid 1px #444;
-	border-right: solid 1px #444;
-}
-
-.footer-tab a{
-	color: #444;
-	text-decoration: none;
-}
-
-/**************************************
- * TABLET CSS
- * ***********************************/
-
-@media only screen and (min-width: 768px) and (max-width: 1024px){
-	.wrapper, #section2 .wrapper{
-		width: 740px;
-    margin-left: auto;
-    margin-right: auto;
-	}
-	/* Header */
-	.header{
-		position: fixed;
-	}
-	#top-menu1 .menu-item{
-		width: 148px;
-	}
-	#top-menu1 .menu-item h3{
-		font-size: 10pt;
-	}
-	#logo{
-		margin-bottom: 15px;
-	}
-	#phone-header-spacer{
-		display: block;
-		height: 80px;
-	}
-	/* Footer */
-  .footer {
-    height: auto;
-  }
-	.footer-third{
-    float: none;
-    clear: both;
-		width: 370px;
-    margin: 20px 0px 0px 0px;
-	}
-	/* Section 1 */
-	#sect1-title h1{
-		font-size: 36pt;
-	}
-	#sect1-image img{
-		max-width: 90%;
-	}
-	/* Phone Menu */
-	#top-menu1{
-		display: none;
-	}
-	#top-menu-bg{
-		display: none;
-	}
-	#show-phone-menu{
-		display: block;
-		margin-top: 28px;
-	}
-	#phone-menu{
-		top: 81px;
-		width: 40%;
-	}
-	#osk .kmw-osk-inner-frame{
-		height: 280px;
-		font-size: 1.8em !important;
-	}
-	.footer-tab-holder{
-		display: none;
-	}
-}
-
-@media only screen and (min-width: 768px) and (max-width: 1024px) and (orientation: portrait){
-	#sect1-title h1{
-		text-align: center;
-		font-size: 28pt;
-	}
-}
-
-/* 7 inch */
-@media all and (min-width: 600px) and (max-width: 768px){
-	.wrapper, #section2 .wrapper{
-		width: 580px;
-    margin-left: auto;
-    margin-right: auto;
-	}
-	/* Header */
-	#top-menu-bg{
-		display: none;
-	}
-	#top-menu1 .menu-item{
-		width: auto;
-    padding: 0 16px;
-	}
-	#top-menu1 .menu-item h3{
-		font-size: 8pt;
-	}
-	/* Footer */
-	.footer-third{
-		width: 290px;
-		margin-left: 0px;
-		margin-right: 0px;
-	}
-	.footer-third form{
-		width: 290px;
-	}
-	.footer-third form input{
-		width: 170px;
-	}
-	#facebook{
-		margin-left: 20px;
-	}
-	/* Section 1 */
-	#sect1-title h1{
-		font-size: 28pt;
-		text-align: center;
-	}
-	#sect1-image img{
-		max-width: 90%;
-	}
-	/* Phone Menu */
-	#show-phone-menu{
-		display: block;
-	}
-	#osk .kmw-osk-inner-frame{
-		height: 220px;
-		font-size: 1.5em !important;
-	}
-	.footer-tab-holder{
-		display: none;
-	}
-}
-
-
-
-
-/**************************************
- * PHONE CSS
- * ***********************************/
-
-@media all and (min-width: 10px) and (max-width: 600px){
-	.wrapper, #section2 .wrapper{
-		width: 320px;
-    margin-left: auto;
-    margin-right: auto;
-	}
-	/* Header */
-	#top-menu-bg{
-		display: none;
-	}
-	.header{
-		position: fixed;
-	}
-	#top-menu1{
-		display: none;
-	}
-	#help{
-		display: none;
-	}
-	.header{
-		height: 49px !important;
-	}
-	#logo{
-		margin-top: 3px;
-		width: 185px;
-		position: fixed;
-		left: 50%;
-		margin-left: -92px;
-	}
-	#phone-header-spacer{
-		display: block;
-		height: 57px;
-	}
-	/* Products */
-
-	.product{
-		display: inline-block;
-		vertical-align: top;
-		width: auto;
-		min-height: auto;
-	}
-
-	.product img {
-		z-index: 1;
-		position: absolute;
-		width: 150px;
-		left: 50%;
-		margin-left: -75px;
-		opacity: 0.2;
-	}
-
-	.product h3{
-		z-index: 2;
-	}
-
-	.product p{
-		height: 60px;
-		z-index: 2;
-	}
-
-
-
-	/* Footer */
-	.footer{
-		height: auto;
-	}
-	.footer-third{
-		margin-left: 0px;
-		margin-right: 0px;
-		height: auto;
-	}
-	.sil-logo{
-		float: left;
-		margin-top: 40px;
-		margin-bottom: 20px;
-	}
-	/* Section 1 */
-	.section1{
-		height: auto;
-		background-size: auto 100%;
-	}
-	#sect1-image{
-		width: 100%;
-		height: auto;
-	}
-	#sect1-image img{
-		max-width: 80%;
-		height: auto;
-		padding-bottom: 10px;
-	}
-	#sect1-title{
-		width: 100%;
-		height: auto;
-	}
-	#sect1-title h1{
-		font-size: 24pt;
-		text-align: center;
-		padding: 20px 10px 0px 10px;
-	}
-	#sect1-title a{
-		display: none;
-	}
-	/* Phone Menu */
-	#show-phone-menu{
-		display: block;
-	}
-	#show-phone-menu-spacer{
-		display: block;
-		width: 40px;
-		height: 29px;
-	}
-	/* Section 2 */
-	#section2 img{
-		max-width: 80%;
-	}
-	#section2 h2{
-		margin: 10px 10px 15px 10px;
-		text-align: center;
-	}
-	#keyboard-support-list{
-		columns: 2;
-		-webkit-columns: 2;
-		-moz-columns: 2;
-		margin-bottom: 20px;
-	}
-	#product-support-list {
-		padding: 0px 30px;
-		font-size: 14pt;
-		columns: 1;
-		-webkit-columns: 1;
-		-moz-columns: 1;
-		margin-bottom: 20px;
-	}
-	#osk .kmw-osk-inner-frame{
-		height: 140px;
-		font-size: 1em !important;
-	}
-	#keymanExample{
-		overflow-x: scroll;
-		overflow-y: hidden;
-		height: 100px;
-	}
-	#keymanExample table{
-		width: 1000px;
-	}
-	.footer-tab-holder{
-		display: none;
-	}
-}
-
-#KeymanWebControl{
-	display: none;
-}
-
-/* Landscape mode */
-@media all and (min-width: 480px) and (max-width: 600px) and (orientation: landscape){
-	.wrapper, #section2 .wrapper{
-		width: 460px;
-    margin-left: auto;
-    margin-right: auto;
-	}
-	/* Header */
-	/* Footer */
-	.footer-third{
-		margin-left: 70px;
-		margin-right: 70px;
-	}
-	.sil-logo{
-		margin-left: 70px;
-	}
-	/* Section 1 */
-}
-
-/**************************************
- * WEB DEVELOPER HELP CSS
- * ***********************************/
-
-div.webhelp {
-  clear: both;
-}
-
-div.webhelp h3 {
-  margin: 16px 0 0 0;
-  padding: 0;
-}
-
-div.webhelp h4 {
-  margin: 0 0 16px 0;
-  padding:0;
-}
-img.webhelp, div.webhelp img {margin:16px 0 !important;border: 1px solid grey;}
-
-
-code {
-  font-family: Consolas, Courier, "Courier New", mono;
-  font-size: 10.5pt;
-}
-
-strong, b {
-  font-weight: bold;
-}
-
-i, cite, em, var, address, dfn {
-font-style: italic;
-}
-
-dt {
-  margin-top: 16px;
-}
-
-dt:first-child {
-  margin-top: 0;
-}
-
-dd {
-  margin-left: 32pt;
-}
-
-table.standard-table td,
-table.standard-table th {
-  border: solid #e0e0dc;
-  border-width: 0 1px 1px 0;
-  padding: 6px;
-  text-align: left;
-}
-table.standard-table th {
-  border: 2px solid #fff;
-  border-bottom: 2px solid #d4dde4;
-  background: #eaeff2;
-  background: rgba(212,221,228,.5);
-  font-family: 'Open Sans Light',sans-serif;
-  font-size: 14px;
-  padding: 2px 8px 4px;
-  font-weight: 700;
-}
-
-table.standard-table td {
-  background-color: #f9fafb;
-  background-color: rgba(212,221,228,.15);
-  border: 2px solid #fff;
-  box-shadow: inset 0 -1px 0 0 #eaeff2;
-  box-shadow: inset 0 -1px 0 0 rgba(212,221,228,.5);
-}
-
-article dl dt span.readonly {
-  background-color: #666769;
-  font-size: 13px;
-  color: white;
-  padding: 1px 6px 3px;
-  border-radius: 6px;
-}
-
-article dl dd span.optional {
-	background-color: #9c9c9c;
-	font-size: 13px;
-	font-style: italic;
-	font-weight: lighter;
-	color: white;
-	padding: 1px 6px 3px;
-	border-radius: 6px;
-}
-
-/**
-  Table of contents -- developer section only
-*/
-
-.column-right {
-  display: none;
-  float: right;
-}
-
-.column-left {
-  display: none;
-  float: left;
-}
-
-.column-left.show-index {
-  display: block;
-}
-
-.column-right.show-toc {
-  display: block;
-}
-
-/* TOC on narrow displays should be shown at top */
-
-@media all and (max-width: 1279px){
-  .column-right {
-    display: none !important;
-    float: none;
-  }
-  #toc.fixed {
-    position: static !important;
-	}
-
-	#version-selector {
-		margin-right: 40px;
-	}
-}
-
-@media all and (max-width: 1023px){
-  .column-left {
-    display: none !important;
-    float: none;
-  }
-}
-
-#toc.fixed {
-  position: fixed;
-	top: 102px;
-}
-
-#toc {
-	top: 172px;
-	position: absolute;
-	right: 20px;
-  margin-right: 10px;
-	max-width: 256px;
-	padding-right: 10px;
-  background: rgba(242,242,242,0.9);
-  overflow: auto;
-  border-radius: 4px;
-}
-
-#index {
-  margin-left: 10px;
-  width: 200px;
-  overflow: auto;
-}
-
-#section2 #toc h3 {
-  padding: 8px 12px;
-  margin-top: 0px;
-  color: black;
-}
-
-#section2 h3, #section2 h2 {
-    color: #B92034;
-    margin-top: 10px;
-}
-
-#section2 a {
-    color: #B92034;
-}
-
-#section2 #toc a {
-  color: black;
-}
-
-#toc ul,
-#index ul {
-  margin: 0;
-  padding: 0 0 8px 0;
-  list-style: none;
-}
-
-#index li {
-	margin-left: 16px;
-}
-
-#toc li {
-  list-style: none;
-	margin-left: 12px;
-}
-
-#toc li,
-#index li {
-  font-family: 'Calibri', sans-serif;
-  font-size: 11pt;
-  margin-bottom: 2px;
-}
-
-#toc a,
-#toc a:visited,
-#index a,
-#index a:visited {
-    color: black;
-    text-decoration: none;
-    display: block;
-}
-
-#toc a:hover,
-#index a:hover {
-  background: rgba(224,224,224,0.9);
-}
-
-#index .current {
-  background: rgba(242,242,242,0.9);
-}
-
-#toc .toc-h2 {
-    padding-left: 10px;
-}
-
-#toc .toc-h3 {
-    padding-left: 20px;
-}
-
-#toc .toc-h4 {
-    padding-left: 30px;
-}
-
-#toc .toc-active a {
-    color: #69B7D2;
-}
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/triangle.png b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/triangle.png
deleted file mode 100644
index b0a200c11b..0000000000
Binary files a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/triangle.png and /dev/null differ
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/uninstalling-keyboards.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/uninstalling-keyboards.php.html
deleted file mode 100644
index bf0d4f77cd..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/uninstalling-keyboards.php.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Uninstalling Keyboards - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/uninstalling-keyboards'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Uninstalling Keyboards</h2>
-
-<p>
-  To uninstall a keyboard, follow these steps.
-</p>
-<h3>Access "Installed Languages"</h3>
-<p>First, open the "Settings" menu.</p>
-<p>
-  <img src="add-keyboard-i.47ed580b93a138e29e9c9ad70e00d25f.png" />
-</p>
-<p>
-  The "Installed Languages" menu found here manages your installed keyboards and dictionaries.
-</p>
-<p>
-  <img src="add-keyboard-i2.f815f73c0363f547b5c756ebcdb4a89a.png" />
-</p>
-<p>You should then see the following screen:</p>
-<p>
-  <img src="add-keyboard-i3.3509794b85cff04330f9f5449df2f874.png" />
-</p>
-
-<h3>Removing the Keyboard</h3>
-<p>Start by selecting the language for the keyboard you wish to uninstall.</p>
-<p>
-  <img src="delete-keyboard-i.e69d65b22ce139e0ba20a1ba705a28cd.png" />
-</p>
-<p>
-  Swipe left on the keyboard you want to remove.  You'll see a button to <span class="command">Delete</span>.
-</p>
-<p>
-  <img src="delete-keyboard-i2.ec40fd5e372cbac2dcb4266fb7ed79f7.png" />
-</p>
-<p>
-  Click the <span class="command">Delete</span> button to uninstall the keyboard.
-</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/using-keyman-browser.php.html b/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/using-keyman-browser.php.html
deleted file mode 100644
index 9bf49f3a53..0000000000
--- a/ios/keyman/Keyman/resources/OfflineHelp.bundle/Contents/Resources/using-keyman-browser.php.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Using the Keyman Browser - Keyman for iPhone and iPad Help</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <link rel='shortcut icon' href="favicon.56e7a2d76793fb59cca3133b8bb1dd3d.ico">
-  <link rel='canonical' href='https://help.keyman.com/products/iphone-and-ipad/current-version/using-keyman-browser'>      <link rel="stylesheet" type="text/css" href="template.5f4056fcb922f05667eb19e3809c64db.css">
-      <link rel="stylesheet" type="text/css" href="keyboard.f84ff11b7f61a4be1fa5437cf6ba17e0.css">
-      <link rel="stylesheet" type="text/css" href="keys.298336161ce24cc84fd19fc4ecb6f7ae.css">
-      <link rel="stylesheet" type="text/css" href="embed.5f7dc4fec739bda98e73bbe078e4f770.css">
-    <link href='https://fonts.googleapis.com/css?family=Cabin:400,400italic,500,600,700,700italic|Source+Sans+Pro:400,700,900,600,300|Noto+Serif:400' rel='stylesheet' type='text/css'>
-    <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700,700italic,400italic' rel='stylesheet' type='text/css'>
-  <script type='text/javascript' src='keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js'></script>
-  <script type="text/javascript">
-   // Add a script element as a child of the body
-
-    function downloadJS(src) {
-      var element = document.createElement("script");
-      element.src = src;
-      document.body.appendChild(element);
-    }
-
-    function downloadJSAtOnload() {
-      downloadJS("/cdn/deploy/js/jquery1-11-1.min.4dc834d16a0d219d5c2b8a5b814569e4.js");
-              downloadJS("/cdn/deploy/js/kmlive.ba0482399ad1a6ebae564d3a0e3fef66.js");
-            //downloadJS("/cdn/deploy/js/keyrenderer.e17ddbf43da5e1a6cc9ba8d723c98ec6.js");
-    }
-
-   // Check for browser support of event handling capability
-   if (window.addEventListener)
-   window.addEventListener("load", downloadJSAtOnload, false);
-   else if (window.attachEvent)
-   window.attachEvent("onload", downloadJSAtOnload);
-   else window.onload = downloadJSAtOnload;
-  </script>
-  <script>
-  function isIEOnWin81orEarlier() {
-    // If we are running IE11/or earlier on Windows 8.1 or earlier, then
-    // the autolink generates filenames that are misrecognised for download links,
-    // meaning users on those browesrs cannot easily download Keyman.
-    // Easiest way to test this is to test against navigator.userAgent
-    // Yes, we get some muddled analytics of cross-site of IE visitors but
-    // it's a small enough percentage that we don't need to worry about it.
-    return (navigator.userAgent.indexOf('Trident/') >= 0 && navigator.userAgent.indexOf('Windows NT 6') >= 0) ||
-           (document.documentMode < 11);
-  }
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-249828-1',  'auto', {'allowLinker': !isIEOnWin81orEarlier()});
-    if(!isIEOnWin81orEarlier()) {
-      ga('require', 'linker');
-      ga('linker:autoLink',
-        ['keyman.com', 'www.keyman.com',
-          'keymanweb.com', 'www.keymanweb.com',
-          'help.keyman.com',
-          'blog.keyman.com',
-          'donate.keyman.com',
-          'downloads.keyman.com',
-          'developer.keyman.com',
-          'keyman.dev',
-          'keyman.blog',
-          'blog.tavultesoft.com',
-          'www.tavultesoft.com', 'tavultesoft.com', 'secure.tavultesoft.com'] );
-    }
-  ga('send', 'pageview');
-</script>
-</head>
-<body data-device="Unknown">
-  <div id="container">
-    <div class="header">
-      <div id="show-phone-menu-spacer"></div>
-              <img id="logo" src="logo2.d8805a27a5c0399d234f1f84aca74cae.png" alt='Keyman Logo' />
-            <div id="no-menu-spacer"></div>
-      <img id="header-bottom" src="headerbar.5b66d10475396d1a17cb0d687f794262.png" alt='Header bottom' />
-      <a id="help" href="https://keyman.com/">
-        <p id="keyman-help">Keyman.com</p><img src="helpIcon.e6531e8bf34d0f667dac699db8f7438f.png">
-      </a>
-    </div>
-    <div id="phone-header-spacer"></div><div class="main no-toc no-index">
-  <div id="section2" class='embed-on'>
-    <div class="column-left">
-      <div id="index">
-        <h3>Index</h3>
-        <div id="index-content"></div>
-      </div>
-    </div>
-    <div class="wrapper">
-      <article>
-<h2><span class="content-online">Keyman for iPhone and iPad:  </span>Using the Keyman Browser</h2>
-
-<p>
-  Step 1) Click the Keyman Browser button in the Keyman app
-  <br/>
-  Step 2) Enter the URL of a website to visit into the address bar, for example <strong>google.com</strong>  Keyman Browser will load
-  the page and detect your language if it is present, and reformat it to show your language instead of square boxes.
-  <br/>
-  Step 3) Use the bookmark button to save the current page for browsing later.
-  <br/>
-  Step 4) Use the Globe icon to swap between languages.
-</p>
-
-<h2>Help Index</h2>
-
-<ul>
-  <li class="content-online"><a href='index.php.html'>Keyman for iPhone and iPad help home</a></li>
-  <li class="content-in-app"><a href='index.php.html'>Getting Started</a></li>
-  <li><a href='installing-keyboards.php.html'>Installing keyboards</a></li>
-  <li><a href='switching-between-keyboards.php.html'>Switching between keyboards</a></li>
-  <li><a href='uninstalling-keyboards.php.html'>Uninstalling keyboards</a></li>
-  <li><a href='installing-custom-keyboards.php.html'>Installing custom keyboards</a></li>
-  <li><a href='sharing-keyboards.php.html'>Sharing keyboards</a></li>
-  <li><a href='installing-system-keyboard.php.html'>Installing the Keyman System Keyboard</a></li>
-  <li><a href='installing-fonts.php.html'>Installing fonts</a></li>
-  <li><a href='using-keyman-browser.php.html'>Using the Keyman Browser</a></li>
-</ul>          </article>
-        </div>
-    </div>
-</div>
-<div class="footer">
-    <div class="wrapper">
-        <div class="footer-third sil-logo">
-            <br>
-            <a href="https://www.keyman.com/about/"><img id="sil-logo" src="sil-logo-blue-2017_1.7742a0bfa005af55e62b98d27f8b033c.png" alt='SIL' /></a>
-            <p>Copyright &copy; 1992-2019</p>
-            <p>Created by <a href="https://www.keyman.com/about/">SIL International</a></p>
-          </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/ios/kmbuild.sh b/ios/kmbuild.sh
index b25f0b8cdb..05faaa46c3 100755
--- a/ios/kmbuild.sh
+++ b/ios/kmbuild.sh
@@ -204,45 +204,52 @@ assertDirExists "$FRAMEWORK_PATH_UNIVERSAL"
 echo "KMEI build complete."
 
 if [ $DO_KEYMANAPP = true ]; then
-    # Provides a needed link for codesigning for our CI.
-    if ! [ -z "${DEVELOPMENT_TEAM}" ]; then
-      DEV_TEAM="DEVELOPMENT_TEAM=${DEVELOPMENT_TEAM}"
-    fi
-
-    if [ $DO_ARCHIVE = false ]; then
-      xcodebuild $XCODEFLAGS_EXT $CODE_SIGN -scheme Keyman \
-                 VERSION=$VERSION \
-                 VERSION_WITH_TAG=$VERSION_WITH_TAG \
-                 VERSION_ENVIRONMENT=$VERSION_ENVIRONMENT \
-                 UPLOAD_SENTRY=$UPLOAD_SENTRY
-
-      if [ $? -ne 0 ]; then
-        fail "Keyman app build failed."
-      fi
-
-    else
-      # Time to prepare the deployment archive data.
-      echo ""
-      echo "Preparing .ipa file for deployment."
-      xcodebuild $XCODEFLAGS_EXT -scheme Keyman \
-                 -archivePath $ARCHIVE_PATH \
-                 archive -allowProvisioningUpdates \
-                 VERSION=$VERSION \
-                 VERSION_WITH_TAG=$VERSION_WITH_TAG \
-                 VERSION_ENVIRONMENT=$VERSION_ENVIRONMENT \
-                 UPLOAD_SENTRY=$UPLOAD_SENTRY
-
-      assertDirExists "$ARCHIVE_PATH"
-
-      xcodebuild $XCODEFLAGS -exportArchive -archivePath $ARCHIVE_PATH \
-                 -exportOptionsPlist exportAppStore.plist \
-                 -exportPath $BUILD_PATH/${CONFIG}-iphoneos -allowProvisioningUpdates
+  echo ""
+  echo "Building offline help."
+  ./build-help.sh html
+
+  echo ""
+  echo "Building Keyman app."
+
+  # Provides a needed link for codesigning for our CI.
+  if ! [ -z "${DEVELOPMENT_TEAM}" ]; then
+    DEV_TEAM="DEVELOPMENT_TEAM=${DEVELOPMENT_TEAM}"
+  fi
+
+  if [ $DO_ARCHIVE = false ]; then
+    xcodebuild $XCODEFLAGS_EXT $CODE_SIGN -scheme Keyman \
+                VERSION=$VERSION \
+                VERSION_WITH_TAG=$VERSION_WITH_TAG \
+                VERSION_ENVIRONMENT=$VERSION_ENVIRONMENT \
+                UPLOAD_SENTRY=$UPLOAD_SENTRY
+
+    if [ $? -ne 0 ]; then
+      fail "Keyman app build failed."
     fi
 
+  else
+    # Time to prepare the deployment archive data.
     echo ""
-    if [ $? = 0 ]; then
-        echo "Build succeeded."
-    else
-        fail "Build failed - please see the log above for details."
-    fi
+    echo "Preparing .ipa file for deployment."
+    xcodebuild $XCODEFLAGS_EXT -scheme Keyman \
+                -archivePath $ARCHIVE_PATH \
+                archive -allowProvisioningUpdates \
+                VERSION=$VERSION \
+                VERSION_WITH_TAG=$VERSION_WITH_TAG \
+                VERSION_ENVIRONMENT=$VERSION_ENVIRONMENT \
+                UPLOAD_SENTRY=$UPLOAD_SENTRY
+
+    assertDirExists "$ARCHIVE_PATH"
+
+    xcodebuild $XCODEFLAGS -exportArchive -archivePath $ARCHIVE_PATH \
+                -exportOptionsPlist exportAppStore.plist \
+                -exportPath $BUILD_PATH/${CONFIG}-iphoneos -allowProvisioningUpdates
+  fi
+
+  echo ""
+  if [ $? = 0 ]; then
+      echo "Build succeeded."
+  else
+      fail "Build failed - please see the log above for details."
+  fi
 fi
diff --git a/linux/keyman-config/debian/control b/linux/keyman-config/debian/control
index c985a593c6..2795069759 100644
--- a/linux/keyman-config/debian/control
+++ b/linux/keyman-config/debian/control
@@ -19,10 +19,9 @@ Build-Depends:
  python3-pil,
  python3-pip,
  python3-qrcode,
- python3-raven <pkg.keyman-config.bionic>,
+ python3-raven | python3-sentry-sdk,
  python3-requests,
  python3-requests-cache,
- python3-sentry-sdk <pkg.keyman-config.focal>,
  python3-setuptools,
 Standards-Version: 4.5.0
 Vcs-Git: https://github.com/keymanapp/keyman.git
@@ -71,8 +70,7 @@ Depends:
  kmflcomp (>=10.99.33),
  python3-bs4,
  python3-gi,
- python3-raven <pkg.keyman-config.bionic>,
- python3-sentry-sdk <pkg.keyman-config.focal>,
+ python3-raven | python3-sentry-sdk,
  ${misc:Depends},
  ${python3:Depends},
 Description: Keyman for Linux configuration
diff --git a/linux/keyman-config/km-package-list-installed b/linux/keyman-config/km-package-list-installed
index 42ca05e645..fd7baa5e32 100755
--- a/linux/keyman-config/km-package-list-installed
+++ b/linux/keyman-config/km-package-list-installed
@@ -7,11 +7,11 @@ from keyman_config import __version__
 
 
 def main():
-    parser = argparse.ArgumentParser(description='Show installed Keyman keyboards with name, version, id.')
+    parser = argparse.ArgumentParser(description='Show installed Keyman keyboard packages with name, version, id.')
     parser.add_argument('-l', "--long", help='long format also shows description', action="store_true")
-    parser.add_argument('-s', "--shared", help='show those installed in shared areas', action="store_true")
+    parser.add_argument('-s', "--shared", help='show those installed in shared area', action="store_true")
     parser.add_argument('-o', "--os", help='show those installed by the OS', action="store_true")
-    parser.add_argument('-u', "--user", help='show those installed in user areas', action="store_true")
+    parser.add_argument('-u', "--user", help='show those installed in user area', action="store_true")
     parser.add_argument('--version', action='version', version='%(prog)s version ' + __version__)
     parser.add_argument('-v', '--verbose', action='store_true', help='verbose logging')
     parser.add_argument('-vv', '--veryverbose', action='store_true', help='very verbose logging')
@@ -25,18 +25,28 @@ def main():
         logging.basicConfig(format='%(levelname)s:%(message)s')
 
     all = not args.user and not args.shared and not args.os
-    from keyman_config.list_installed_kmp import get_installed_kmp, InstallArea
+    from keyman_config.list_installed_kmp import get_installed_kmp, get_install_area_path, InstallArea
     if args.user or all:
         installed_kmp = get_installed_kmp(InstallArea.IA_USER)
-        print("--- Installed user keyboards ---")
+        if args.verbose or args.veryverbose:
+            print("--- Installed user Keyman keyboard packages (%s) ---" % (get_install_area_path(InstallArea.IA_USER)))
+        else:
+            print("--- Installed user Keyman keyboard packages ---")
         print_keyboards(installed_kmp, args.long)
     if args.shared or all:
         installed_kmp = get_installed_kmp(InstallArea.IA_SHARED)
-        print("--- Installed shared keyboards ---")
+        if args.verbose or args.veryverbose:
+            print("--- Installed shared Keyman keyboard packages (%s) ---" %
+                  (get_install_area_path(InstallArea.IA_SHARED)))
+        else:
+            print("--- Installed shared Keyman keyboard packages ---")
         print_keyboards(installed_kmp, args.long)
     if args.os or all:
         installed_kmp = get_installed_kmp(InstallArea.IA_OS)
-        print("--- Installed OS keyboards ---")
+        if args.verbose or args.veryverbose:
+            print("--- Installed OS Keyman keyboard packages (%s) ---" % (get_install_area_path(InstallArea.IA_OS)))
+        else:
+            print("--- Installed OS Keyman keyboard packages ---")
         print_keyboards(installed_kmp, args.long)
 
 
@@ -45,10 +55,10 @@ def print_keyboards(installed_kmp, verbose):
         print(installed_kmp[packageID]['name'] + ", version:", installed_kmp[packageID]['version'] + ", id:", packageID)
         if verbose:
             if installed_kmp[packageID]['version'] != installed_kmp[packageID]['kmpversion']:
-                print("Version mismatch. Installed keyboard is %s. Website says it is %s."
+                print("Version mismatch. Installed keyboard package is %s. Website says it is %s."
                       % (installed_kmp[packageID]['kmpversion'], installed_kmp[packageID]['version']))
             if installed_kmp[packageID]['name'] != installed_kmp[packageID]['kmpname']:
-                print("Name mismatch. Installed keyboard is %s. Website says it is %s."
+                print("Name mismatch. Installed keyboard package is %s. Website says it is %s."
                       % (installed_kmp[packageID]['name'], installed_kmp[packageID]['kmpname']))
 
             if installed_kmp[packageID]['description']:
diff --git a/mac/help/about/history.md b/mac/help/about/history.md
new file mode 100644
index 0000000000..3a0b9af3a6
--- /dev/null
+++ b/mac/help/about/history.md
@@ -0,0 +1,8 @@
+---
+title: Version History
+---
+
+A frequent updated changelog for Keyman is kept at [help.keyman.com/version-history](https://help.keyman.com/version-history/) on the Keyman Help website.
+
+## Related Topics
+* [What's New](whatsnew)
diff --git a/mac/help/about/index.md b/mac/help/about/index.md
new file mode 100644
index 0000000000..12e0a682cc
--- /dev/null
+++ b/mac/help/about/index.md
@@ -0,0 +1,8 @@
+---
+title: About Keyman for macOS
+---
+
+* [Welcome to Keyman](welcome)
+* [What's New](whatsnew)
+* [System Requirements](requirements)
+* [Version History](history)
diff --git a/mac/help/about/requirements.md b/mac/help/about/requirements.md
new file mode 100644
index 0000000000..b1c3123be7
--- /dev/null
+++ b/mac/help/about/requirements.md
@@ -0,0 +1,19 @@
+---
+title: System Requirements
+---
+
+## Supported Mac Operating Systems
+
+Keyman 14.0 supports the following Mac operating systems:
+
+* Mac OS X Yosemite (10.10)
+* Mac OS X El Capitan (10.11)
+* macOS Sierra (10.12)
+* macOS High Sierra (10.13)
+* macOS Mojave (10.14)
+* macOS Catalina (10.15)
+
+## Resource Requirements
+
+Keyman for macOS has minimal resource requirements. Any computer running
+Mac OS X 10.10 or later should be able to run Keyman for macOS without trouble.
diff --git a/mac/help/about/welcome.md b/mac/help/about/welcome.md
new file mode 100644
index 0000000000..5bd92f2fd8
--- /dev/null
+++ b/mac/help/about/welcome.md
@@ -0,0 +1,26 @@
+---
+title: Welcome to Keyman
+---
+
+Thank you for installing Keyman for macOS. Whether you're a new or returning user, 
+we believe you will appreciate the significant enhancements in this latest
+version of Keyman for macOS.
+
+## What is Keyman for for macOS?
+
+Keyman for macOS brings an extensive library of keyboards for over 1,000 
+languages to macOS. You can even create your own custom keyboards with 
+[Keyman Developer](https://keyman.com/developer) (a Windows product).
+
+Our unique virtual keyboard technology makes it easy to type in all your programs, 
+including Microsoft Office, Adobe Creative Suite, internet browsers and more, as well as 
+supporting the latest version of macOS.
+
+A list of new features in Keyman is available [here](whatsnew).
+
+![](../mac_images/osk_amharic.png)
+
+## Related Topics
+
+-  [What's New](whatsnew)
+-  [System Requirements](requirements)
diff --git a/mac/help/about/whatsnew.md b/mac/help/about/whatsnew.md
new file mode 100644
index 0000000000..8b3ad4c333
--- /dev/null
+++ b/mac/help/about/whatsnew.md
@@ -0,0 +1,11 @@
+---
+title: What's New
+---
+
+Here are some of the new features we have added to Keyman 14.0 for macOS:
+
+* Added icon for Keyman app (#3892)
+* Improved compatibility with Java apps (#3944)
+* Added support for European layouts in On Screen Keyboard (#3924)
+* Made it possible to specify app compatibility modes as a user default (#3949)
+* Improved input reliability with modifier keys and cursor keys (#2588, #3946)
diff --git a/mac/help/basic/config/index.md b/mac/help/basic/config/index.md
new file mode 100644
index 0000000000..a288a787b0
--- /dev/null
+++ b/mac/help/basic/config/index.md
@@ -0,0 +1,31 @@
+---
+title: Keyman Configuration
+---
+
+The Configuration window allows you to change several things about the way
+Keyman works, as well as access information about installed keyboards.
+
+## Opening Keyman Configuration
+To open Keyman Configuration:
+
+1. ![mac OS menu bar](../../mac_images/menu_bar_keyman.png)
+
+   Make sure that Keyman for macOS is the active input source (as shown above).
+   For more information, see [Getting Started with Keyman for macOS](../../start/tutorial).
+2. Click the Keyman icon to display the Input menu.
+3. On the Input menu, in the section for Keyman, click **Configuration**. Note: If you just
+   installed Keyman and the Configuration menu is not available, please restart the computer.
+
+   ![Keyman Configuration in menu](../../mac_images/keyman_menu_config.png)
+
+4. The Keyman Configuration window appears:
+   ![Keyman Configuration](../../mac_images/keyman_config.png)
+
+## Using Keyman Configuration
+
+Following are instructions for performing various tasks in the Configuration window:
+
+-  [Keyman Configuration - Keyboard Layouts Tab](keyboards)
+-  [Keyman Configuration - Options Tab](options)
+-  [Keyman Configuration - Support Tab](support)
+
diff --git a/mac/help/basic/config/keyboards.md b/mac/help/basic/config/keyboards.md
new file mode 100644
index 0000000000..7305053714
--- /dev/null
+++ b/mac/help/basic/config/keyboards.md
@@ -0,0 +1,54 @@
+---
+title: Keyman Configuration - Keyboard Layouts Tab
+---
+
+## Enable and Disable a Keyboard
+
+Keyman keyboards can be enabled and disabled. Disabling a Keyman keyboard removes
+it from the Keyman menu and Keyman Toolbox but does not uninstall the keyboard.
+This is useful if:
+
+* You are using a single keyboard layout from a package with multiple
+  keyboards and you want to remove the extra keyboards from the Keyman
+  Toolbox and menu.
+
+* You have a keyboard layout installed which you aren't currently using but don't
+  want to uninstall.
+
+To disable a Keyman keyboard, untick the corresponding checkbox. To enable a
+disabled keyboard, tick the checkbox.
+
+## Remove Keyboards
+
+Removing a Keyman keyboard package uninstalls and deletes the entire
+package. Although you can disable individual keyboards (as described above),
+if an installed package contains more than one keyboard, you cannot remove
+them individually.
+
+To remove a keyboard package, click the delete button
+![-](../../mac_images/remove_button.png) in the far right of the row with the
+package name.
+
+## Display Keyboard Information
+
+All Keyman keyboard packages contain some basic metadata information,
+such as the name and version, included fonts, author, and copyright. To
+display this information, click the information button
+![(i)](../../mac_images/information_button.png) to the right of the package name.
+
+## Display Keyboard Help
+
+Many Keyman keyboard packages contain help files, with instructions for
+learning to use the keyboard(s) to type special characters. This is
+especially helpful for keyboards that use multiple key sequences to
+generate characters, since it is not usually possible to convey this
+information via an on-screen keyboard showing the individual characters
+associated with the keys on the physical keyboard. To open a window that
+will allow you to view the keyboard help, click the help button
+![?](../../mac_images/help_button.png) to the right of the package name. (If
+this button is disabled, it means that no help files were included in the
+package.)
+
+## Related Topics
+
+-   [Keyman Configuration](../config/)
diff --git a/mac/help/basic/config/options.md b/mac/help/basic/config/options.md
new file mode 100644
index 0000000000..f863536354
--- /dev/null
+++ b/mac/help/basic/config/options.md
@@ -0,0 +1,28 @@
+---
+title:  Keyman Configuration - Options Tab
+---
+
+## Keyman Configuration Options
+
+If you select the **Options** tab on the Keyman Configuration window, you
+will see that there are two configuration options that affect the general
+behavior of Keyman, regardless of which keyboard is active:
+
+* **Always show on-screen keyboard**: If this option is ticked, the
+  on-screen keyboard will be displayed automatically whenever Keyman
+  becomes the active input source.
+
+* **Use verbose Console logging**: If this option is ticked, advanced
+  troubleshooting information will be sent to the system log. If the
+  Keyman development team is assisting you to resolve a problem, they
+  might instruct you to enable this option so you can supply them with a
+  log of important debugging messages from Keyman. You can view this log
+  information yourself using the Console utility, by filtering to show
+  only messages from the Keyman process (although it probably won't be
+  very meaningful to you unless you are a computer programmer and you are
+  looking at the Keyman for macOS source code). Console is a log viewer
+  developed by Apple Inc. and included with macOS.
+
+## Related Topics
+
+-   [Keyman Configuration](../config/)
diff --git a/mac/help/basic/config/support.md b/mac/help/basic/config/support.md
new file mode 100644
index 0000000000..17cdab9974
--- /dev/null
+++ b/mac/help/basic/config/support.md
@@ -0,0 +1,12 @@
+---
+title:  Keyman Configuration - Support Tab
+---
+
+
+The **Support** tab on the Keyman Configuration window displays the same
+program help information available on-line at
+[help.keyman.com/products/mac](https://help.keyman.com/products/mac/)
+
+## Related Topics
+
+-   [Keyman Configuration](../config/)
diff --git a/mac/help/basic/index.md b/mac/help/basic/index.md
new file mode 100644
index 0000000000..8b3d0df07a
--- /dev/null
+++ b/mac/help/basic/index.md
@@ -0,0 +1,5 @@
+---
+title: Basic Help
+---
+
+* [Keyman Configuration](config/)
diff --git a/mac/help/common/adware.md b/mac/help/common/adware.md
new file mode 100644
index 0000000000..a29e146ca6
--- /dev/null
+++ b/mac/help/common/adware.md
@@ -0,0 +1,14 @@
+---
+title: Does Keyman for macOS include adware or spyware?
+---
+
+Simple answer: No!
+
+We never have and never will include adware or spyware components.
+
+We take your privacy seriously. Keyman does include an error reporting
+component, so if you find Keyman crashing, it will report the error to
+our server. The error report will contain details about your system
+configuration, such as operating system version and free disk space,
+but contains no personal data. This information helps us to address
+the problem.
diff --git a/mac/help/common/bug.md b/mac/help/common/bug.md
new file mode 100644
index 0000000000..8c67a85936
--- /dev/null
+++ b/mac/help/common/bug.md
@@ -0,0 +1,7 @@
+---
+title: I think I found a bug! How can I tell you about it?
+---
+
+We want to hear about problems you experience: if we don't
+hear about the problem, we can't fix it! So please do send bug reports
+through to the [SIL Keyman Community](https://community.software.sil.org/c/keyman)
diff --git a/mac/help/common/free.md b/mac/help/common/free.md
new file mode 100644
index 0000000000..a5e908b5f9
--- /dev/null
+++ b/mac/help/common/free.md
@@ -0,0 +1,10 @@
+---
+title: Is Keyman for macOS really free?
+---
+
+Yes! As with all Keyman products, Keyman for macOS is completely free.
+
+The source code for Keyman is freely available as well: you can download
+the code, change it, distribute your own version of Keyman, or contribute
+your improvments back to the Keyman project so we can all benefit.
+[Learn more](https://keyman.com/about/get-involved)
diff --git a/mac/help/common/index.md b/mac/help/common/index.md
new file mode 100644
index 0000000000..8fe9d2274c
--- /dev/null
+++ b/mac/help/common/index.md
@@ -0,0 +1,12 @@
+---
+title: Common Questions about Keyman for macOS
+---
+
+* [Which versions does Keyman for macOS work with?](os)
+* [What are Keyman's hardware requirements?](requirements)
+* [Which keyboards work on Mac?](keyboards)
+* [Does Keyman for macOS include adware or spyware?](adware)
+* [Does Keyman for macOS include a virtual on-screen keyboard?](osk)
+* [Is Keyman for macOS really free?](free)
+* [Will you help me install Keyman?](support)
+* [I think I found a bug! How can I tell you about it?](bug)
diff --git a/mac/help/common/keyboards.md b/mac/help/common/keyboards.md
new file mode 100644
index 0000000000..2b43713113
--- /dev/null
+++ b/mac/help/common/keyboards.md
@@ -0,0 +1,11 @@
+---
+title: Which keyboards work on Mac?
+---
+
+Most Keyman keyboards work on Mac. A small subset of keyboards require features which
+are not yet available in version 14.0. These features will be progressively implemented.
+Keyman for macOS will inform you when you attempt to install a keyboard if it is using
+a currently unsupported feature.
+
+The [Keyman keyboard catalogue](https://keyman.com/keyboards) also includes information
+about macOS compatibility for each keyboard.
diff --git a/mac/help/common/os.md b/mac/help/common/os.md
new file mode 100644
index 0000000000..79b2b5e4fb
--- /dev/null
+++ b/mac/help/common/os.md
@@ -0,0 +1,14 @@
+---
+title: Which versions does Keyman for macOS work with?
+---
+
+## Supported Mac Operating Systems
+
+Keyman 14.0 supports the following Mac operating systems:
+
+* Mac OS X Yosemite (10.10)
+* Mac OS X El Capitan (10.11)
+* macOS Sierra (10.12)
+* macOS High Sierra (10.13)
+* macOS Mojave (10.14)
+* macOS Catalina (10.15)
diff --git a/mac/help/common/osk.md b/mac/help/common/osk.md
new file mode 100644
index 0000000000..3589eeb464
--- /dev/null
+++ b/mac/help/common/osk.md
@@ -0,0 +1,9 @@
+---
+title: Does Keyman for macOS include a virtual on-screen keyboard?
+---
+
+Yes, Keyman includes an on-screen keyboard. Most Keyman keyboards include
+the information needed to display the on screen keyboard.
+
+To display the on-screen keyboard for the currently selected Keyman keyboard,
+in the Input menu, point to Keyman, and then click On-Screen Keyboard.
diff --git a/mac/help/common/requirements.md b/mac/help/common/requirements.md
new file mode 100644
index 0000000000..b54aa64bfd
--- /dev/null
+++ b/mac/help/common/requirements.md
@@ -0,0 +1,6 @@
+---
+title: What are Keyman's hardware requirements?
+---
+
+Keyman for macOS has minimal resource requirements. Any computer running
+Mac OS X 10.10 or later should be able to run Keyman for macOS without trouble.
diff --git a/mac/help/common/support.md b/mac/help/common/support.md
new file mode 100644
index 0000000000..3c4b9f8f35
--- /dev/null
+++ b/mac/help/common/support.md
@@ -0,0 +1,8 @@
+---
+title: Will you help me install Keyman?
+---
+
+SIL is pleased to provide Keyman software for free. However, we do not have the resources to
+provide free technical support. We do our best to monitor the
+[Keyman community forum](https://community.software.sil.org/c/keyman) for technical issues that
+warrant support, so if you post a question there, someone may be able to assist you.
\ No newline at end of file
diff --git a/mac/help/index.md b/mac/help/index.md
new file mode 100644
index 0000000000..d564804a90
--- /dev/null
+++ b/mac/help/index.md
@@ -0,0 +1,49 @@
+---
+title: Keyman 14.0 for macOS Help
+---
+
+Need help using Keyman 14.0 for macOS?  You'll find everything you need here, including product documentation,
+frequently asked questions, tutorials and videos.
+
+## [About Keyman](about/)
+* [Welcome to Keyman](about/welcome)
+* [What's New](about/whatsnew)
+* [System Requirements](about/requirements)
+* [Version History](about/history)
+
+## [Getting Started](start/tutorial)
+* [Step-by-step Guide](start/tutorial)
+* [Tutorial: Installing Keyman](start/install-keyman)
+* [Tutorial: Installing a keyboard](start/install-keyboard)
+
+## [Common Questions](common/)
+* [Which versions does Keyman for macOS work with?](common/os)
+* [What are Keyman's hardware requirements?](common/requirements)
+* [Which keyboards work on Mac?](common/keyboards)
+* [Does Keyman for macOS include adware or spyware?](common/adware)
+* [Does Keyman for macOS include a virtual on-screen keyboard?](common/osk)
+* [Is Keyman for macOS really free?](common/free)
+* [Will you help me install Keyman?](common/support)
+* [I think I found a bug! How can I tell you about it?](common/bug)
+
+## Ask for Help
+[Ask other users in the SIL Keyman Community](https://community.software.sil.org/c/keyman)
+
+## Help Topics
+
+### [Troubleshooting](troubleshooting/)
+* [Configure macOS security for Keyman](troubleshooting/configure-security)
+* [Uninstalling Keyman](troubleshooting/uninstall-keyman)
+
+### Using Keyman for macOS
+* [Configuration Tasks](basic/config/)
+
+### Advanced Topics
+* [Keyman for macOS version history](https://help.keyman.com/products/mac/version-history)
+
+## Other Resources
+* [Knowledge Base](https://help.keyman.com/kb)
+* [Keyman Developer Help](https://help.keyman.com/developer)
+* [KeymanWeb Help](https://help.keyman.com/products/web)
+* [Keyman for Windows Help](https://help.keyman.com/products/windows)
+* [Keyman for Linux Help](https://help.keyman.com/products/linux)
diff --git a/mac/help/mac_images/add.png b/mac/help/mac_images/add.png
new file mode 100644
index 0000000000..bbcf7454dc
Binary files /dev/null and b/mac/help/mac_images/add.png differ
diff --git a/mac/help/mac_images/add_keyman.png b/mac/help/mac_images/add_keyman.png
new file mode 100644
index 0000000000..c34d8ebfb6
Binary files /dev/null and b/mac/help/mac_images/add_keyman.png differ
diff --git a/mac/help/mac_images/apple_menu.png b/mac/help/mac_images/apple_menu.png
new file mode 100644
index 0000000000..fb4dd0a60f
Binary files /dev/null and b/mac/help/mac_images/apple_menu.png differ
diff --git a/mac/help/mac_images/go_to_folder.png b/mac/help/mac_images/go_to_folder.png
new file mode 100644
index 0000000000..b72aa42559
Binary files /dev/null and b/mac/help/mac_images/go_to_folder.png differ
diff --git a/mac/help/mac_images/help_button.png b/mac/help/mac_images/help_button.png
new file mode 100644
index 0000000000..e9cba61c2e
Binary files /dev/null and b/mac/help/mac_images/help_button.png differ
diff --git a/mac/help/mac_images/icon-fonts.png b/mac/help/mac_images/icon-fonts.png
new file mode 100644
index 0000000000..cd235433c4
Binary files /dev/null and b/mac/help/mac_images/icon-fonts.png differ
diff --git a/mac/help/mac_images/icon-help.png b/mac/help/mac_images/icon-help.png
new file mode 100644
index 0000000000..2e8c2f40ba
Binary files /dev/null and b/mac/help/mac_images/icon-help.png differ
diff --git a/mac/help/mac_images/icon-intro.png b/mac/help/mac_images/icon-intro.png
new file mode 100644
index 0000000000..cfd2310e0a
Binary files /dev/null and b/mac/help/mac_images/icon-intro.png differ
diff --git a/mac/help/mac_images/icon-keyman.png b/mac/help/mac_images/icon-keyman.png
new file mode 100644
index 0000000000..de36600859
Binary files /dev/null and b/mac/help/mac_images/icon-keyman.png differ
diff --git a/mac/help/mac_images/icon-osk.png b/mac/help/mac_images/icon-osk.png
new file mode 100644
index 0000000000..a1cbdc416a
Binary files /dev/null and b/mac/help/mac_images/icon-osk.png differ
diff --git a/mac/help/mac_images/icon-unicode.png b/mac/help/mac_images/icon-unicode.png
new file mode 100644
index 0000000000..edeb18f039
Binary files /dev/null and b/mac/help/mac_images/icon-unicode.png differ
diff --git a/mac/help/mac_images/information_button.png b/mac/help/mac_images/information_button.png
new file mode 100644
index 0000000000..8a8b5dbd76
Binary files /dev/null and b/mac/help/mac_images/information_button.png differ
diff --git a/mac/help/mac_images/input_menu.png b/mac/help/mac_images/input_menu.png
new file mode 100644
index 0000000000..fd0a0b0840
Binary files /dev/null and b/mac/help/mac_images/input_menu.png differ
diff --git a/mac/help/mac_images/keyboards_menu.png b/mac/help/mac_images/keyboards_menu.png
new file mode 100644
index 0000000000..fcf7966dda
Binary files /dev/null and b/mac/help/mac_images/keyboards_menu.png differ
diff --git a/mac/help/mac_images/keyman_config.png b/mac/help/mac_images/keyman_config.png
new file mode 100644
index 0000000000..cb58a6b6fc
Binary files /dev/null and b/mac/help/mac_images/keyman_config.png differ
diff --git a/mac/help/mac_images/keyman_install.png b/mac/help/mac_images/keyman_install.png
new file mode 100644
index 0000000000..95ade979fd
Binary files /dev/null and b/mac/help/mac_images/keyman_install.png differ
diff --git a/mac/help/mac_images/keyman_menu_config.png b/mac/help/mac_images/keyman_menu_config.png
new file mode 100644
index 0000000000..07cc664c36
Binary files /dev/null and b/mac/help/mac_images/keyman_menu_config.png differ
diff --git a/mac/help/mac_images/menu_bar.png b/mac/help/mac_images/menu_bar.png
new file mode 100644
index 0000000000..0d74ebf79d
Binary files /dev/null and b/mac/help/mac_images/menu_bar.png differ
diff --git a/mac/help/mac_images/menu_bar_keyman.png b/mac/help/mac_images/menu_bar_keyman.png
new file mode 100644
index 0000000000..6a68897cdc
Binary files /dev/null and b/mac/help/mac_images/menu_bar_keyman.png differ
diff --git a/mac/help/mac_images/osk_amharic.png b/mac/help/mac_images/osk_amharic.png
new file mode 100644
index 0000000000..d636ae0404
Binary files /dev/null and b/mac/help/mac_images/osk_amharic.png differ
diff --git a/mac/help/mac_images/privacy_accessibility.png b/mac/help/mac_images/privacy_accessibility.png
new file mode 100644
index 0000000000..9af915507d
Binary files /dev/null and b/mac/help/mac_images/privacy_accessibility.png differ
diff --git a/mac/help/mac_images/privacy_files_and_folders.png b/mac/help/mac_images/privacy_files_and_folders.png
new file mode 100644
index 0000000000..7ffddb7f73
Binary files /dev/null and b/mac/help/mac_images/privacy_files_and_folders.png differ
diff --git a/mac/help/mac_images/privacy_input_monitoring.png b/mac/help/mac_images/privacy_input_monitoring.png
new file mode 100644
index 0000000000..3b4310262b
Binary files /dev/null and b/mac/help/mac_images/privacy_input_monitoring.png differ
diff --git a/mac/help/mac_images/privacy_input_monitoring_locked.png b/mac/help/mac_images/privacy_input_monitoring_locked.png
new file mode 100644
index 0000000000..e5652b06d7
Binary files /dev/null and b/mac/help/mac_images/privacy_input_monitoring_locked.png differ
diff --git a/mac/help/mac_images/remove.png b/mac/help/mac_images/remove.png
new file mode 100644
index 0000000000..bbb4cee892
Binary files /dev/null and b/mac/help/mac_images/remove.png differ
diff --git a/mac/help/mac_images/remove_button.png b/mac/help/mac_images/remove_button.png
new file mode 100644
index 0000000000..a01314556e
Binary files /dev/null and b/mac/help/mac_images/remove_button.png differ
diff --git a/mac/help/mac_images/remove_keyman.png b/mac/help/mac_images/remove_keyman.png
new file mode 100644
index 0000000000..846c88437e
Binary files /dev/null and b/mac/help/mac_images/remove_keyman.png differ
diff --git a/mac/help/mac_images/system_preferences.png b/mac/help/mac_images/system_preferences.png
new file mode 100644
index 0000000000..d6e66dcc77
Binary files /dev/null and b/mac/help/mac_images/system_preferences.png differ
diff --git a/mac/help/start/index.md b/mac/help/start/index.md
new file mode 100644
index 0000000000..7818eee925
--- /dev/null
+++ b/mac/help/start/index.md
@@ -0,0 +1,6 @@
+---
+title: Getting started
+---
+* [Getting started with Keyman for macOS](tutorial)
+* [Install Keyman for macOS](install-keyman)
+* [Install a Keyman Keyboard](install-keyboard)
diff --git a/mac/help/start/install-keyboard.md b/mac/help/start/install-keyboard.md
new file mode 100644
index 0000000000..6d22793586
--- /dev/null
+++ b/mac/help/start/install-keyboard.md
@@ -0,0 +1,72 @@
+---
+title: Install a Keyman Keyboard
+---
+
+You must have a Keyman keyboard installed to type with Keyman for macOS in your language.
+
+## Downloading and Installing a Keyman Keyboard within Keyman for macOS
+
+Here's how to download and install a Keyman keyboard within Keyman for macOS:
+
+1. Choose Keyman from the Input menu in the menu bar.
+2. Open Keyman Configuration, from the Configuration link under Keyman in the Input menu.
+   Note: If you just installed Keyman and the Configuration menu is not available, please
+   restart the computer.
+
+   ![Keyman Configuration in menu](../mac_images/keyman_menu_config.png)
+
+3. Select the Keyboard Layouts tab.
+4. Click **Download keyboard…**.
+5. From the dropdown boxes, find a language associated with your keyboard and click **Search**.
+6. Click **Install Keyboard** for the keyboard you want to install.
+7. Click **Done**. The keyboard will be installed automatically and
+   you will see a Keyboard/Package Info window.
+
+## Installing a Keyman Keyboard from a Folder on Your Computer
+
+There are two ways to install a keyboard from your computer. The easiest way is simply
+to find the keyboard package (.KMP file) on your computer using Finder and double-click.
+When prompted whether or not to install the package, click Yes. (If you don't see the
+dialog box, it might be hiding behind your Finder window.)
+
+The other way is to drag and drop a keyboard package file onto the Keyman Configuration
+window. Here's how:
+
+1. Choose Keyman from the Input menu in the menu bar.
+2. Open Keyman Configuration, from the Configuration link under Keyman in the Input menu.
+
+   ![Keyman Configuration in menu](../mac_images/keyman_menu_config.png)
+
+3. Select the Keyboard Layouts tab.
+4. Back in Finder, find the keyboard package on your computer. Keyman keyboard packages
+   have a file name that ends with .kmp.
+5. Drag and drop the keyboard package file in the installed keyboards list in Keyman
+   Configuration window.
+
+   **Note:** You can drag and drop multiple keyboard packages at once.
+
+
+## After installation
+
+**Tip:** The Keyboard/Package Info window includes some helpful information about
+the keyboard you have installed. In addition to the name and version of the keyboard,
+the dialog may also show:
+* Fonts installed with the keyboard.
+* Author name and contact information.
+* Specific help and readme information (under the readme tab).
+
+**Note:** Keyman keyboards are installed for the current user only. You can find
+the installed keyboards in 'Documents/Keyman-Keyboards' folder; however, you should
+not delete or modify this folder or its contents.
+
+1. To enable/disable a keyboard; click on the check box next to the keyboard.
+2. You can now select a Keyman keyboard from the Keyboards menu under Keyman in the
+   Input menu.
+
+**Note:** Only enabled keyboards will be displayed in the Keyboards menu under Keyman
+in the Input menu.
+
+## Related topics
+
+* [Install Keyman](install-keyman)
+* [Keyman Configuration](../basic/config/)
diff --git a/mac/help/start/install-keyman.md b/mac/help/start/install-keyman.md
new file mode 100644
index 0000000000..315d9f81ed
--- /dev/null
+++ b/mac/help/start/install-keyman.md
@@ -0,0 +1,38 @@
+---
+title: Install Keyman for macOS
+---
+
+*Keyman for macOS* is available for [download](https://keyman.com/mac/download) as a standard
+Apple Disk Image (.dmg) file. It should be installed according to the following instructions.
+
+1. Double click the DMG file to open it in Finder.
+2. Double click the **Install Keyman** icon to open the Keyman installer.
+3. You will be prompted to install Keyman. Follow the prompts to complete installation.
+
+4. Keyman should now be an option in the Input Sources menu towards the right hand
+   side of the menu bar.
+
+   ![Input Sources menu](../mac_images/input_menu.png)
+
+   **Note**: On recent versions of macOS, the first time you enable Keyman by selecting Keyman
+   from the menu, you will be prompted to give certain permissions to Keyman. It is
+   important that you allow Keyman these permissions, otherwise it will not be able
+   to remap the keyboard. [More information on permissions](../troubleshooting/configure-security)
+
+4. Click the input menu and switch to Keyman. Click the input menu again to see the
+   installed keyboards in Keyman:Keyboards menu.
+
+   This will show "(None)" at first. You may switch to another keyboard from this menu,
+   once they are installed.
+
+   See [Install a Keyman Keyboard](install-keyboard) to learn how to install keyboards.
+
+5. Now you can start typing with the selected keyboard in any text editor or
+   application that uses standard macOS input methods.
+
+## How To - Updating Keyman for macOS
+
+When a new version of Keyman is released, you can update by following the instructions
+above.
+
+**Note**: To uninstall Keyman for macOS, follow the steps in [Uninstall Keyman](../troubleshooting/uninstall-keyman).
diff --git a/mac/help/start/tutorial.md b/mac/help/start/tutorial.md
new file mode 100644
index 0000000000..2ad6a0842a
--- /dev/null
+++ b/mac/help/start/tutorial.md
@@ -0,0 +1,81 @@
+---
+title: Getting started with Keyman for macOS
+---
+
+Follow these steps for a basic introduction to Keyman for macOS:
+
+**Note:** *Keyman for macOS* must be installed first. For help on
+installing *Keyman for macOS*, please see: [Install Keyman for macOS](install-keyman).
+
+## Step 1: Is Keyman active?
+
+![Keyman menu bar](../mac_images/menu_bar_keyman.png)
+
+Check the menu bar near the date and time to see if Keyman for macOS is
+active. If it is active you will see the Keyman icon: ![Keyman icon](../mac_images/icon-keyman.png)
+
+* If the Keyman icon is in the menu bar near the date/time, continue on to **Step 4**.
+
+## Step 2: Choose Keyman from Input Menu
+
+If the Keyman icon is not in the menu bar, choose **Keyman** from the Input menu in the
+menu bar and continue on to **Step 4**.
+
+![Input menu](../mac_images/input_menu.png)
+
+The Input menu appears in the menu bar only if you enable at least two input
+sources in Keyboard preferences. The Input menu is identified by a flag or character
+that represents the input source currently in use.
+
+If Keyman is not in the Input menu, Keyman for macOS is not added as an input source.
+Follow **Step 3** to add Keyman for macOS as an input source.
+
+## Step 3: Add Keyman for macOS
+
+To add Keyman for macOS as an input source:
+
+1. On the Apple menu, click System Preferences.
+
+   ![Apple menu](../mac_images/apple_menu.png)
+
+2. Click Keyboard, select the **Input Sources** tab, and then click ![+](../mac_images/add.png).
+
+3. In the left-hand pane, select **Multiple Languages**, and then select **Keyman** in the
+   right-hand pane.
+
+   ![Add Keyman](../mac_images/add_keyman.png)
+
+4. Click Add.
+
+Now, return to **Step 2**.
+
+## Step 4: Select a Keyman keyboard
+
+On the Input menu, point to Keyboards, and then select a Keyman keyboard. Note: If
+the Keyman menu items are not available, please restart the computer.
+
+**Tip:**: If there are no Keyman keyboards in the Keyboards menu, you can learn
+how to install one here: [Install a keyboard](../start/install-keyboard).
+
+## Step 5: Enable the On-Screen Keyboard
+
+![Amharic On Screen Keyboard](../mac_images/osk_amharic.png)
+
+To become familiar with the layout of a Keyman keyboard, use the
+On-Screen Keyboard tool: On the Input menu, point to Keyman, and then click
+On-Screen Keyboard.
+
+**Tip:**: You do not need to use the On-Screen Keyboard in order to type. You can turn it
+off at any time.
+
+**Tip:**: Some Keyman keyboards do not include an On-Screen Keyboard. You will see
+a standard US keyboard layout if the selected keyboard does not include an
+On-Screen Keyboard.
+
+## Step 6: Start typing!
+
+You can now start typing in your language in almost any application. Use your
+hardware keyboard or click the keys in the On-Screen Keyboard to type.
+
+**Note:** To return to using your normal keyboard, choose your default keyboard
+from the Input menu in the menu bar.
diff --git a/mac/help/troubleshooting/configure-security.md b/mac/help/troubleshooting/configure-security.md
new file mode 100644
index 0000000000..0365b9962c
--- /dev/null
+++ b/mac/help/troubleshooting/configure-security.md
@@ -0,0 +1,61 @@
+---
+title: How to configure macOS security options for Keyman
+---
+
+Keyman requires access to your keyboard in order to translate input. In macOS Catalina, there
+are three different Privacy settings you will need to configure in order for Keyman to work
+correctly:
+
+* **Privacy** / **Input Monitoring**
+* **Privacy** / **Accessibility**
+* **Privacy** / **Files and Folders**
+
+The Keyman installer will configure these privacy settings for you, and prompt you to allow access for Keyman. If you do not allow access at that time, you will need to follow the steps here in order to use Keyman.
+
+Symptoms that you may experience if Security & Privacy is not configured correctly include:
+
+* Some key combinations may not work
+* You may find that some letters are duplicated or not deleted as you expect
+
+**Note:** Keyman may not appear under these settings until it has been run at least one
+time. If Keyman does not appear in the relevant panes in System Preferences, select Keyman
+from the Input Sources menu and try typing in an app.
+
+In some situations, even then, Keyman won't appear in the Accessibility setting. In this case,
+macOS should prompt you the first time that Keyman needs access to Accessibility.
+
+## Enabling Keyman in macOS Privacy System Preferences
+
+1. Open **System Preferences**:
+
+   ![System Preferences menu](../mac_images/apple_menu.png)
+
+2. Select **Security & Privacy**, and choose the **Privacy** tab:
+
+   ![System Preferences](../mac_images/system_preferences.png)
+
+3. Select **Input Monitoring** and unlock the settings with the lock icon,
+
+   ![Input Monitoring - not checked](../mac_images/privacy_input_monitoring_locked.png)
+
+4. Keyman should appear in the list. Tick the Keyman item:
+
+   ![Input Monitoring](../mac_images/privacy_input_monitoring.png)
+
+5. Select **Accessibility**, and ensure that Keyman is ticked there as well:
+
+   ![Accessibility](../mac_images/privacy_accessibility.png)
+
+6. Select **Files and Folders**, and ensure that Keyman has access to the **Documents** folder there:
+
+   ![Files and Folders](../mac_images/privacy_files_and_folders.png)
+
+**Note:** You may be prompted to shut down Keyman in order for the changes to take
+effect. If so, follow the prompts to allow the system to close Keyman. You'll need
+to select an alternate input source from the Input Sources, and then switch back to
+Keyman, to start using Keyman again.
+
+## Upgrading macOS
+
+You should only have to undertake this procedure once. However, if you upgrade your
+version of macOS, and Keyman stops working, follow these steps to re-enable Keyman.
diff --git a/mac/help/troubleshooting/index.md b/mac/help/troubleshooting/index.md
new file mode 100644
index 0000000000..2190a7c3cb
--- /dev/null
+++ b/mac/help/troubleshooting/index.md
@@ -0,0 +1,6 @@
+---
+title: Troubleshooting
+---
+
+* [Configure macOS security for Keyman](configure-security)
+* [Uninstall Keyman for macOS](uninstall-keyman)
diff --git a/mac/help/troubleshooting/uninstall-keyman.md b/mac/help/troubleshooting/uninstall-keyman.md
new file mode 100644
index 0000000000..64ba2648e0
--- /dev/null
+++ b/mac/help/troubleshooting/uninstall-keyman.md
@@ -0,0 +1,25 @@
+---
+title: Uninstalling Keyman
+---
+
+To uninstall Keyman for macOS:
+
+1. Choose Apple menu > System Preferences.
+
+   ![Apple menu](../mac_images/apple_menu.png)
+
+2. Click Keyboard, then click Input Sources.
+
+3. Select Keyman, then click ![-](../mac_images/remove.png):
+   ![Input Sources](../mac_images/remove_keyman.png)
+
+4. In Finder, on the **Go** menu, click **Go to Folder...**
+
+5. Type `~/Library/Input Methods`, then click **Go**
+   ![Go to Folder](../mac_images/go_to_folder.png)
+
+6. Right-click Keyman.app and choose **Move to Trash**
+
+**Note:** If you get the error 'The item "Keyman.app" can't be
+moved to the Trash because it's open', log out and log back in
+or restart your Mac and repeat the last step.
diff --git a/oem/firstvoices/common/build_keyboards.sh b/oem/firstvoices/common/build_keyboards.sh
index 7ead3ceb73..569a6e003d 100755
--- a/oem/firstvoices/common/build_keyboards.sh
+++ b/oem/firstvoices/common/build_keyboards.sh
@@ -35,11 +35,10 @@ function die {
 }
 
 function display_usage {
-  echo "Usage: build_keyboards.sh [-download-keyboards] [-download-js-keyboards] [-copy-keyboards] [-clean-keyboards] [-debug] [-h|-?]"
+  echo "Usage: build_keyboards.sh [-download-keyboards] [-copy-keyboards] [-clean-keyboards] [-debug] [-h|-?]"
   echo "Builds all keyboards used by the app and copies them into the"
   echo "target path."
   echo "  -download-keyboards: Download fv_all.kmp from downloads.keyman.com"
-  echo "  -download-js-keyboards: Download js keyboards from downloads.keyman.com"
   echo "  -copy-keyboards: Only copy the keyboards; don't rebuild them"
   echo "  -clean-keyboards: Clean the keyboards from this repo"
   echo "  -debug: Build debug versions of the keyboards"
@@ -50,7 +49,6 @@ DO_CLEAN=true
 DO_COPY=true
 DO_BUILD=true
 DO_DOWNLOAD=false
-DO_JS_DOWNLOAD=false # Remove when iOS handles fv-all.kmp
 
 while [[ $# -gt 0 ]] ; do
   key="$1"
@@ -60,12 +58,6 @@ while [[ $# -gt 0 ]] ; do
       DO_COPY=false
       DO_BUILD=false
       ;;
-    -download-js-keyboards)
-      DO_DOWNLOAD=true
-      DO_JS_DOWNLOAD=true
-      DO_COPY=false
-      DO_BUILD=false
-      ;;
     -copy-keyboards)
       DO_BUILD=false
       ;;
@@ -145,28 +137,10 @@ if [ $DO_DOWNLOAD = true ]; then
   URL_DOWNLOAD=https://downloads.keyman.com
   URL_API_VERSION=${URL_DOWNLOAD}/api/keyboard/
 
-  if [ $DO_JS_DOWNLOAD = true ]; then
-    # iOS still copies individual JS keyboard files
-    {
-      # Skip header line
-      read
-
-      # Read CSV and build each referenced keyboard
-      while IFS=, read -r shortname id name region old_keyboard; do
-        echo "Downloading $id ($name)"
-        # Get latest version
-        URL_DOWNLOAD_FILE=`curl -s "$URL_API_VERSION/$id" | "$JQ" -r .js`
-        curl -s "$URL_DOWNLOAD_FILE" > "$SCRIPT_ROOT/$KEYBOARDS_TARGET/$id.js"
-        curl -s "${URL_DOWNLOAD_FILE%.*}.keyboard_info" > "$SCRIPT_ROOT/$KEYBOARDS_TARGET/$id.keyboard_info"
-      done
-    } < "$SCRIPT_ROOT/../keyboards.csv"
-  else
-    # Desktop and Android use fv_all.kmp
-    id="fv_all"
-    echo "Downloading $id"
-    URL_DOWNLOAD_FILE=`curl -s "$URL_API_VERSION/$id" | "$JQ" -r .kmp`
-    curl -s "$URL_DOWNLOAD_FILE" > "$SCRIPT_ROOT/$KEYBOARDS_TARGET/$id.kmp"
-  fi
+  id="fv_all"
+  echo "Downloading $id"
+  URL_DOWNLOAD_FILE=`curl -s "$URL_API_VERSION/$id" | "$JQ" -r .kmp`
+  curl -s "$URL_DOWNLOAD_FILE" > "$SCRIPT_ROOT/$KEYBOARDS_TARGET/$id.kmp"
 fi
 
 echo "Keyboards built successfully."
diff --git a/oem/firstvoices/ios/FVShared/FVShared.swift b/oem/firstvoices/ios/FVShared/FVShared.swift
index 84d8ee8614..c5148d119c 100644
--- a/oem/firstvoices/ios/FVShared/FVShared.swift
+++ b/oem/firstvoices/ios/FVShared/FVShared.swift
@@ -24,12 +24,13 @@ struct FVConstants {
   static let legacy_kFVKeyboardFilenameKey = "FVKeyboardFilename"
 
   // Keyboard files and paths
-  static let keyboardsPath = "Keyboards/files"
+  static let keyboardsPath = "Keyboards"
+  static let keyboardsPackage = "fv_all"
+  static let keyboardsPackageExt = "kmp"
   static let keyboardsCSVPath = "Keyboards"
   static let keyboardsCSVName = "keyboards"
   static let keyboardsCSVType = "csv"
   static let keyboardInfoType = "keyboard_info"
-  static let keyboardType = "js"
 
   // Instructions web page
   static let instructionsName = "setup"
diff --git a/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift b/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift
index 39dbe4a0ea..75ee364b47 100644
--- a/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift
+++ b/oem/firstvoices/ios/FirstVoices/FVKeyboardList.swift
@@ -194,49 +194,48 @@ class FVRegionStorage {
     while Manager.shared.removeKeyboard(at: 0) {
     }
 
-    // Iterate through the available keyboards
+    // Load the primary keyboards package so that we can install keyboards from it.
+    let keyboardPackagePath: String = Bundle.main.path(forResource: FVConstants.keyboardsPackage,
+                                                       ofType: FVConstants.keyboardsPackageExt,
+                                                       inDirectory: FVConstants.keyboardsPath)!
+    let pathUrl = URL(fileURLWithPath: keyboardPackagePath)
+    let keyboardsPackage: KeyboardKeymanPackage
+    do {
+      let package = try ResourceFileManager.shared.prepareKMPInstall(from: pathUrl)
+      guard package as? KeyboardKeymanPackage != nil else {
+        print("Failed to load \(FVConstants.keyboardsPackage).\(FVConstants.keyboardsPackageExt)")
+        return
+      }
 
+      keyboardsPackage = (package as? KeyboardKeymanPackage)!
+    } catch {
+      print("Failed to load \(FVConstants.keyboardsPackage).\(FVConstants.keyboardsPackageExt)")
+      return
+    }
+
+    // Iterate through the available keyboards
     for region in keyboardList {
       let keyboards = region.keyboards
       for kb in keyboards {
         if loadedKeyboards.contains(kb.id) {
-
-          // Load the .keyboard_info file and find its first language code
-
-          var keyboardInfo: KeyboardInfo
+          // Install the keyboard from its package.
           do {
-            let kbinfoFilename: String = Bundle.main.path(forResource: kb.id, ofType: FVConstants.keyboardInfoType, inDirectory: FVConstants.keyboardsPath)!
-            keyboardInfo = try KeyboardInfoParser.decode(file: kbinfoFilename)
-          } catch {
-            print("Failed to load keyboard info for " + kb.id+": " + error.localizedDescription)
+            // Find the matching keyboard entry from the package.
+            // We currently rely on the package to track each keyboard's available language tags.
+            if let packageKbId = keyboardsPackage.installables.first(where: { entry in
+              // Each entry in the returned array corresponds to one supported language for the keyboard.
+              entry.contains { $0.id == kb.id }
+              // We only install the first available language.  Easy to change, though.
+            }).map({ $0[0] })?.fullID { // then
+              try ResourceFileManager.shared.install(resourceWithID: packageKbId, from: keyboardsPackage)
+            } else {
+              print("Keyboard "+kb.id+" not found in primary keyboards package")
             continue
-          }
-
-          // Preload the keyboard
-
-          do {
-            let kbPath: String = Bundle.main.path(forResource: kb.id,
-                                                  ofType: FVConstants.keyboardType,
-                                                  inDirectory: FVConstants.keyboardsPath)!
-            let pathUrl = URL(fileURLWithPath: kbPath)
-            try Manager.shared.preloadFiles(forKeyboardID: kb.id, at: [pathUrl], shouldOverwrite: true)
+            }
           } catch {
             print("Failed to load preload "+kb.id+": " + error.localizedDescription)
             continue
           }
-
-          // Install the keyboard into Keyman Engine
-
-          let keyboard: InstallableKeyboard = InstallableKeyboard.init(id: kb.id,
-                                                                       name: kb.name,
-                                                                       languageID: keyboardInfo.languages.keys[keyboardInfo.languages.startIndex],
-                                                                       languageName: kb.name,
-                                                                       version: keyboardInfo.version,
-                                                                       isRTL: false,
-                                                                       font: nil,
-                                                                       oskFont: nil,
-                                                                       isCustom: true)
-          Manager.shared.addKeyboard(keyboard)
         }
       }
     }
diff --git a/oem/firstvoices/ios/FirstVoices/ViewController.swift b/oem/firstvoices/ios/FirstVoices/ViewController.swift
index 1d67e4d5ce..1081c390d1 100644
--- a/oem/firstvoices/ios/FirstVoices/ViewController.swift
+++ b/oem/firstvoices/ios/FirstVoices/ViewController.swift
@@ -21,22 +21,6 @@ class ViewController: UIViewController, UIWebViewDelegate {
   override func viewDidLoad() {
     super.viewDidLoad()
 
-    //
-    // Install all the .js files into Keyman Engine (doesn't show them in the keyboard list)
-    //
-
-    let kbPaths: [String] = Bundle.main.paths(forResourcesOfType: FVConstants.keyboardType,
-                                              inDirectory: FVConstants.keyboardsPath)
-    for kbPath in kbPaths {
-      let pathUrl = URL(fileURLWithPath: kbPath)
-      let id = pathUrl.deletingPathExtension().lastPathComponent
-      do {
-        try Manager.shared.preloadFiles(forKeyboardID: id, at: [pathUrl], shouldOverwrite: true)
-      } catch {
-        print("Failed to preload "+id+": "+error.localizedDescription)
-      }
-    }
-
     //
     // Show Instructions page
     //
diff --git a/oem/firstvoices/ios/build.sh b/oem/firstvoices/ios/build.sh
index 4b56f116f6..3f83c56d70 100755
--- a/oem/firstvoices/ios/build.sh
+++ b/oem/firstvoices/ios/build.sh
@@ -3,11 +3,11 @@
 set -e
 
 export TARGET=FirstVoices
-export KEYBOARDS_TARGET="$TARGET/Keyboards/files"
+export KEYBOARDS_TARGET="$TARGET/Keyboards"
 export KEYBOARDS_CSV_TARGET="$TARGET/Keyboards/keyboards.csv"
 
 # TODO: support passing -copy-keyboards, -debug, -clean etc in to build_keyboards
-../common/build_keyboards.sh -download-js-keyboards
+../common/build_keyboards.sh -download-keyboards
 
 TARGET=FirstVoices
 # TODO: in the future build_common.sh should probably be shared with all oem products?
diff --git a/oem/firstvoices/windows/.gitignore b/oem/firstvoices/windows/.gitignore
index ad51cca561..58e1ecbc7a 100644
--- a/oem/firstvoices/windows/.gitignore
+++ b/oem/firstvoices/windows/.gitignore
@@ -6,6 +6,7 @@ src/inst/*.exe
 src/inst/download.mak
 src/inst/fv_all.kmp
 src/xml/localedef.dtd
+src/xml/sentry.init.js
 **/Thumbs.db
 
 # Temporary ignores
diff --git a/oem/firstvoices/windows/src/branding/menutitle.png b/oem/firstvoices/windows/src/branding/menutitle.png
index 3cbd973be4..70d7fa600f 100644
Binary files a/oem/firstvoices/windows/src/branding/menutitle.png and b/oem/firstvoices/windows/src/branding/menutitle.png differ
diff --git a/oem/firstvoices/windows/src/inst/Makefile b/oem/firstvoices/windows/src/inst/Makefile
index a0e2ec268a..be9f4ad9f6 100644
--- a/oem/firstvoices/windows/src/inst/Makefile
+++ b/oem/firstvoices/windows/src/inst/Makefile
@@ -11,7 +11,7 @@ MSI=firstvoices.msi
 EXE=firstvoices.exe
 KMP=fv_all.kmp
 INTEXE=firstvoices-fv_all.exe
-APPTITLE="FirstVoices Keyboards"
+APPTITLE="Keyman for FirstVoices"
 TITLEIMAGE=setuptitle.png
 
 # If doing manual build of the project, manual-setup is the default target
@@ -28,6 +28,9 @@ prereq:
     cd $(FVROOT)\src\inst
     $(MKVER_U) download.in download.mak
 
+    cd $(FVROOT)\src\xml
+    $(MKVER_U) sentry.init.js.in sentry.init.js
+
     #
     # Build FirstVoices keyboards fv_all.kmp
     #
diff --git a/oem/firstvoices/windows/src/inst/license.html b/oem/firstvoices/windows/src/inst/license.html
index f8734937cf..9c601dc5c7 100644
--- a/oem/firstvoices/windows/src/inst/license.html
+++ b/oem/firstvoices/windows/src/inst/license.html
@@ -9,7 +9,7 @@
   </head>
 <body lang="en">
 
-<h1>FirstVoices Keyboards</h1>
+<h1>Keyman for FirstVoices and FirstVoices Keyboards</h1>
 
 <h2>The MIT License</h2>
 
diff --git a/oem/firstvoices/windows/src/inst/license.rtf b/oem/firstvoices/windows/src/inst/license.rtf
index c086fa8dfa..d26ff0142c 100644
Binary files a/oem/firstvoices/windows/src/inst/license.rtf and b/oem/firstvoices/windows/src/inst/license.rtf differ
diff --git a/oem/firstvoices/windows/src/inst/setuptitle.png b/oem/firstvoices/windows/src/inst/setuptitle.png
index c4d82690d4..1c2e00fe8f 100644
Binary files a/oem/firstvoices/windows/src/inst/setuptitle.png and b/oem/firstvoices/windows/src/inst/setuptitle.png differ
diff --git a/oem/firstvoices/windows/src/xml/basekeyboard.xsl b/oem/firstvoices/windows/src/xml/basekeyboard.xsl
index 0a993ff776..85bdf38672 100644
--- a/oem/firstvoices/windows/src/xml/basekeyboard.xsl
+++ b/oem/firstvoices/windows/src/xml/basekeyboard.xsl
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
-  
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:include href="elements.xsl"/>
 
   <xsl:variable name="dialoginfo_basekeyboard" select="$dialoginfo/Dialog[@Id='BaseKeyboard'][1]" />
-  
+
   <xsl:template match="/">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <script src="/app/sentry.bundle.min.js"></script>
+    <script src="/app/sentry.init.js"></script>
     <title><xsl:value-of select="$locale/string[@name='S_BaseKeyboard_Title']"/></title>
-    <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>config.css</xsl:attribute></link>
+    <link rel="stylesheet" type="text/css" href="/app/config.css" />
 <style type="text/css">
-  * { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; }
+  * { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI";}
 
 html {
  font-size:		 11px;
@@ -29,7 +30,7 @@ html {
 body {
  font-size:	 	 11px;
  text-align:	justify;
- padding: 0; 
+ padding: 0;
  margin:	 0px;
  width:    <xsl:value-of select="$dialoginfo_basekeyboard/@Width" />px;
  height:   <xsl:value-of select="$dialoginfo_basekeyboard/@Height" />px;
@@ -49,15 +50,15 @@ div {
   font-size: 13.3px;
 }
 
-#border { 
-  border: 1px solid #AD4A29; 
+#border {
+  border: 1px solid #AD4A29;
   position: absolute;
   left: 0;
   top: 0;
-  width: <xsl:value-of select="$dialoginfo_basekeyboard/@Width - 2" />px; 
+  width: <xsl:value-of select="$dialoginfo_basekeyboard/@Width - 2" />px;
   height: <xsl:value-of select="$dialoginfo_basekeyboard/@Height - 2" />px;
   }
-  
+
 #content {
  padding: 10px;
  text-align: center;
@@ -69,7 +70,7 @@ div {
   height: 36px;
   text-align: center;
   width: 100%;
-} 
+}
 
 .form { position: absolute; display: block; vertical-align: middle; height: 24px; }
 #ProxyServerLabel { left: 16px; top: 20px;}
@@ -93,7 +94,7 @@ div {
     location.href='keyman:footer_ok?'+
       'id='+document.getElementById('options_base_keyboard_select').value;
   }
-	
+
 	document.onkeydown = function()
 	{
 		if(event.keyCode == 13 && (!event.srcElement.type || event.srcElement.type != 'button')) ok();
@@ -108,7 +109,7 @@ div {
   <div id='content'>
 
     <p><xsl:value-of select="$locale/string[@name='S_BaseKeyboard_Text']"/></p>
-    
+
     <div id="options_base_keyboard">
       <select id='options_base_keyboard_select'>
         <xsl:for-each select="//BaseKeyboards/BaseKeyboard">
@@ -120,7 +121,7 @@ div {
         </xsl:for-each>
       </select>
     </div>
-  </div>    
+  </div>
   <div id="footer">
     <xsl:call-template name="button">
       <xsl:with-param name="default">1</xsl:with-param>
@@ -139,4 +140,4 @@ div {
 </body>
 </html>
     </xsl:template>
-  </xsl:stylesheet>
\ No newline at end of file
+  </xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/config.css b/oem/firstvoices/windows/src/xml/config.css
index a3593e8768..28f0946476 100644
--- a/oem/firstvoices/windows/src/xml/config.css
+++ b/oem/firstvoices/windows/src/xml/config.css
@@ -1,7 +1,3 @@
-*
-{
-  font-family: Tahoma;
-}
 #state
 {
   display: none;
@@ -10,7 +6,7 @@
 #displaylanguage
 {
   left: 8px;
-  font-size: 11px;
+  font-size: 12px;
   position: absolute;
   top: 64px;
   color: #000000;
@@ -23,7 +19,7 @@
 {
   position: absolute;
   left: 0px;
-  top: 37px;
+  top: 40px;
   width: 117px;
   overflow-x: hidden;
   overflow-y: hidden;
@@ -72,7 +68,7 @@
 {
   background: #79C3DA;
   width: 117px;
-  height: 37px;
+  height: 40px;
   position: absolute;
   top: 0;
   left: 0;
@@ -83,7 +79,7 @@
   background: none;
   overflow-x: hidden;
   overflow-y: auto;
-  font-size: 12px;
+  font-size: 13px;
   border-right: 1px solid #6D6C6F;
   border-top: 1px solid #6D6C6F;
   border-bottom: 1px solid #6D6C6F;
@@ -132,12 +128,25 @@
   border-right: 1px solid #6D6C6F;
 }
 
+.footer_instant {
+  font-size: 12px;
+  padding-top: 3px;
+  padding-right: 3px;
+}
+
 input[type='submit'], input[type='button'], button
 {
   background: #F68924;
   border-radius: 4px;
   color: #33333f;
   border: none;
+  vertical-align: top;
+}
+
+input[type='submit']:disabled, input[type='button']:disabled, button:disabled
+{
+  color: #c0c0cf;
+  background: #80808f;
 }
 
 a.hotkey:link, a.hotkey:visited
@@ -171,9 +180,10 @@ html
 
 .helplinks
 {
-  padding: 4px 4px 0 0;
+  padding: 6px 4px 0 0;
   float: right;
-  font: 12px Tahoma;
+  font-size: 12px;
+  font-weight: normal;
 }
 .helplinks a
 {
@@ -391,30 +401,30 @@ table tr
 }
 
 #keyboards .item .list_icon {
-  float: left; 
+  float: left;
   margin: 2px 6px 4px 1px;
 }
 
 /* no keyboards installed box */
 
 .info#keyboards {
-  position: absolute; 
+  position: absolute;
   top: 25%;
 }
 
 .info#keyboards > div {
-  position: relative; 
-  left: 0; 
-  top: 0; 
-  font-size: 13.3px; 
-  margin: 0 12px; 
-  border: solid 1px gray; 
-  padding: 8px; 
+  position: relative;
+  left: 0;
+  top: 0;
+  font-size: 13.3px;
+  margin: 0 12px;
+  border: solid 1px gray;
+  padding: 8px;
   background: #F5F6BE
 }
 
 .info#keyboards > div > img {
-  float: left; 
+  float: left;
   margin: 0 8px 0 0;
 }
 
@@ -530,6 +540,8 @@ table tr
 }
 .keyboard-language:hover a
 {
+  position: relative;
+  z-index: 10;
   visibility: visible;
 }
 
@@ -586,7 +598,6 @@ table tr
   font-weight: bold;
   color: #001020;
   padding: 4px 8px;
-  height: 16px;
 }
 
 .options_list_help
@@ -601,11 +612,11 @@ table tr
   overflow: hidden;
 }
 
-#options_base_keyboard_current { 
-  display: inline-block; 
+#options_base_keyboard_current {
+  display: inline-block;
   padding-top: 5px;
 }
-  
+
 /* Hotkey Styles */
 
 #subcontent_hotkeys .list_item
@@ -714,7 +725,7 @@ th
 
 .support_links {
   right: 0;
-  top: 38px;
+  top: 41px;
   width: 140px;
   height: 100%;
   padding: 12px;
@@ -780,7 +791,6 @@ th
   margin: 6px 0px 0 10px;
   font-size: 12pt !important;
   font-weight: bold;
-  font-family: Calibri !important;
   height: 32px !important;
   background: #0AB8A0;
   color: white;
@@ -811,14 +821,15 @@ th
 {
   clear: left;
   float: left;
-  font: bold 11px Tahoma;
+  font-size: 11px;
+  font-weight: bold;
   color: #333;
 }
 .support_line_content
 {
   float: left;
   margin-left: 20px;
-  font: 11px Tahoma;
+  font-size: 11px;
   color: black;
 }
 .support_line_content .beta
@@ -836,7 +847,7 @@ th
 }
 .support_content_header
 {
-  font: 16px Tahoma;
+  font-size: 16px;
   margin: 10px 0;
   color: #333;
 }
@@ -873,7 +884,6 @@ th
 
 #pro_content {
   padding: 5px 20px 5px 20px;
-  font-family: Calibri !important;
 }
 
 .pro_title {
@@ -901,7 +911,6 @@ th
 #pro_upgrade_button_bottom input {
   font-size: 14pt !important;
   font-weight: bold;
-  font-family: Calibri !important;
   height: 32px !important;
   background: #0AB8A0;
   color: white;
@@ -915,7 +924,6 @@ th
 #pro_content p {
   font-size: 14pt;
   color: #444444;
-  font-family: Calibri;
   font-weight: bold;
 }
 
@@ -929,7 +937,6 @@ th
   border: solid 1px #cccccc;
   font-size: 11pt;
   padding: 4px 8px;
-  font-family: Calibri !important;
 }
 
 #pro_features th {
@@ -957,16 +964,16 @@ th
 }
 
 .keyboard-language-title {
-  color: #444444; 
-  float:right; 
-  padding-top: 5px; 
+  color: #444444;
+  float:right;
+  padding-top: 5px;
   margin-right: 8px;
   text-decoration: none;
 }
 
 .keyboard-language-title .language-icon {
-  padding-top: 0px; 
-  margin-top: -2px; 
+  padding-top: 0px;
+  margin-top: -2px;
   margin-left: 8px;
   visibility: visible;
 }
@@ -982,7 +989,7 @@ th
   padding-left: 8px;
 }
 
-.keyboard-language-title:hover, 
+.keyboard-language-title:hover,
 .keyboard-language-title:active {
   text-decoration: underline;
   cursor: pointer;
@@ -1005,7 +1012,7 @@ th
 }
 
 #keepintouch_content {
-  height: 100%; 
+  height: 100%;
   overflow: hidden;
 }
 
diff --git a/oem/firstvoices/windows/src/xml/config.js b/oem/firstvoices/windows/src/xml/config.js
index 06765cb713..4d65401a1b 100644
--- a/oem/firstvoices/windows/src/xml/config.js
+++ b/oem/firstvoices/windows/src/xml/config.js
@@ -14,11 +14,11 @@ function _$(e)
 
 function windowResize()
 {
-  var 
-    eContent = _$('contentframe'), 
-    eFooter = _$('footerframe'), 
+  var
+    eContent = _$('contentframe'),
+    eFooter = _$('footerframe'),
     eMenu = _$('menuframe');
-    
+
   if(eContent && eFooter && eMenu)
   {
     eContent.style.height = (document.body.offsetHeight - eFooter.offsetHeight - 1) + 'px';
@@ -26,7 +26,7 @@ function windowResize()
     eContent.style.left = eMenu.offsetWidth + 'px';
     eContent.style.top = 0 + 'px';
     eMenu.style.height = (document.body.offsetHeight - eFooter.offsetHeight - eMenu.offsetTop) + 'px';
-    
+
     var h = (eContent.offsetHeight - 37 - 2) + 'px'; // header height and border height
     _$('subcontent_keyboards').style.height = h;
     _$('subcontent_options').style.height = h;
@@ -42,23 +42,23 @@ function windowResize()
 doAttachEvent(window, 'resize', windowResize);
 doAttachEvent(window, 'load', windowResize);
 document.addEventListener("DOMContentLoaded", windowResize);
-  
+
   function list_mousedown(event,n)
   {
     var e = document.getElementById('list_'+n);
     window.setTimeout(function() { e.focus(); }, 10);
   }
-  
+
   function list_focus(event,n)
   {
     return true;
   }
-  
+
   function list_blur(event,n)
   {
     return true;
   }
-    
+
   function list_keydown(event,n)
   {
     switch(event.keyCode)
@@ -75,7 +75,7 @@ document.addEventListener("DOMContentLoaded", windowResize);
           elem.children[i].focus();
           break;
         }
-        
+
       }
       break;
     case 38:    // up
@@ -84,7 +84,7 @@ document.addEventListener("DOMContentLoaded", windowResize);
         event.cancelBubble=true;
         return true;
       }
-      
+
       // find prev list element
       var elem = event.srcElement.parentElement;
       for(var i = 0; i < elem.children.length; i++) {
@@ -109,7 +109,7 @@ document.addEventListener("DOMContentLoaded", windowResize);
         event.cancelBubble=true;
         return true;
       }
-      
+
       // find next file element
       var elem = event.srcElement.parentElement;
       for(var i = 0; i < elem.children.length; i++) {
@@ -144,7 +144,7 @@ document.addEventListener("DOMContentLoaded", windowResize);
       if( document.getElementById('menu_options_'+n) != null ) {
         var x = document.getElementById('list_'+n).offsetLeft + document.getElementById('menuframe').offsetWidth + 100;
         var y = document.getElementById('list_'+n).offsetTop + document.getElementById('keyboards_header').offsetHeight + 10;
-      
+
         ShowMenu( 'options_'+n, 'left', x, y);
       }
       event.cancelBubble = true;
@@ -161,26 +161,26 @@ document.addEventListener("DOMContentLoaded", windowResize);
 
   document.onfocusin = function() {
     var itemtype, blah, elemid;
-    
+
     globalfocus = event.srcElement;
     if(!event.srcElement) { return true; }
     elemid = event.srcElement.id;
-    if(typeof elemid != 'string') { 
+    if(typeof elemid != 'string') {
       // e.g. if document has received focus, id may be undefined
       return true;
     }
     itemtype = elemid.substr(0, 5);
-    
+
     if(event.srcElement.className.substr(0,8) != 'menuitem' && event.srcElement != menudiv
           && menudiv != null && menudiv.style.visibility=='visible') HideMenu();
-    
+
     if(globalfocus_item != null) {
       if(globalfocus_item != event.srcElement && !globalfocus_item.contains(event.srcElement)) {
         /* globalfocus_item.style.background = '';
         globalfocus_item.style.filter = ''; */
         $(globalfocus_item).removeClass('list_item_focus');
         globalfocus_item = null;
-      }        
+      }
     }
     if( event.srcElement.className.indexOf('list_item') >= 0 ) {
       globalfocus_item = event.srcElement;
@@ -190,16 +190,17 @@ document.addEventListener("DOMContentLoaded", windowResize);
       return true;
     }
     return true;
-  }        
-  
+  }
+
   function list_detail(event,n) {
     var k = document.getElementById('list_'+n);
-    $(k).toggleClass('expanded');
+    if(event.ctrlKey)
+      $(k).toggleClass('expanded');
     k.focus();
     save_state();
     return false;
   }
-  
+
   var loading_state = false;
 
   function save_state() {
@@ -207,15 +208,24 @@ document.addEventListener("DOMContentLoaded", windowResize);
     var state = {
       activeIndex: menuframe_activeindex,
       keyboards: [],
-      keyboardsScrollTop: $('#subcontent_keyboards').scrollTop()
+      // TODO: scrollTop is not known when element is display:none
+      keyboardsScrollTop: $('#subcontent_keyboards').scrollTop(),
+      optionsScrollTop: $('#subcontent_options').scrollTop(),
+      hotkeysScrollTop: $('#subcontent_hotkeys').scrollTop()
     };
     var keyboards = $('div.list_item');
     keyboards.each(function(index) {
-      state.keyboards.push({name: $(this).data('name'), expanded: $(this).hasClass('expanded')});
+      const name = $(this).data('name');
+      if(name) {
+        state.keyboards.push({name: name, expanded: $(this).hasClass('expanded')});
+      }
     });
-    $('#state').text(JSON.stringify(state));
+    const stateJson = JSON.stringify(state);
+    const params = new URLSearchParams(window.location.search);
+    const PageTag = params.get('tag');
+    jQuery.post('/data/keyman/state', { tag: PageTag, state: stateJson });
   }
-  
+
   function load_state() {
     loading_state = true;
     var s = $('#state').text();
@@ -235,21 +245,29 @@ document.addEventListener("DOMContentLoaded", windowResize);
             $('div.list_item[data-name="'+state.keyboards[i].name+'"]').addClass('expanded');
         }
       }
-      if(state.keyboardsScrollTop) {
-      //alert(state.keyboardsScrollTop);
-        window.setTimeout(function() { $('#subcontent_keyboards').scrollTop(state.keyboardsScrollTop); }, 1);
-      //alert($('#subcontent_keyboards').scrollTop());
-      }
+      window.setTimeout(function() {
+        if(state.keyboardsScrollTop) {
+          $('#subcontent_keyboards').scrollTop(state.keyboardsScrollTop);
+        }
+        if(state.optionsScrollTop) {
+          $('#subcontent_options').scrollTop(state.optionsScrollTop);
+        }
+        if(state.hotkeysScrollTop) {
+          $('#subcontent_hotkeys').scrollTop(state.hotkeysScrollTop);
+        }
+      }, 1);
     }
     loading_state = false;
   }
-  
+
   $( document ).ready(function() {
     load_state();
     $('#subcontent_keyboards').scroll(function() { save_state(); });
+    $('#subcontent_options').scroll(function() { save_state(); });
+    $('#subcontent_hotkeys').scroll(function() { save_state(); });
   });
-  
-  
+
+
 function submitSupportRequest() {
   location.href = 'keyman:contact_support?message='+encodeURIComponent($('#contact_support').val());
 }
@@ -279,9 +297,21 @@ function options_basekeyboard() {
 function keyboard_checkclick(n,toggle) {
   var k = document.getElementById('keyboardcheck_'+n), li = document.getElementById('list_keyboard_'+n);
   if(toggle) k.checked = !k.checked;
-  location.href='keyman:keyboard_clickcheck?id='+n+'&value='+k.checked;
+  location.href='keyman:keyboard_clickcheck?install=1&id='+n+'&value='+k.checked;
   var liTitle = document.getElementById('listtitle_keyboard_'+n);
   liTitle.className = k.checked ? 'list_title keyboard_loaded' : 'list_title keyboard_unloaded';
   li.focus();
   return true;
 }
+
+/* QRCode popup */
+
+function showKeyboardLink(id) {
+  var e = document.getElementById('qrcode-'+id);
+  e.className='qrcode qrcode-visible';
+}
+
+function hideKeyboardLink(id) {
+  var e = document.getElementById('qrcode-'+id);
+  e.className='qrcode';
+}
\ No newline at end of file
diff --git a/oem/firstvoices/windows/src/xml/downloadkeyboard.xsl b/oem/firstvoices/windows/src/xml/downloadkeyboard.xsl
index c2849adcbc..d163122d06 100644
--- a/oem/firstvoices/windows/src/xml/downloadkeyboard.xsl
+++ b/oem/firstvoices/windows/src/xml/downloadkeyboard.xsl
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="utf-8" ?>
-  
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:include href="elements.xsl"/>
 
   <xsl:variable name="dialoginfo_downloadkeyboard" select="$dialoginfo/Dialog[@Id='DownloadKeyboard'][1]" />
-  
+
   <xsl:template match="/">
     <html xmlns="http://www.w3.org/1999/xhtml">
       <head>
         <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-        <meta http-equiv="x-ua-compatible" content="ie=edge" />
+        <script src="/app/sentry.bundle.min.js"></script>
+        <script src="/app/sentry.init.js"></script>
+        <script src="/app/jquery.min.js"></script>
         <title><xsl:value-of select="$locale/string[@name='S_DownloadKeyboard_Title']"/></title>
-        
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>config.css</xsl:attribute></link>
+        <link rel="stylesheet" type="text/css" href="/app/config.css" />
         <style type="text/css">
-            * { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; }
-            
-            body { 
-              padding: 0px; margin: 0px; overflow: hidden; 
-              width: <xsl:value-of select="$dialoginfo_downloadkeyboard/@Width" />px; 
+            * { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI"; }
+
+            body {
+              padding: 0px; margin: 0px; overflow: hidden;
+              width: <xsl:value-of select="$dialoginfo_downloadkeyboard/@Width" />px;
               height: <xsl:value-of select="$dialoginfo_downloadkeyboard/@Height" />px;
             }
             html { width: 100%; padding: 0px; margin: 0px; overflow: hidden }
-            
+
             #size {
               position: absolute;
-              width: <xsl:value-of select="$dialoginfo_downloadkeyboard/@Width" />px; 
+              width: <xsl:value-of select="$dialoginfo_downloadkeyboard/@Width" />px;
               height: <xsl:value-of select="$dialoginfo_downloadkeyboard/@Height" />px;
             }
 
@@ -57,18 +58,34 @@
 		else return;
 		event.cancelBubble = true; event.returnValue = false;
   }
+
+  // This function is called by the Delphi code when browse events
+  // happen, because we cannot determine the state of history adequately
+  // from within the browser context.
+  function updateBackButtonState(shouldEnable) {
+    document.getElementById('button_back').disabled = !shouldEnable;
+  }
+
+  function goBack() {
+    history.back();
+  }
 ]]></script>
-				
+
       </head>
       <body>
-        <div id="size"></div>
         <iframe id="contentframe" frameborder="0">
-          <xsl:attribute name="src">https://keyman.com/go/desktop/10.0/download-keyboards?version=<xsl:value-of select="/Keyman/Version" /></xsl:attribute>&#160;
+          <xsl:attribute name="src"><xsl:value-of select='/Keyman/keyman-com' />/go/windows/<xsl:value-of select="/Keyman/version-info/@versionRelease" />/download-keyboards?version=<xsl:value-of select="/Keyman/Version" /></xsl:attribute>&#160;
         </iframe>
         <div id="footerframe">
-          <!--<div style="float:left; font-size: 13.3px;">
-            <input type="checkbox" id="chkDownloadOnly" /> <label for="chkDownloadOnly"><xsl:value-of select="$locale/string[@name='S_DownloadKeyboard_DownloadOnlyCheckbox']"/></label>
-          </div>-->
+          <div style="float:left; padding-left: 8px">
+            <xsl:call-template name="button">
+              <xsl:with-param name="id">back</xsl:with-param>
+              <xsl:with-param name="disabled">1</xsl:with-param>
+              <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Back']"/></xsl:with-param>
+              <xsl:with-param name="command">javascript:goBack()</xsl:with-param>
+              <xsl:with-param name="width">70px</xsl:with-param>
+            </xsl:call-template>
+          </div>
           <div style="float:right; padding-right: 8px">
             <xsl:call-template name="button">
               <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Cancel']"/></xsl:with-param>
diff --git a/oem/firstvoices/windows/src/xml/elements.xsl b/oem/firstvoices/windows/src/xml/elements.xsl
index f7b1c80642..a118709d90 100644
--- a/oem/firstvoices/windows/src/xml/elements.xsl
+++ b/oem/firstvoices/windows/src/xml/elements.xsl
@@ -5,24 +5,24 @@
   <xsl:output method="html" version="1.0" encoding="utf-8" omit-xml-declaration="yes" standalone="yes" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" />
 
   <!-- I978 - locale was not reliably selected due to undefined order of document() loading and | processing -->
-  <xsl:variable name="prilocale" select="document(/Keyman/localepath)/Locale" />
-  <xsl:variable name="altlocale" select="document('strings.xml')/resources/*[not(@name = $prilocale//@name)]" />
+  <xsl:variable name="prilocale" select="document(concat(/Keyman/localeserver,/Keyman/locale))/resources" />
+  <xsl:variable name="altlocale" select="document(concat(/Keyman/localeserver,'en'))/resources/*[not(@name = $prilocale//@name)]" />
   <xsl:variable name="comlocale">
       <xsl:copy-of select="$prilocale/*" />
       <xsl:copy-of select="$altlocale" />
   </xsl:variable>
   <xsl:variable name="dialoginfo" select="document('dialoginfo.xml')/DialogInfo" />
   <xsl:variable name="locale" select="msxsl:node-set($comlocale)" />
-    
+
   <!--
   -
   - Generic list implementation: supports entry plus expanding details
   -
   -->
 
-  
-  
-  <!-- 
+
+
+  <!--
   -
   - Checkbox implementation
   -
@@ -36,7 +36,7 @@
     <xsl:param name="title" />
     <xsl:param name="disabled" />
     <xsl:param name="tabid" />
-   
+
     <input type="checkbox">
       <xsl:attribute name="tabindex"><xsl:value-of select="$tabid"/></xsl:attribute>
       <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
@@ -48,12 +48,12 @@
     </input>
   </xsl:template>
 
-  <!-- 
+  <!--
   -
   - Button implementation
   -
   -->
-  
+
   <xsl:template name="button">
     <xsl:param name="caption" />
     <xsl:param name="command" />
@@ -62,6 +62,7 @@
 		<xsl:param name="default" />
     <xsl:param name="width" />
     <xsl:param name="id" />
+    <xsl:param name="disabled" />
     <xsl:param name="tabid" />
     <xsl:param name="shield" />
 
@@ -74,21 +75,20 @@
               <xsl:otherwise>button</xsl:otherwise>
             </xsl:choose>
           </xsl:attribute>
+          <xsl:if test="$disabled = 1"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
           <xsl:attribute name="id">button_<xsl:value-of select="$id"/></xsl:attribute>
           <xsl:attribute name="onclick"><xsl:choose><xsl:when test="$onclick != ''"><xsl:value-of select="$onclick"/></xsl:when><xsl:otherwise>location.href="<xsl:value-of select="$command"/>";</xsl:otherwise></xsl:choose></xsl:attribute>
           <xsl:attribute name="tabindex"><xsl:value-of select="$tabid"/></xsl:attribute>
           <xsl:attribute name="style">
-            font-size: 11px;
-            height: 25px; 
+            font-size: 12px;
+            height: 25px;
             display: inline-block;
             text-align: center;
             width: <xsl:value-of select="$width"/>;
             margin-right: 8px;
             vertical-align: top;
           </xsl:attribute>
-          <img alt="" style="vertical-align: middle; width: 16px; padding: 0; margin: 2px 4px 5px 0px; display: inline; height: 18px;">
-            <xsl:attribute name="src"><xsl:value-of select='/Keyman/templatepath' />shield.png</xsl:attribute>
-          </img> 
+          <img alt="" style="vertical-align: middle; width: 16px; padding: 0; margin: 2px 4px 5px 0px; display: inline; height: 18px;" src="/app/shield.png" />
           <xsl:value-of select="$caption" />
         </button>
       </xsl:when>
@@ -100,6 +100,7 @@
               <xsl:otherwise>button</xsl:otherwise>
             </xsl:choose>
           </xsl:attribute>
+          <xsl:if test="$disabled = 1"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
           <xsl:attribute name="ID">button_<xsl:value-of select="$id"/></xsl:attribute>
           <xsl:attribute name="onclick"><xsl:choose><xsl:when test="$onclick != ''"><xsl:value-of select="$onclick"/></xsl:when><xsl:otherwise>location.href="<xsl:value-of select="$command"/>";</xsl:otherwise></xsl:choose></xsl:attribute>
           <xsl:attribute name="value"><xsl:value-of select="$caption" /></xsl:attribute>
@@ -116,7 +117,7 @@
     </xsl:choose>
   </xsl:template>
 
-  <!-- 
+  <!--
   -
   - Popup menu implementation
   -
@@ -139,7 +140,7 @@
       <xsl:copy-of select="$caption"/>
     </span>
   </xsl:template>
-  
+
   <xsl:template name="menubutton">
     <xsl:param name="caption" />
     <xsl:param name="menutemplate" />
@@ -148,7 +149,7 @@
     <xsl:param name="width" />
     <xsl:param name="className" />
     <xsl:param name="tabid" />
-    
+
     <xsl:call-template name="button">
       <xsl:with-param name="caption"><xsl:value-of select="$caption" /></xsl:with-param>
       <xsl:with-param name="onclick">ShowMenu('<xsl:value-of select="$id"/>','<xsl:value-of select="$align" />',0,0); return false;</xsl:with-param>
@@ -158,11 +159,11 @@
       <xsl:with-param name="width"><xsl:value-of select="$width"/></xsl:with-param>
       <xsl:with-param name="tabid"><xsl:value-of select="$tabid"/></xsl:with-param>
     </xsl:call-template>
-    
+
   </xsl:template>
 
   <!-- Replaces a string, e.g. ' with \' https://stackoverflow.com/a/7712434/1836776 -->
-  
+
   <xsl:template name="replace-string">
     <xsl:param name="text"/>
     <xsl:param name="replace"/>
@@ -183,5 +184,5 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
+
 </xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/fonthelper.xsl b/oem/firstvoices/windows/src/xml/fonthelper.xsl
deleted file mode 100644
index c7e512c0c0..0000000000
--- a/oem/firstvoices/windows/src/xml/fonthelper.xsl
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" method="html" encoding="utf-8" standalone="yes" />
-
-	<xsl:include href="elements.xsl"/>
-
-	<xsl:template match="/">
-
-		<html>
-			<head>
-        <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-        <meta http-equiv="x-ua-compatible" content="ie=edge" />
-
-				<title>fonts</title>
-				<style type="text/css">
-					* { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; font-size: 12px; }
-
-					body { padding: 0px 0px; margin: 0px; width: 100%; height: 100%; background: #A0C1DC; border: none;}
-					html { padding: 0px; margin: 0px; overflow: auto; }
-					table { margin: 12px 0; border-collapse: collapse; width: <xsl:value-of select="count(/Keyman/Chars/Ch) * 15 + 250" />px; }
-					table tr td.font { text-align: left; vertical-align: middle; font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; white-space: nowrap; font-size: 11px; font-weight: bold; margin: 0px; padding: 0px; border-left: none; border-right: none; }
-					table tr td.coverage { text-align: left; vertical-align: middle; font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; white-space: nowrap; font-size: 11px; margin: 0px; padding-left: 6px; border-left: none; }
-          
-          td.char { text-align: center; vertical-align: middle; border: solid 1px #80A1BC; font-size: 13.3px; background: white; }
-          td.excluded { background: #FFcfc0; }
-          td:hover { background: #80A1BC; color: white; }
-					
-					#outer { position: absolute; height: 100%; left:0; top: 0; width: 100% }
-					#middle { position: absolute; top: 50%; width: 100% }
-					#inner { position: relative; top: -50%; }
-					
-					#inner-nokeyboards { position: relative; top: -50%; margin: -24px 5% 0 5%; min-height: 32px; width: 84%; padding: 8px 3%; background: #F5F6BE; border: solid 1px gray; text-align: left }
-					#inner-nokeyboards img { float: left; padding: 0 16px 0 0 }
-          
-          col.index { width: auto !important; }
-          col { width: 14px; color: #202428;  }
-					
-					#search { text-align: center; width: 100%; }
-					#no { text-align: center; width: 100% }
-					#fonts { padding: 12px }
-          
-          <xsl:for-each select="/Keyman/Fonts/Font">
-            .font_<xsl:value-of select="@Index"/> td { font-family: "<xsl:value-of select="@Name"/>"; }
-          </xsl:for-each>
-
-				</style>
-
-        <script type="text/javascript">
-          document.onclick = function(event)
-          {
-            if(!event) event = window.event;
-            var elem = event.srcElement ? event.srcElement : event.target;
-            if(elem.className.indexOf('char') &lt; 0) return false;
-            if(elem.title == '') return false;
-            location.href = 'keyman:insertchars?chars=x'+elem.title.substring(2);
-            return true;
-          }
-        </script>
- 
-			</head>
-
-			<body>
-				<xsl:choose>
-					<xsl:when test="/Keyman/Searching">
-						<div id="outer">
-							<div id="middle">
-								<div id="inner">
-									<div id="search">
-										<img alt="Searching...">
-											<xsl:attribute name="src">
-												<xsl:value-of select="/Keyman/templatepath"/>search.gif
-											</xsl:attribute>
-										</img>
-                    <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_PleaseWait1']"/>
-                    <xsl:text xml:space="preserve"> </xsl:text>
-										<b><xsl:value-of select="/Keyman/Keyboard/@Name" /></b>
-                    <xsl:text xml:space="preserve"> </xsl:text>
-                    <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_PleaseWait2']"/>
-									</div>
- 								</div>
-							</div>
-						</div>
-					</xsl:when>
-					<xsl:when test="/Keyman/Keyboard">
-							<xsl:choose>
-							  <xsl:when test="not(/Keyman/Fonts)">
-							    <div id="fonts">
-                  <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_NonUnicode1']"/>
-                  <xsl:text xml:space="preserve"> </xsl:text>
-							    <b><xsl:value-of select="/Keyman/Keyboard/@Name" /></b> 
-                  <xsl:text xml:space="preserve"> </xsl:text>
-                  <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_NonUnicode2']"/>
-							    </div>
-							  </xsl:when>
-								<xsl:when test="count(/Keyman/Fonts/Font[@Coverage &gt; 90]) > 0">
-									<div id="fonts">
-										<div>
-                      <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_MatchedFonts1']"/>
-                      <xsl:text xml:space="preserve"> </xsl:text>
-											<b><xsl:value-of select="/Keyman/Keyboard/@Name" /></b>
-                      <xsl:text xml:space="preserve"> </xsl:text>
-                      <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_MatchedFonts2']"/>
-										</div>
-										<div>
-											<table id="tableHighCover">
-                        <colgroup><col class="index" /><col class="index" /><xsl:for-each select="/Keyman/Chars/Ch"><col /></xsl:for-each></colgroup>
-												<xsl:apply-templates select="/Keyman/Fonts/Font[@Coverage &gt; 90]" />
-											</table>
-										</div>
-										<xsl:if test="count(/Keyman/Fonts/Font[@Coverage &lt;= 90 and @Coverage &gt;= 50]) > 0">
-											<div>
-                        <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_PossibleFonts']"/>
-											</div>
-											<div>
-												<table id="tableLowCover">
-                          <colgroup><col class="index" /><col class="index" /><xsl:for-each select="/Keyman/Chars/Ch"><col /></xsl:for-each></colgroup>
-													<xsl:apply-templates select="/Keyman/Fonts/Font[@Coverage &lt;= 90 and @Coverage &gt;= 50]" />
-												</table>
-											</div>
-										</xsl:if>
-									</div>
-								</xsl:when>
-								<xsl:when test="count(/Keyman/Fonts/Font[@Coverage &lt;= 90 and @Coverage &gt;= 50]) > 0">
-									<div id="fonts">
-										<div>
-                      <!--<input type="button" onclick="keyman:openinbrowser" value="View this list in your browser" />-->
-                      <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_PossibleFontsOnly1']"/>
-											<xsl:text xml:space="preserve"> </xsl:text>
-                      <b><xsl:value-of select="/Keyman/Keyboard/@Name" /></b>
-                      <xsl:text xml:space="preserve"> </xsl:text>
-                      <xsl:value-of select="$locale/string[@name='S_OSK_FontHelper_PossibleFontsOnly2']"/>
-										</div>
-										<div>
-											<table id="tableLowCover">
-                        <colgroup><col class="index" /><col class="index" /><xsl:for-each select="/Keyman/Chars/Ch"><col /></xsl:for-each></colgroup>
-												<xsl:apply-templates select="/Keyman/Fonts/Font[@Coverage &lt;= 90 and @Coverage &gt;= 50]" />
-											</table>
-										</div>
-									</div>
-								</xsl:when>
-								<xsl:otherwise>
-									<div id="outer">
-										<div id="middle">
-											<div id="inner">
-												<div id="no">
-                          <xsl:copy-of select="$locale/string[@name='S_OSK_FontHelper_NoFonts1a'][1]" />
-                          <xsl:text xml:space="preserve"> </xsl:text>
-													<b><xsl:value-of select="/Keyman/Keyboard/@Name" /></b>
-                          <xsl:copy-of select="$locale/string[@name='S_OSK_FontHelper_NoFonts1b'][1]" />
-												</div>
-											</div>
-										</div>
-									</div>
-								</xsl:otherwise>
-							</xsl:choose>
-					</xsl:when>
-					<xsl:when test="/Keyman/NoKeyboards">
-						<div id="outer">
-							<div id="middle" style="width: 100%">
-								<div id="inner-nokeyboards">
-									<img>
-										<xsl:attribute name="src">
-											<xsl:value-of select="/Keyman/templatepath"/>info.png
-										</xsl:attribute>
-									</img>
-                  <xsl:copy-of select="$locale/string[@name='S_OSK_FontHelper_NoKeyboards'][1]" />
-									
-								</div>
-							</div>
-						</div>
-					</xsl:when>
-					<xsl:otherwise>
-						<div id="outer">
-							<div id="middle">
-								<div id="inner">
-									<div id="no"><xsl:copy-of select="$locale/string[@name='S_OSK_FontHelper_ChooseKeyboard'][1]" /></div>
-								</div>
-							</div>
-						</div>
-					</xsl:otherwise>
-				</xsl:choose>
-
-			</body>
-			
-		</html>
-	</xsl:template>
-
-	<xsl:template match="Font">
-		<tr>
-      <xsl:attribute name="class">font_<xsl:value-of select="@Index"/></xsl:attribute>
-			<td class="font">
-				<xsl:value-of select="@Name" />
-			</td>
-			<td class="coverage">
-				<xsl:value-of select="@Coverage" />%
-			</td>
-
-      <xsl:variable name="ExcludedChars" select="ExcludedChars" />
-      <xsl:for-each select="/Keyman/Chars/Ch">
-        <td>
-          <!--<xsl:attribute name="onclick">javascript:location.href='keyman:insertchars?chars=x<xsl:value-of select="normalize-space(@CharCode)"/>';</xsl:attribute>-->
-          <xsl:attribute name="class">char <xsl:if test="$ExcludedChars/Ch[@CharCode = current()/@CharCode]">excluded</xsl:if></xsl:attribute>
-          <xsl:attribute name="title">U+<xsl:value-of select="normalize-space(@CharCode)"/></xsl:attribute>
-          <xsl:value-of select="normalize-space(.)"/>
-        </td>
-      </xsl:for-each>
-		</tr>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/globe.png b/oem/firstvoices/windows/src/xml/globe.png
new file mode 100644
index 0000000000..ceb2d60db1
Binary files /dev/null and b/oem/firstvoices/windows/src/xml/globe.png differ
diff --git a/oem/firstvoices/windows/src/xml/help.xsl b/oem/firstvoices/windows/src/xml/help.xsl
index dbd20a37f9..16a1865438 100644
--- a/oem/firstvoices/windows/src/xml/help.xsl
+++ b/oem/firstvoices/windows/src/xml/help.xsl
@@ -11,11 +11,12 @@
 		<html>
 			<head>
         <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-        <meta http-equiv="x-ua-compatible" content="ie=edge" />
+        <script src="/app/sentry.bundle.min.js"></script>
+        <script src="/app/sentry.init.js"></script>
         <title><xsl:value-of select="$locale/string[@name='S_HelpTitle']" /></title>
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>config.css</xsl:attribute></link>
+        <link rel="stylesheet" type="text/css" href="/app/config.css" />
 				<style type="text/css">
-					* { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; font-size: 13.3px; }
+					* { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI"; font-size: 13.3px; }
 
 					body { padding: 0px; margin: 0px; overflow: hidden;
 					width: <xsl:value-of select="$dialoginfo_help/@Width" />px;
@@ -27,7 +28,7 @@
 					width: 100%;
 					height: 100%;
 					}
-					
+
 					#size { position: absolute; left: 0; top: 0;
 						width: <xsl:value-of select="$dialoginfo_help/@Width" />px;
 						height: <xsl:value-of select="$dialoginfo_help/@Height" />px;
@@ -117,7 +118,7 @@
           float: right;
           padding: 10px;
           }
-          
+
           #help {
             margin: 60px 0 0 0;
           }
@@ -148,10 +149,7 @@
 				<div id="container">
           <div id="captionBox"><div id="c1"></div><div id="c2"></div><div id="c3"></div></div>
 					<div id="header">
-						<img id="icon" alt="Help">
-							<xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>48.png</xsl:attribute>
-						</img>
-
+						<img id="icon" alt="Help" src="/app/48.png" />
 						<div id="title">
 							<xsl:value-of select="$locale/string[@name='S_HelpTitle']" />
 						</div>
@@ -173,7 +171,7 @@
 							</a>
 						</div>
 					</div>
-					
+
 					<div id="footer">
 						<div id="buttons">
                 <xsl:call-template name="button">
@@ -182,10 +180,10 @@
                 </xsl:call-template>
 						</div>
 					</div>
-				</div>							 
+				</div>
 			</body>
 
 		</html>
 	</xsl:template>
-	
+
 </xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/hint.xsl b/oem/firstvoices/windows/src/xml/hint.xsl
index 65f0a937fb..50af7a74ac 100644
--- a/oem/firstvoices/windows/src/xml/hint.xsl
+++ b/oem/firstvoices/windows/src/xml/hint.xsl
@@ -13,13 +13,14 @@
 		<html>
 			<head>
         <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-        <meta http-equiv="x-ua-compatible" content="ie=edge" />
+        <script src="/app/sentry.bundle.min.js"></script>
+        <script src="/app/sentry.init.js"></script>
 				<title><xsl:value-of select="$locale/string[@name=$HintTitle]" /></title>
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>config.css</xsl:attribute></link>
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>hint.css</xsl:attribute></link>
+        <link rel="stylesheet" type="text/css" href="/app/config.css" />
+        <link rel="stylesheet" type="text/css" href="/app/hint.css" />
 				<style type="text/css">
-					* { 
-            font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />;
+					* {
+            font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI";
           }
 					#container {
   					width: <xsl:value-of select="$dialoginfo_hint/@Width" />px;
@@ -52,12 +53,7 @@
           <div id="captionBox"><div id="c1"></div><div id="c2"></div><div id="c3"></div></div>
 
 					<div id="header">
-						<img id="icon" src="hints.png" alt="Hint">
-							<xsl:attribute name="src">
-								<xsl:value-of select="/Keyman/templatepath"/>48.png
-							</xsl:attribute>
-						</img>
-
+						<img id="icon" alt="Hint" src="/app/48.png" />
 						<div id="title">
 							<xsl:value-of select="$locale/string[@name=$HintTitle]" />
 						</div>
@@ -66,10 +62,10 @@
 					<div id="hint">
 						<xsl:apply-templates select="/Keyman/Hint" />
 					</div>
-					
+
 					<div id="footer">
 						<div id="checkbox">
-							<input type="checkbox" onclick='javascript:if(this.checked) location.href="keyman:dontshowhint"; else location.href="keyman:showhint";' 
+							<input type="checkbox" onclick='javascript:if(this.checked) location.href="keyman:dontshowhint"; else location.href="keyman:showhint";'
 										 style="vertical-align: middle;" id="chkWelcome" />&#160;<label for="chkWelcome"><xsl:value-of select="$locale/string[@name='S_HintDialog_DontShowHintAgain']"/></label>
 						</div>
 
@@ -89,7 +85,7 @@
 							</xsl:if>
 						</div>
 					</div>
-				</div>							 
+				</div>
 			</body>
 
 		</html>
@@ -101,15 +97,11 @@
 
 <!--
   Example of how to do a custom hint
-	
+
 	<xsl:template match="Hint[@ID='KH_EXITPRODUCT']">
-		<img id="exiticon" alt="icon">
-			<xsl:attribute name="src">
-				<xsl:value-of select="/Keyman/templatepath"/>keyman_48x48.png
-			</xsl:attribute>
-		</img>
+		<img id="exiticon" alt="icon" src="/app/keyman_48x48.png" />
 		<xsl:value-of select="$locale/string[@name=$Hint]" />
 	</xsl:template>
 -->
-	
+
 </xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/installkeyboard.css b/oem/firstvoices/windows/src/xml/installkeyboard.css
index 1b3398bd82..fbac5ca7c5 100644
--- a/oem/firstvoices/windows/src/xml/installkeyboard.css
+++ b/oem/firstvoices/windows/src/xml/installkeyboard.css
@@ -1,4 +1,4 @@
-html, body { 
+html, body {
   overflow: hidden;
 }
 
@@ -6,31 +6,31 @@ div {
   position: absolute;
 }
 
-#background { 
-  background: #79C3DA; z-index: 1; left: 0; top: 0; 
+#background {
+  background: #79C3DA; z-index: 1; left: 0; top: 0;
 }
 
-#foreground { 
-  z-index: 2; left: 0; top: 0; 
+#foreground {
+  z-index: 2; left: 0; top: 0;
 }
 
 #frame {
-  top: 0; left: 0; 
-  height: 244px; 
-  padding: 10px; 
+  top: 0; left: 0;
+  height: 244px;
+  padding: 10px;
 }
 
 #image {
-  top: 0; 
-  left: 0; 
-  height: 250px; 
-  width: 140px; 
+  top: 0;
+  left: 0;
+  height: 250px;
+  width: 140px;
   padding: 5px
 }
 
 .content {
-  left: 150px; top: 0px; 
-  width: 438px; 
+  left: 150px; top: 0px;
+  width: 438px;
   padding: 4px;
   background: white;
   border-left: 2px solid #888888;
@@ -42,20 +42,20 @@ div {
 }
 
 .has_readme .content {
-  height: 226px; 
+  height: 226px;
   visibility: hidden;
 }
 
 .content_selected {
-  left: 150px; top: 0px; 
-  width: 438px; 
+  left: 150px; top: 0px;
+  width: 438px;
   padding: 4px;
   background: white;
   border-left: 2px solid #888888;
   border-top: 2px solid #888888;
   border-right: 2px solid #888888;
   overflow-y: auto;
-  height: 226px; 
+  height: 226px;
   visibility: visible
 }
 
@@ -98,7 +98,7 @@ div {
 }
 
 #footer {
-  top: 260px; 
+  top: 260px;
   left: 0;
   height: 26px;
   vertical-align: middle;
diff --git a/oem/firstvoices/windows/src/xml/installkeyboard.js b/oem/firstvoices/windows/src/xml/installkeyboard.js
index a4256cb382..8c42019647 100644
--- a/oem/firstvoices/windows/src/xml/installkeyboard.js
+++ b/oem/firstvoices/windows/src/xml/installkeyboard.js
@@ -25,7 +25,7 @@ function genkeydown(event) {
   } else {
     return true;
   }
-  event.cancelBubble = true; 
+  event.cancelBubble = true;
   event.returnValue = false;
   return false;
 }
@@ -35,7 +35,7 @@ function framekeydown() {
 }
 
 document.onkeydown = function() {
-  return genkeydown(event); 
+  return genkeydown(event);
 }
 
 function setupframehotkeys() {
@@ -47,8 +47,14 @@ function setupframehotkeys() {
 
 window.onload = function() {
   setupframehotkeys();
-  
+
   if(document.getElementById('tabs') != null) {
     tabClick(document.getElementById('tabDetails'));
   }
 }
+
+function keyboard_install(elevate) {
+  let href = elevate ? 'keyman:keyboard_installallusers?' : 'keyman:keyboard_install?';
+  let keyboards = Array.from(document.querySelectorAll('select.keyboardLanguage'));
+  location.href = href + keyboards.map((e) => e.id.substring('keyboardLanguage_'.length) + '=' + e.value).join('&');
+}
diff --git a/oem/firstvoices/windows/src/xml/installkeyboard.xsl b/oem/firstvoices/windows/src/xml/installkeyboard.xsl
index 56e5649d77..456b99ed28 100644
--- a/oem/firstvoices/windows/src/xml/installkeyboard.xsl
+++ b/oem/firstvoices/windows/src/xml/installkeyboard.xsl
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
+
   <xsl:include href="elements.xsl" />
 
   <xsl:variable name="dialoginfo_installkeyboard" select="$dialoginfo/Dialog[@Id='InstallKeyboard'][1]" />
-  
+
   <xsl:template match="/">
     <html>
       <head>
         <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
-        <meta http-equiv="x-ua-compatible" content="ie=edge" />
+        <script src="/app/sentry.bundle.min.js"></script>
+        <script src="/app/sentry.init.js"></script>
         <title><xsl:value-of select="$locale/string[@name='S_InstallKeyboard_Title']"/></title>
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>config.css</xsl:attribute></link>
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>installkeyboard.css</xsl:attribute></link>
+        <link rel="stylesheet" type="text/css" href="/app/config.css" />
+        <link rel="stylesheet" type="text/css" href="/app/installkeyboard.css" />
         <style type="text/css">
-          * { 
-            font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; 
+          * {
+            font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI";
           }
 
-          #background { 
-            width: <xsl:value-of select="$dialoginfo_installkeyboard/@Width" />px; 
+          #background {
+            width: <xsl:value-of select="$dialoginfo_installkeyboard/@Width" />px;
             height: <xsl:value-of select="$dialoginfo_installkeyboard/@Height" />px;
           }
-          #foreground { 
-            width: <xsl:value-of select="$dialoginfo_installkeyboard/@Width" />px; 
+          #foreground {
+            width: <xsl:value-of select="$dialoginfo_installkeyboard/@Width" />px;
             height: <xsl:value-of select="$dialoginfo_installkeyboard/@Height" />px;
           }
 
           #frame {
             width: <xsl:value-of select="$dialoginfo_installkeyboard/@Width - 20" />px;
           }
-         
+
           #footer {
-            width: <xsl:value-of select="$dialoginfo_installkeyboard/@Width - 16" />px; 
+            width: <xsl:value-of select="$dialoginfo_installkeyboard/@Width - 16" />px;
           }
         </style>
-        <script type="text/javascript"><xsl:attribute name='src'><xsl:value-of select="/Keyman/templatepath"/>installkeyboard.js</xsl:attribute></script>
-
+        <script src="/app/installkeyboard.js"></script>
       </head>
       <body>
         <div id="background"></div>
@@ -50,14 +50,14 @@
               <img style="height: 250px; width: 140px;">
                 <xsl:choose>
                   <xsl:when test="/Keyman/KeymanKeyboardFile">
-                    <xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>defaultkeyboard.gif</xsl:attribute>
+                    <xsl:attribute name="src">/app/defaultkeyboard.gif</xsl:attribute>
                   </xsl:when>
                   <xsl:when test="/Keyman/KeymanPackageFile/graphic">
-                    <xsl:attribute name="src"><xsl:value-of select="/Keyman/imagepath"/><xsl:value-of select="/Keyman/KeymanPackageFile/graphic" /></xsl:attribute>
+                    <xsl:attribute name="src">/data/installkeyboard/package/<xsl:value-of select="/Keyman/KeymanPackageFile/graphic" />?tag=<xsl:value-of select="/Keyman/PageTag"/></xsl:attribute>
                     <xsl:attribute name="style">height: 250px; width: 140px; border: solid 1px black</xsl:attribute>
                   </xsl:when>
                   <xsl:otherwise>
-                    <xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>defaultpackage.gif</xsl:attribute>
+                    <xsl:attribute name="src">/app/defaultpackage.gif</xsl:attribute>
                   </xsl:otherwise>
                 </xsl:choose>
               </img>
@@ -70,10 +70,10 @@
               </div>
               <div class="content" id="readme">
                 <iframe style="visibility: visible; width:446px; height:100%; padding: 0px; margins: 0px" scrolling="auto" frameborder="no" id="frameReadme">
-                  <xsl:attribute name="src"><xsl:value-of select="/Keyman/KeymanPackageFile/readme" /></xsl:attribute>
+                  <xsl:attribute name="src">/data/installkeyboard/package/<xsl:value-of select="/Keyman/KeymanPackageFile/readme" />?tag=<xsl:value-of select="/Keyman/PageTag"/></xsl:attribute>
                 </iframe>
               </div>
-            </xsl:if>              
+            </xsl:if>
             <div class="content" id="details">
               <div style="display:block;position:static;margin:0;padding:0;background:blue;overflow:hidden;">
               <table style="width: 100%;background:white;">
@@ -82,13 +82,11 @@
                     <xsl:choose>
                       <xsl:when test="//KeymanKeyboardFile/bitmap">
                         <img style="margin-right: 6px; float: left; height: 16px; width: 16px;">
-                          <xsl:attribute name="src"><xsl:value-of select="//KeymanKeyboardFile[1]/bitmap"/></xsl:attribute>
+                          <xsl:attribute name="src">/data/installkeyboard/bitmap/<xsl:value-of select="//KeymanKeyboardFile[1]/bitmap"/>?tag=<xsl:value-of select="/Keyman/PageTag"/></xsl:attribute>
                         </img>
                       </xsl:when>
                       <xsl:otherwise>
-                        <img style="margin-right: 6px; float: left; height: 16px; width: 16px;">
-                          <xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>no_icon.gif</xsl:attribute>
-                        </img>
+                        <img style="margin-right: 6px; float: left; height: 16px; width: 16px;" src="/app/no_icon.gif" />
                       </xsl:otherwise>
                     </xsl:choose>
                     <xsl:value-of select="/Keyman/KeymanKeyboardFile/name" />
@@ -106,7 +104,7 @@
 						<xsl:if test="/Keyman/canelevate">
 							<xsl:call-template name="button">
 								<xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_InstallKeyboard_Button_Install']"/></xsl:with-param>
-								<xsl:with-param name="command">keyman:keyboard_installallusers</xsl:with-param>
+								<xsl:with-param name="command">javascript:keyboard_install(true)</xsl:with-param>
 								<xsl:with-param name="width">120px</xsl:with-param>
                 <xsl:with-param name="shield">1</xsl:with-param>
 							</xsl:call-template>
@@ -115,7 +113,7 @@
               <xsl:call-template name="button">
                 <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_InstallKeyboard_Button_Install']"/></xsl:with-param>
                 <xsl:with-param name="default">1</xsl:with-param>
-                <xsl:with-param name="command">keyman:keyboard_install</xsl:with-param>
+                <xsl:with-param name="command">javascript:keyboard_install(false)</xsl:with-param>
                 <xsl:with-param name="width">70px</xsl:with-param>
               </xsl:call-template>
             </xsl:if>
@@ -129,15 +127,32 @@
       </body>
     </html>
   </xsl:template>
-  
-  <xsl:template match="/Keyman/KeymanPackageFile/KeymanPackageContentKeyboardsFile/KeymanKeyboardFile/name">
-    <xsl:value-of select="."/><br />
+
+  <xsl:template match="KeymanKeyboardLanguage">
+    <option>
+      <xsl:attribute name="value"><xsl:value-of select="bcp47code" /></xsl:attribute>
+      <xsl:if test="bcp47code = /Keyman/DefaultBCP47Tag"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if>
+      <xsl:value-of select="langname" />
+    </option>
+  </xsl:template>
+
+  <xsl:template mode="language-picker" match="/Keyman/KeymanPackageFile/KeymanPackageContentKeyboardsFile/KeymanKeyboardFile">
+    <select class="keyboardLanguage">
+      <xsl:attribute name="id">keyboardLanguage_<xsl:value-of select="id"/></xsl:attribute>
+      <xsl:apply-templates select="KeymanKeyboardLanguagesFile/KeymanKeyboardLanguage">
+        <xsl:sort select="langname" />
+      </xsl:apply-templates>
+    </select>
+  </xsl:template>
+
+  <xsl:template mode="keyboard-name" match="/Keyman/KeymanPackageFile/KeymanPackageContentKeyboardsFile/KeymanKeyboardFile">
+    <xsl:value-of select="name"/><br />
   </xsl:template>
 
   <xsl:template match="/Keyman/KeymanPackageFile/Fonts/Font/name">
     <xsl:value-of select="."/><br />
   </xsl:template>
-  
+
   <xsl:template match="/Keyman/KeymanKeyboardFile">
     <tr>
       <td class="detailheader"><xsl:value-of select="$locale/string[@name='S_Caption_Filename']"/></td>
@@ -160,7 +175,7 @@
         <td class="otherdetails"><xsl:value-of select="copyright" /></td>
       </tr>
     </xsl:if>
-    
+
     <xsl:if test="message">
       <tr>
         <td class="detailheader"><xsl:value-of select="$locale/string[@name='S_Caption_Message']"/></td>
@@ -168,27 +183,46 @@
       </tr>
     </xsl:if>
   </xsl:template>
-  
+
   <xsl:template match="/Keyman/KeymanPackageFile">
-    <tr>
-      <td class="detailheader"><xsl:value-of select="$locale/string[@name='S_Caption_Keyboards']"/></td>
-      <td class="otherdetails"><xsl:apply-templates select="KeymanPackageContentKeyboardsFile/KeymanKeyboardFile/name" /></td>
-    </tr>
-    
+    <xsl:choose>
+      <xsl:when test="count(KeymanPackageContentKeyboardsFile/KeymanKeyboardFile) = 1">
+        <tr>
+          <td class="detailheader"><xsl:value-of select="$locale/string[@name='S_Caption_Keyboard']"/></td>
+          <td class="otherdetails"><xsl:apply-templates mode="keyboard-name" select="KeymanPackageContentKeyboardsFile/KeymanKeyboardFile" /></td>
+        </tr>
+        <xsl:if test="count(KeymanPackageContentKeyboardsFile/KeymanKeyboardFile/KeymanKeyboardLanguagesFile/KeymanKeyboardLanguage) > 1">
+          <!-- This test presents the selection for keyboard language only for packages with a single keyboard and 
+               more than one language option. In future, we could consider extending it for packages with more than 
+               one keyboard, but that would take more plumbing for implementation. -->
+          <tr>
+            <td class="detailheader"><xsl:value-of select="$locale/string[@name='S_Caption_KeyboardLanguage']"/></td>
+            <td class="otherdetails"><xsl:apply-templates mode="language-picker" select="KeymanPackageContentKeyboardsFile/KeymanKeyboardFile" /></td>
+          </tr>
+        </xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <tr>
+          <td class="detailheader"><xsl:value-of select="$locale/string[@name='S_Caption_Keyboards']"/></td>
+          <td class="otherdetails"><xsl:apply-templates mode="keyboard-name" select="KeymanPackageContentKeyboardsFile/KeymanKeyboardFile" /></td>
+        </tr>
+      </xsl:otherwise>
+    </xsl:choose>
+
     <xsl:if test="Fonts/Font">
       <tr>
         <td class="detailheader"><xsl:value-of select="$locale/string[@name='S_Caption_Fonts']"/></td>
         <td class="otherdetails"><xsl:apply-templates select="Fonts/Font/name" /></td>
       </tr>
     </xsl:if>
-    
+
     <xsl:apply-templates select="detail[@name='version']"><xsl:with-param name="header"><xsl:value-of select="$locale/string[@name='S_Caption_Version']"/></xsl:with-param></xsl:apply-templates>
     <xsl:apply-templates select="detail[@name='author']"><xsl:with-param name="header"><xsl:value-of select="$locale/string[@name='S_Caption_Author']"/></xsl:with-param></xsl:apply-templates>
     <xsl:apply-templates select="detail[@name='website']"><xsl:with-param name="header"><xsl:value-of select="$locale/string[@name='S_Caption_Website']"/></xsl:with-param></xsl:apply-templates>
     <xsl:apply-templates select="detail[@name='copyright']"><xsl:with-param name="header"><xsl:value-of select="$locale/string[@name='S_Caption_Copyright']"/></xsl:with-param></xsl:apply-templates>
-    
+
   </xsl:template>
-  
+
   <xsl:template match="detail">
     <xsl:param name="header" />
     <tr>
@@ -207,7 +241,7 @@
           </xsl:otherwise>
         </xsl:choose>
       </td>
-    </tr>    
+    </tr>
   </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png b/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png
index 3b5ec042c7..60cfe5c77a 100644
Binary files a/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png and b/oem/firstvoices/windows/src/xml/keyman-desktop-for-first-voices-486x86-black.png differ
diff --git a/oem/firstvoices/windows/src/xml/keyman-desktop.png b/oem/firstvoices/windows/src/xml/keyman-desktop.png
index e344653015..d902bbd122 100644
Binary files a/oem/firstvoices/windows/src/xml/keyman-desktop.png and b/oem/firstvoices/windows/src/xml/keyman-desktop.png differ
diff --git a/oem/firstvoices/windows/src/xml/keyman.xsl b/oem/firstvoices/windows/src/xml/keyman.xsl
index 110ee2e894..e96f064191 100644
--- a/oem/firstvoices/windows/src/xml/keyman.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  
+
   <xsl:include href="elements.xsl"/>
 
   <xsl:variable name="dialoginfo_keyman" select="$dialoginfo/Dialog[@Id='Keyman']" />
-  
+
   <xsl:include href="keyman_menu.xsl"/>
 
   <xsl:include href="keyman_keyboardlist.xsl"/>
@@ -15,24 +15,29 @@
   <xsl:include href="keyman_keepintouch.xsl"/>
 
   <xsl:include href="keyman_footer.xsl"/>
-  
+
   <xsl:template match="/">
     <html xmlns="http://www.w3.org/1999/xhtml">
       <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <script src="/app/sentry.bundle.min.js"></script>
+        <script src="/app/sentry.init.js"></script>
+        <style> *{font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI";}</style>
         <title><xsl:value-of select="$locale/string[@name='S_ConfigurationTitle']"/></title>
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>config.css</xsl:attribute></link>
-        <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>menu.css</xsl:attribute></link>
-        <script type="text/javascript"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>jquery.min.js</xsl:attribute><xsl:text> </xsl:text></script>
-        <script type="text/javascript"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>config.js</xsl:attribute><xsl:text> </xsl:text></script>
-        <script type="text/javascript"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>menu.js</xsl:attribute><xsl:text> </xsl:text></script>
-        <script type="text/javascript"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>menu-frame.js</xsl:attribute><xsl:text> </xsl:text></script>
-      </head>      
-      
+        <link rel="stylesheet" type="text/css" href="/app/config.css" />
+        <link rel="stylesheet" type="text/css" href="/app/menu.css" />
+        <script type="text/javascript" src="/app/jquery.min.js"></script>
+        <script type="text/javascript" src="/app/config.js"></script>
+        <script type="text/javascript" src="/app/menu.js"></script>
+        <script type="text/javascript" src="/app/menu-frame.js"></script>
+        <script type="text/javascript" src="/app/qrcode.min.js"></script>
+      </head>
+
       <body visited="white">
-        
+
         <div style="position: absolute; left: 0; top: 0; width: 100%; height: 100%; z-index: 10">
           <div id="header-pad"></div>
+          <div id="menubackground" onmousedown="HideMenu()"></div>
           <div id="menuframe" tabindex="-1">
             <div id="state"><xsl:value-of select="/Keyman/state"/></div>
             <xsl:call-template name="menuframe" />
@@ -54,26 +59,22 @@
       </body>
     </html>
   </xsl:template>
-  
+
   <xsl:template name="header_helplinks">
     <div class="helplinks">
       <a href="keyman:help" onmouseover="this.style.cursor='hand';" >
-        <img onmouseover="this.style.cursor='hand';" style='width: 24px; height: 24px; border: none; vertical-align: middle; margin: 0 4px 0 4px;'>
-          <xsl:attribute name='src'><xsl:value-of select='/Keyman/templatepath'/>help24.png</xsl:attribute>
-        </img>
+        <img onmouseover="this.style.cursor='hand';" style='width: 24px; height: 24px; border: none; vertical-align: middle; margin: -2px 4px 2px 4px;' src="/app/help24.png" />
         <xsl:value-of select="$locale/string[@name='S_Caption_Help']" />
-      </a>
-
-            &#160; 
+      </a>&#160;
+      <img onmouseover="this.style.cursor='hand';" style='width: 24px; height: 24px; border: none; vertical-align: middle; margin: -2px 4px 2px 4px;' src="/app/globe.png" />
       <xsl:value-of select="$locale/string[@name='S_DisplayIn']" />:
-        <a id="button_uilanguage" href="#" 
-           onmousedown="ShowMenu('uilanguage','right', document.body.offsetWidth, 38); return false;" 
-           onkeydown="if(event.keyCode == 32) ShowMenu('uilanguage','right'); else return true; return false;"
-        ><xsl:value-of select="$locale/string[@name='SKUILanguageNameWithEnglish']"/></a>
-      
+      <a id="button_uilanguage" href="#"
+          onmousedown="ShowMenu('uilanguage','right', document.body.offsetWidth, 38); return false;"
+          onkeydown="if(event.keyCode == 32) ShowMenu('uilanguage','right'); else return true; return false;"
+      ><xsl:value-of select="$locale/string[@name='SKUILanguageNameWithEnglish']"/></a>
     </div>
   </xsl:template>
-  
+
   <xsl:template name="popupmenu_uilanguage">
     <div class="menu" id="menu_uilanguage">
       <xsl:for-each select="/Keyman/uilanguages/uilanguage">
@@ -84,11 +85,6 @@
         </xsl:call-template>
       </xsl:for-each>
       <div class="menubreak" ></div>
-      <xsl:call-template name="menuitem">
-        <xsl:with-param name="id">menu_uilanguage_more</xsl:with-param>
-        <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_MoreUILanguagesMenu']"/></xsl:with-param>
-        <xsl:with-param name="command">keyman:downloaduilanguages</xsl:with-param>
-      </xsl:call-template>
       <xsl:call-template name="menuitem">
         <xsl:with-param name="id">menu_uilanguage_contribute</xsl:with-param>
         <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_ContributeUILanguagesMenu']"/></xsl:with-param>
@@ -96,5 +92,4 @@
       </xsl:call-template>
     </div>
   </xsl:template>
-  
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/keyman_footer.xsl b/oem/firstvoices/windows/src/xml/keyman_footer.xsl
index 9a5ed6d721..7e940e764b 100644
--- a/oem/firstvoices/windows/src/xml/keyman_footer.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman_footer.xsl
@@ -9,28 +9,18 @@
   <xsl:template name="footerframe">
     <div id='footer-top'></div>
     <div style="float:right; padding: 2px 12px">
+      <div class='footer_instant'><xsl:value-of select="$locale/string[@name='S_Footer_ChangesImmediate']"/></div>
+    </div>
+    <div id="keyboards_control" style="float:left; display: none;">
       <xsl:call-template name="button">
-        <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_OK']"/></xsl:with-param>
-				<xsl:with-param name="default">1</xsl:with-param>
-        <xsl:with-param name="command">keyman:footer_ok</xsl:with-param>
-        <xsl:with-param name="width">70px</xsl:with-param>
+        <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_InstallKeyboard']"/></xsl:with-param>
+        <xsl:with-param name="command">keyman:keyboard_install</xsl:with-param>
       </xsl:call-template>
       <xsl:call-template name="button">
-        <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_Cancel']"/></xsl:with-param>
-        <xsl:with-param name="command">keyman:footer_cancel</xsl:with-param>
-        <xsl:with-param name="width">70px</xsl:with-param>
+        <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_DownloadKeyboard']"/></xsl:with-param>
+        <xsl:with-param name="command">keyman:keyboard_download</xsl:with-param>
       </xsl:call-template>
     </div>
-      <div id="keyboards_control" style="float: left; display: none;">
-        <xsl:call-template name="button">
-          <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_InstallKeyboard']"/></xsl:with-param>
-          <xsl:with-param name="command">keyman:keyboard_install</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="button">
-          <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_DownloadKeyboard']"/></xsl:with-param>
-          <xsl:with-param name="command">keyman:keyboard_download</xsl:with-param>
-        </xsl:call-template>
-      </div>
   </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/oem/firstvoices/windows/src/xml/keyman_hotkeys.xsl b/oem/firstvoices/windows/src/xml/keyman_hotkeys.xsl
index 5ec6b73b3a..423b92a1b8 100644
--- a/oem/firstvoices/windows/src/xml/keyman_hotkeys.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman_hotkeys.xsl
@@ -2,23 +2,23 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  
+
 
   <xsl:template name="content_hotkeys_style">
     /* Hotkey Styles */
     #hotkeys {
-      position: absolute; 
-      left: 0; 
-      top: 0; 
-      width: 100%; 
+      position: absolute;
+      left: 0;
+      top: 0;
+      width: 100%;
       font-size: 13.3px;
       xheight: 100%;
       height: expression( document.getElementById('subcontent_hotkeys').offsetHeight );
-      overflow-y: auto; 
+      overflow-y: auto;
       padding: 6px 4px 4px 4px;
       border-bottom: 2px solid white;
     }
-    
+
     .hotkey_title
     {
       background: #e0e5ef;
@@ -28,59 +28,52 @@
       padding: 4px 8px;
     }
   </xsl:template>
-  
+
   <xsl:template name="content_hotkeys">
     <div class="header">
   		<xsl:call-template name="header_helplinks" />
       <xsl:value-of select="$locale/string[@name='S_Hotkeys']"/>
     </div>
-    
+
     <div class="content" id="subcontent_hotkeys">
         <div class="hotkey_title"><xsl:value-of select="$locale/string[@name='S_Hotkey_Control_Title']"/></div>
         <xsl:for-each select="/Keyman/Hotkeys/Hotkey">
           <xsl:sort select="translate(Target,'012345678','013845672')"/><!--I2302-->
           <xsl:call-template name="hotkey_control" />
         </xsl:for-each>
-        
+
         <div class="hotkey_title"><xsl:value-of select="$locale/string[@name='S_Hotkey_Keyboard_Title']"/></div>
         <xsl:for-each select="//KeymanLanguage">
 					<xsl:call-template name="hotkey_language" />
 				</xsl:for-each>
     </div>
-    
+
   </xsl:template>
-  
+
   <xsl:template name="hotkey_language">
     <div class="list_item" tabindex="1" tagType="listitem">
       <xsl:attribute name="id">list_lang_<xsl:value-of select="position()-1"/></xsl:attribute>
       <xsl:attribute name="onkeydown">return list_keydown(event,'lang_<xsl:value-of select="position()-1"/>');</xsl:attribute>
       <xsl:attribute name="onmousedown">document.getElementById('list_lang_<xsl:value-of select="position()-1"/>').focus(); return true;</xsl:attribute>
-      
+
       <div style="float:left; padding: 1px 0px 1px 3px;">
-      
+
       <div class="list_icon">
         <img style="width: 16px; height:16px;">
           <xsl:choose>
-            <xsl:when test="//KeymanKeyboardInstalled[id=current()/keymankeyboardid]/bitmap">          
-              <xsl:attribute name="src">
-                <xsl:value-of select="/Keyman/ImagePath"/>
-                <xsl:value-of select="//KeymanKeyboardInstalled[id=current()/keymankeyboardid]/bitmap"/>
-              </xsl:attribute>
+            <xsl:when test="//KeymanKeyboardInstalled[id=current()/keymankeyboardid]/bitmap">
+              <xsl:attribute name="src">/data/keyman/bitmap/<xsl:value-of select="//KeymanKeyboardInstalled[id=current()/keymankeyboardid]/bitmap"/>?tag=<xsl:value-of select="/Keyman/PageTag" /></xsl:attribute>
             </xsl:when>
-            <xsl:when test="//KeymanKeyboardInstalled[id=current()/keymankeyboardid]">          
-              <xsl:attribute name="src">
-                <xsl:value-of select="/Keyman/templatepath"/>no_icon.png
-              </xsl:attribute>
+            <xsl:when test="//KeymanKeyboardInstalled[id=current()/keymankeyboardid]">
+              <xsl:attribute name="src">/app/no_icon.png</xsl:attribute>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:attribute name="src">
-                <xsl:value-of select="/Keyman/templatepath"/>windows_keyboard.png
-              </xsl:attribute>
+              <xsl:attribute name="src">/app/windows_keyboard.png</xsl:attribute>
             </xsl:otherwise>
           </xsl:choose>
         </img>
       </div>
-      
+
 		  <xsl:value-of select="$locale/string[@name='S_Hotkey_Language_Prefix']"/> <xsl:value-of select="localename"/> &#x2014; <xsl:value-of select="layoutname"/>
       <xsl:value-of select="$locale/string[@name='S_Hotkey_Language_Suffix']"/>
       </div>
@@ -93,7 +86,7 @@
               <xsl:when test="hotkey"><xsl:value-of select="hotkey"/></xsl:when>
               <xsl:otherwise><xsl:value-of select="$locale/string[@name='S_Hotkey_None']"/></xsl:otherwise>
             </xsl:choose>
-          </a> 
+          </a>
         </div>
       </div>
       <br class="clear" />
@@ -102,9 +95,9 @@
 
   <xsl:template name="hotkey_control">
     <div class="list_item" tabindex="1" tagType="listitem">
-      <xsl:attribute name="id">list_hotkey_<xsl:value-of select="index"/></xsl:attribute>
-      <xsl:attribute name="onkeydown">return list_keydown(event,'hotkey_<xsl:value-of select="index"/>');</xsl:attribute>
-      <xsl:attribute name="onmousedown">document.getElementById('list_hotkey_<xsl:value-of select="index"/>').focus(); return true;</xsl:attribute>
+      <xsl:attribute name="id">list_hotkey_<xsl:value-of select="Target"/></xsl:attribute>
+      <xsl:attribute name="onkeydown">return list_keydown(event,'hotkey_<xsl:value-of select="Target"/>');</xsl:attribute>
+      <xsl:attribute name="onmousedown">document.getElementById('list_hotkey_<xsl:value-of select="Target"/>').focus(); return true;</xsl:attribute>
 
       <div style="float:left; padding: 1px 0px 1px 3px;">
         <xsl:choose>
@@ -112,7 +105,7 @@
           <xsl:when test="Target='1'"><xsl:value-of select="$locale/string[@name='S_Hotkey_OpenKeyboardMenu']"/></xsl:when>
           <xsl:when test="Target='2'"><xsl:value-of select="$locale/string[@name='S_Hotkey_ShowOnScreenKeyboard']"/></xsl:when>
           <xsl:when test="Target='3'"><xsl:value-of select="$locale/string[@name='S_Hotkey_OpenConfiguration']"/></xsl:when>
-          <xsl:when test="Target='4'"><xsl:value-of select="$locale/string[@name='S_Hotkey_ShowKeyboardUsage']"/></xsl:when>
+          
           <xsl:when test="Target='5'"><xsl:value-of select="$locale/string[@name='S_Hotkey_ShowFontHelper']"/></xsl:when>
           <xsl:when test="Target='6'"><xsl:value-of select="$locale/string[@name='S_Hotkey_ShowCharacterMap']"/></xsl:when>
           <xsl:when test="Target='7'"><xsl:value-of select="$locale/string[@name='S_Hotkey_OpenTextEditor']"/></xsl:when>
@@ -122,13 +115,13 @@
       <div style="float:right">
         <div style="float: left; padding: 1px 3px 1px 0px; color: blue;">
           <a class="hotkey" tabindex="-1">
-            <xsl:attribute name="href">keyman:hotkey_set?index=hotkey_<xsl:value-of select="index"/></xsl:attribute>
+            <xsl:attribute name="href">keyman:hotkey_set?index=hotkey_<xsl:value-of select="Target"/></xsl:attribute>
             <xsl:attribute name="onmouseover">this.style.cursor='hand';</xsl:attribute>
             <xsl:choose>
               <xsl:when test="string-length(Value) > 0"><xsl:value-of select="Value"/></xsl:when>
               <xsl:otherwise><xsl:value-of select="$locale/string[@name='S_Hotkey_None']"/></xsl:otherwise>
             </xsl:choose>
-          </a> 
+          </a>
         </div>
       </div>
       <br class="clear" />
diff --git a/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl b/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl
index 641faec994..4f1eabb39d 100644
--- a/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman_keepintouch.xsl
@@ -5,7 +5,7 @@
   
     <script>
       window['menuframe_activate_keepintouch'] = function() {
-        document.getElementById('keepintouch_frame').src = 'https://keyman.com/go/desktop/10.0/keep-in-touch?embed=1';
+        document.getElementById('keepintouch_frame').src = '<xsl:value-of select='/Keyman/keyman-com' />/go/windows/<xsl:value-of select="/Keyman/version-info/@versionRelease" />/keep-in-touch?embed=1';
       }
     </script>
   
diff --git a/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl b/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl
index bd93b63c0b..18378bc390 100644
--- a/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman_keyboardlist.xsl
@@ -2,7 +2,7 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  
+
   <xsl:template name="content_keyboards">
     <xsl:text disable-output-escaping="yes"><![CDATA[
       <script type="text/javascript">
@@ -13,7 +13,7 @@
   		<xsl:call-template name="header_helplinks" />
       <xsl:value-of select="$locale/string[@name='S_Keyboards']"/>
     </div>
-    
+
     <div class="content" id="subcontent_keyboards">
       <div class="contentBox" id='keyboards-content-box'>
         <xsl:choose>
@@ -30,16 +30,14 @@
                   <xsl:otherwise><xsl:call-template name="keyboard" /></xsl:otherwise>
                 </xsl:choose>
               </xsl:for-each>
-              
+
               <xsl:for-each select="Keyman/KeymanPackageInstalled[count(./KeymanPackageContentKeyboardsInstalled/KeymanKeyboardInstalled)!=1]">
                 <xsl:sort select="name" />
-                
+
                   <div class="item">
                     <xsl:attribute name="id">package_<xsl:value-of select="id" /></xsl:attribute>
-                      
-                    <img class="list_icon">
-                      <xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>package.gif</xsl:attribute>
-                    </img>
+
+                    <img class="list_icon" src="/app/package.gif" />
                     <div class="packagetitle">
                       <xsl:choose>
                         <xsl:when test="name"><xsl:value-of select="name"/></xsl:when>
@@ -58,11 +56,7 @@
           <xsl:otherwise>
             <div id="keyboards" class='info'>
               <div>
-                <img>
-                  <xsl:attribute name="src">
-                    <xsl:value-of select="/Keyman/templatepath"/>info.png
-                  </xsl:attribute>
-                </img>
+                <img src="/app/info.png" />
                 <xsl:value-of select="$locale/string[@name='S_Keyboards_NoKeyboardsInstalled']"/>
               </div>
             </div>
@@ -95,7 +89,7 @@
       <xsl:attribute name="onfocus">return list_focus(event,'keyboard_<xsl:value-of select="$id"/>');</xsl:attribute>
 			<xsl:attribute name="onblur">return list_blur(event,'keyboard_<xsl:value-of select="$id"/>');</xsl:attribute>
 			<xsl:attribute name="oncontextmenu">event.cancelBubble=true;event.returnValue=false;</xsl:attribute>
-      
+
       <xsl:attribute name="style">left:0;top:0;width:99%</xsl:attribute>
       <div>
         <xsl:attribute name="onmousedown">return list_detail(event,'keyboard_<xsl:value-of select="$id"/>');</xsl:attribute>
@@ -113,17 +107,8 @@
           <div class="list_icon">
             <img style="width: 16px; height:16px;">
               <xsl:choose>
-                <xsl:when test="bitmap">          
-                  <xsl:attribute name="src">
-                    <xsl:value-of select="/Keyman/ImagePath"/>
-                    <xsl:value-of select="bitmap"/>
-                  </xsl:attribute>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:attribute name="src">
-                    <xsl:value-of select="/Keyman/templatepath"/>no_icon.gif
-                  </xsl:attribute>
-                </xsl:otherwise>
+                <xsl:when test="bitmap"><xsl:attribute name="src">/data/keyman/bitmap/<xsl:value-of select="bitmap"/>?tag=<xsl:value-of select="/Keyman/PageTag" /></xsl:attribute></xsl:when>
+                <xsl:otherwise><xsl:attribute name="src">/app/no_icon.gif</xsl:attribute></xsl:otherwise>
               </xsl:choose>
             </img>
           </div>
@@ -138,11 +123,11 @@
           </div>
         </div>
 
-       
-        <div class="list_expand">
+
+        <!--<div class="list_expand">
           <xsl:attribute name="id">list_expand_keyboard_<xsl:value-of select="id"/></xsl:attribute>
-        </div>
-       
+        </div>-->
+
         <xsl:choose>
           <xsl:when test="//KeymanPackageContentKeyboardsInstalled/KeymanKeyboardInstalled[id=current()/id]">
             <!--<div class="list_close">
@@ -208,14 +193,14 @@
                           <td>
                             <span><xsl:value-of select="../../name"/></span>
                           </td>
-                        </tr>    
+                        </tr>
                       </xsl:if>
                       <xsl:if test="//KeymanPackageContentKeyboardsInstalled/KeymanKeyboardInstalled[id=current()/id]">
                         <tr><td class="table_header"><xsl:value-of select="$locale/string[@name='S_Caption_Version']"/></td>
                           <td>
                             <span><xsl:value-of select="../../detail[@name='version']"/></span>
                           </td>
-                        </tr>    
+                        </tr>
                       </xsl:if>
                       <xsl:if test="//KeymanPackageContentKeyboardsInstalled/KeymanKeyboardInstalled[id=current()/id]/../../Fonts"><!-- I2216 -->
                         <tr>
@@ -275,6 +260,45 @@
                             <xsl:value-of select="copyright"/>
                         </td></tr>
                       </xsl:if>
+
+                      <!--<xsl:if test="$singlekeyboardpackage = '1' or //KeymanPackageContentKeyboardsInstalled/KeymanKeyboardInstalled[id=current()/id]">
+                        <tr>
+                          <td class="table_header" colspan="2">
+
+                            <xsl:call-template name="button">
+                              <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Keyboard_Share']"/></xsl:with-param>
+                              <xsl:with-param name="command">javascript:showKeyboardLink('<xsl:value-of select="../../id" />')</xsl:with-param>
+                            </xsl:call-template>
+
+                            <div class='qrcode'>
+                              <xsl:attribute name='id'>qrcode-<xsl:value-of select="../../id" /></xsl:attribute>
+                              <div class='qrcode-back'>
+                                <xsl:attribute name="onclick">return hideKeyboardLink('<xsl:value-of select="../../id" />')</xsl:attribute>
+                              </div>
+                              <div class='qrcode-popup'>
+                                <div>
+                                  <xsl:attribute name='id'>qrcode-img-<xsl:value-of select="../../id" /></xsl:attribute>
+                                </div>
+                                <div class='qrcode-caption'>
+                                  <xsl:value-of select="$locale/string[@name='S_Keyboard_Share_QRCode']"/>
+                                  <a>
+                                    <xsl:attribute name="href">keyman:link?url=<xsl:value-of select="/Keyman/keyman-com" />/go/keyboard/<xsl:value-of select="../../id" />/share</xsl:attribute>
+                                    <xsl:value-of select="$locale/string[@name='S_Keyboard_Share_Link']"/>
+                                  </a>
+                                  <xsl:value-of select="$locale/string[@name='S_Keyboard_Share_LinkSuffix']"/>
+                                </div>
+                                <script>new QRCode(document.getElementById("qrcode-img-<xsl:value-of select="../../id"/>"), {
+                                    text: '<xsl:value-of select="/Keyman/keyman-com" />/go/keyboard/<xsl:value-of select="../../id"/>/share',
+                                    width: 256,
+                                    height: 256
+                                  });
+                                </script>
+                              </div>
+                            </div>
+                          </td>
+                        </tr>
+                      </xsl:if>-->
+
                     </table>
                   </div>
                   <div style="clear:both">&#160;</div>
@@ -284,21 +308,20 @@
           </table>
         </div>
       </div>
-    
+
   </xsl:template>
 
   <xsl:template match="KeymanKeyboardLanguageInstalled">
     <div class='keyboard-language'>
       <!--<a>
-        <xsl:attribute name="href">keyman:keyboardlanguage_uninstall?id=<xsl:value-of select='../../id'/>&amp;index=<xsl:value-of select="position()-1"/></xsl:attribute>
-        <img>
+        <xsl:attribute name="href">keyman:keyboardlanguage_uninstall?id=<xsl:value-of select='../../id'/>&amp;bcp47code=<xsl:value-of select="bcp47code"/></xsl:attribute>
+        <img src="/app/cross.png">
           <xsl:attribute name="title"><xsl:value-of select="$locale/string[@name='S_Languages_Uninstall']"/></xsl:attribute>
-          <xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>cross.png</xsl:attribute>
         </img>
       </a>-->
       <span class="language-icon"><xsl:value-of select="substring(bcp47code, 1, 2)" /></span>
-      <span><xsl:value-of select="langname" /></span>
+      <span><xsl:value-of select="langname" /><!-- (<xsl:value-of select="bcp47code" />)--></span>
     </div>
   </xsl:template>
-  
+
   </xsl:stylesheet>
\ No newline at end of file
diff --git a/oem/firstvoices/windows/src/xml/keyman_menu.xsl b/oem/firstvoices/windows/src/xml/keyman_menu.xsl
index e5d9f3acec..b5adc5de7c 100644
--- a/oem/firstvoices/windows/src/xml/keyman_menu.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman_menu.xsl
@@ -2,14 +2,14 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  
+
   <xsl:template name="menuframe">
     <script type="text/javascript">
-          menuframe_add('<xsl:value-of select="/Keyman/templatepath"/>', 'keyboardlist', '<xsl:value-of select="$locale/string[@name='S_Keyboards']"/>', '<xsl:value-of select="$locale/string[@name='S_Keyboards_AccessChar']"/>');
-          menuframe_add('<xsl:value-of select="/Keyman/templatepath"/>', 'options', '<xsl:value-of select="$locale/string[@name='S_Options']"/>', '<xsl:value-of select="$locale/string[@name='S_Options_AccessChar']"/>');
-          menuframe_add('<xsl:value-of select="/Keyman/templatepath"/>', 'hotkeys', '<xsl:value-of select="$locale/string[@name='S_Hotkeys']"/>', '<xsl:value-of select="$locale/string[@name='S_Hotkeys_AccessChar']"/>');
-          menuframe_add('<xsl:value-of select="/Keyman/templatepath"/>', 'support', '<xsl:value-of select="$locale/string[@name='S_Support']"/>', '<xsl:value-of select="$locale/string[@name='S_Support_AccessChar']"/>');
-          //menuframe_add('<xsl:value-of select="/Keyman/templatepath"/>', 'keepintouch', '<xsl:value-of select="$locale/string[@name='S_KeepInTouch']"/>', '<xsl:value-of select="$locale/string[@name='S_KeepInTouch_AccessChar']"/>');
+          menuframe_add('/app/', 'keyboardlist', '<xsl:value-of select="$locale/string[@name='S_Keyboards']"/>', '<xsl:value-of select="$locale/string[@name='S_Keyboards_AccessChar']"/>');
+          menuframe_add('/app/', 'options', '<xsl:value-of select="$locale/string[@name='S_Options']"/>', '<xsl:value-of select="$locale/string[@name='S_Options_AccessChar']"/>');
+          menuframe_add('/app/', 'hotkeys', '<xsl:value-of select="$locale/string[@name='S_Hotkeys']"/>', '<xsl:value-of select="$locale/string[@name='S_Hotkeys_AccessChar']"/>');
+          menuframe_add('/app/', 'support', '<xsl:value-of select="$locale/string[@name='S_Support']"/>', '<xsl:value-of select="$locale/string[@name='S_Support_AccessChar']"/>');
+          //menuframe_add('/app/', 'keepintouch', '<xsl:value-of select="$locale/string[@name='S_KeepInTouch']"/>', '<xsl:value-of select="$locale/string[@name='S_KeepInTouch_AccessChar']"/>');
     </script>
     <span class="menuframe" id="menuframe_footer"><xsl:text></xsl:text></span>
   </xsl:template>
diff --git a/oem/firstvoices/windows/src/xml/keyman_options.xsl b/oem/firstvoices/windows/src/xml/keyman_options.xsl
index 363be1664d..65acc0c817 100644
--- a/oem/firstvoices/windows/src/xml/keyman_options.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman_options.xsl
@@ -14,7 +14,7 @@
 					<xsl:sort select="sort" />
           <div class="options_list_header"><xsl:value-of select="$locale/string[@name=current()/name]"/></div>
           <xsl:for-each select="//KeymanOption[group=current()/name]">
-            <xsl:if test="optiontype = 1">
+            <xsl:if test="optiontype = 1 and id != 'koAutoSwitchOSKPages'">
               <xsl:call-template name="option" />
             </xsl:if>
           </xsl:for-each>
@@ -29,7 +29,13 @@
             <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_ProxyConfig']"/></xsl:with-param>
             <xsl:with-param name="command">keyman:support_proxyconfig</xsl:with-param>
           </xsl:call-template>
-      
+
+          <!--<xsl:call-template name="button">
+            <xsl:with-param name="shield">1</xsl:with-param>
+            <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_SettingsManager']"/></xsl:with-param>
+            <xsl:with-param name="command">keyman:options_settingsmanager</xsl:with-param>
+          </xsl:call-template>-->
+
           <xsl:call-template name="button">
             <xsl:with-param name="shield">1</xsl:with-param>
             <xsl:with-param name="caption"><xsl:value-of select="$locale/string[@name='S_Button_BaseKeyboard']"/></xsl:with-param>
@@ -73,13 +79,13 @@
         <div >
           <xsl:choose>
             <xsl:when test="not(enabled)">
-              <xsl:attribute name="style">vertical-align: middle; display: inline; margin-left: 3px; color: #808080</xsl:attribute>
+              <xsl:attribute name="style">display: inline; margin-left: 3px; color: #808080</xsl:attribute>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:attribute name="style">vertical-align: middle; display: inline; margin-left: 3px;</xsl:attribute>
+              <xsl:attribute name="style">display: inline; margin-left: 3px; </xsl:attribute>
             </xsl:otherwise>
           </xsl:choose>
-					<xsl:value-of select="$locale/string[@name=current()/id]"/>
+			  <xsl:value-of select="$locale/string[@name=current()/id]"/>
         </div>
       </div>
 
diff --git a/oem/firstvoices/windows/src/xml/keyman_support.xsl b/oem/firstvoices/windows/src/xml/keyman_support.xsl
index 5c489746fe..dfd8c8445b 100644
--- a/oem/firstvoices/windows/src/xml/keyman_support.xsl
+++ b/oem/firstvoices/windows/src/xml/keyman_support.xsl
@@ -2,28 +2,23 @@
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  
-  
+
+
   <xsl:template name="content_support">
     <div class="header">
       <xsl:call-template name="header_helplinks" />
       <xsl:value-of select="$locale/string[@name='S_Support']"/>
     </div>
-        
     <div id="subcontent_support" class="content">
       <div id="support_content">
         <div class="support_title">
-          <img>
-            <xsl:attribute name="src">
-              <xsl:value-of select="/Keyman/templatepath"/>keyman-desktop.png
-            </xsl:attribute>
-          </img>
+          <img src="/app/keyman-desktop.png" />
         </div>
-        
+
         <div class="support_edition">
-          <xsl:value-of select="$locale/string[@name='S_Support_Version']"/>&#160;<xsl:value-of select="/Keyman/support/version" /><br />
+          <xsl:value-of select="$locale/string[@name='S_Support_Version']"/>&#160;<xsl:value-of select="/Keyman/version-info/@versionWithTag" /><br />
         </div>
-        
+
         <div class="support_contact">
           <p><xsl:value-of select="$locale/string[@name='S_Support_ContactInstructions_Free']"/></p>
           <xsl:call-template name="button">
@@ -39,7 +34,7 @@
         <div class="support_sil">
           <xsl:value-of select="$locale/string[@name='S_Support_CreatedBySIL']"/>
         </div>
-        
+
         <div class="support_copyright">
           <xsl:value-of select="$locale/string[@name='S_Support_Copyright']"/>
         </div>
@@ -47,15 +42,16 @@
         <div class="support_links">
           <h2><xsl:value-of select="$locale/string[@name='S_Support_UsefulLinks']"/></h2>
           <ul>
-            <li><a href="https://www.firstvoices.com/">www.firstvoices.com</a></li>
-            <li><a href="https://www.keyman.com/">www.keyman.com</a></li>
+            <li><a href="keyman:link?url=https://www.firstvoices.com/">www.firstvoices.com</a></li>
+            <li><a><xsl:attribute name="href">keyman:link?url=<xsl:value-of select="/Keyman/keyman-com"/>/</xsl:attribute>keyman.com</a></li>
             <li><a href="keyman:support_diagnostics"><xsl:value-of select="$locale/string[@name='S_Menu_Diagnostics_Diagnostics']"/></a></li>
             <li><a href="keyman:support_updatecheck"><xsl:value-of select="$locale/string[@name='S_Button_CheckForUpdates']"/></a></li>
-            <li><a href="keyman:link?url=https://keyman.com/go/desktop/10.0/support"><xsl:value-of select="$locale/string[@name='S_Button_OnlineSupport']"/></a></li>
+            <li><a>
+              <xsl:attribute name="href">keyman:link?url=<xsl:value-of select="/Keyman/keyman-com" />/go/<xsl:value-of select="/Keyman/version-info/@versionRelease" />/support</xsl:attribute
+              ><xsl:value-of select="$locale/string[@name='S_Button_OnlineSupport']"/></a></li>
           </ul>
         </div>
       </div>
     </div>
   </xsl:template>
-	
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/locale.xml b/oem/firstvoices/windows/src/xml/locale.xml
deleted file mode 100644
index 0d1c4f81a6..0000000000
--- a/oem/firstvoices/windows/src/xml/locale.xml
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE Locale [
-
-<!ENTITY ProductName "FirstVoices Keyboards">
-<!ENTITY Name "&ProductName;">
-<!ENTITY Name_CNV "&ProductName;">
-<!ENTITY Name_CN "&ProductName;">
-
-]>
-
-<Locale>
-  
-<!--
-locale.dtd: Contains all localizable strings from Keyman Configuration XML files.
-
-Create a user interface translation for Keyman for Windows at https://translate.keyman.com/
--->
-
-<String Group="System" Type="PlainText" Id="S_LocaleAuthors" Version="7.1.266.0" Description="Name(s) of people who created this translation - i.e. your name">Keyman</String>
-  
-<String Group='_Font' Type="PlainText" Id="SK_UIFontName" Version="7.0.230.0" Description="The standard font">Tahoma</String>
-<String Group='_Font' Type="PlainText" Id="SK_UIFontSize" Version="7.0.230.0" Description="The standard font size">8</String>
-
-<!-- BETA ONLY ENTITIES -->
-
-<String Group="System" Type="PlainText" Id="S_BETA" Version="7.0.230.0" Description="Set this text to 'BETA' for beta versions of Keyman, and empty otherwise"></String>
-
-<!-- Product Name -->
-
-<String Group="Product" Type="PlainText" Id="S_ShortProductName" Version="7.0.230.0" Description="Company, product and version name">&Name_CNV;</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- General Strings                   -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="General Strings" Type="PlainText" Id="S_Yes" Version="7.0.230.0" Description="Yes term">Yes</String>
-<String Group="General Strings" Type="PlainText" Id="S_No" Version="7.0.230.0" Description="No term">No</String>
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKButtonYes" Version="7.0.230.0" Description="Yes button in message boxes">&amp;Yes</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKButtonNo"  Version="7.0.230.0" Description="No button in message boxes" >&amp;No</String>
-
-<String Group="General Strings" Type="PlainText" Id="S_Button_OK" Version="7.0.230.0" Description="Ok button term">OK</String>
-<String Group="General Strings" Type="PlainText" Id="S_Button_Cancel"  Version="7.0.230.0" Description="Cancel button term">Cancel</String>
-<String Group="General Strings" Type="PlainText" Id="S_Button_Close" Version="7.0.230.0" Description="Close button term">Close</String>
-<String Group="General Strings" Type="PlainText" Id="S_Button_Apply" Version="8.0.314.0" Description="Apply button term">Apply</String>
-<String Group="General Strings" Type="PlainText" Id="S_Button_RemindLater" Version="8.0.314.0" Description="Remind me Later button term">Remind me Later</String>
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKButtonOK" Version="7.0.230.0" Description="OK button in message boxes">OK</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKButtonCancel"  Version="7.0.230.0" Description="Cancel button in message boxes">Cancel</String>
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKBalloonClickToSelectKeyboard" Version="8.0.330.0" Description="Balloon that shows when Keyman icon is first shown during the tutorial">Click this icon to select a keyboard</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKBalloonOSKClosed" Version="8.0.330.0" Description="Balloon that shows when OSK is closed">&Name; is still running.  Click this icon to use your language keyboard at any time</String>
-  
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Configuration Dialog              -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="Configuration Dialog" Type="PlainText" Id="S_ConfigurationTitle" Version="7.0.230.0" Description="Configuration dialog title, which includes the product name">&Name; Configuration</String>
-
-<Dialog Id="Keyman" Version="7.0.230.0" Width="740" Height="476">
-  <footerheight>40</footerheight>
-  <menuwidth>118</menuwidth>
-  <headerheight>40</headerheight>
-</Dialog>
-
-<String Group="Configuration Dialog" Type="PlainText" Id="S_Caption_Help" Version="7.0.239.0" Description="Configuration dialog link to Help">Help</String>
-
-<!-- Tab names and shortcut keys -->  
-
-<String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Keyboards" Version="7.0.230.0" Description="Keyboard Layouts tab name">Keyboard Layouts</String>  <String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Keyboards_AccessChar" Version="7.0.230.0" Description="Direct access to the Keyboard Layouts tab using alt+">K</String>
-<String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Options" Version="7.0.230.0" Description="Options tab name">Options</String>      <String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Options_AccessChar" Version="7.0.230.0" Description="Direct access to the Options tab using alt+">O</String>
-<String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Hotkeys" Version="7.0.230.0" Description="Hotkeys tab name">Hotkeys</String>      <String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Hotkeys_AccessChar" Version="7.0.230.0" Description="Direct access to the Hotkeys tab using alt+">H</String>
-<String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Support" Version="7.0.230.0" Description="Support tab name">Support</String>      <String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_Support_AccessChar" Version="7.0.230.0" Description="Direct access to the Support tab using alt+">S</String>
-<String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_KeepInTouch" Version="9.0.493.0" Description="Keep in touch tab name">Keep in Touch</String>      <String Group="Configuration Dialog - Tab names" Type="PlainText" Id="S_KeepInTouch_AccessChar" Version="9.0.492.0" Description="Direct access to the Keep in Touch tab using alt+">T</String>
-
-<!-- Configuration detail captions -->
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Filename" Version="7.0.230.0" Description="Keyboard download window, etc. - term for filename">Filename:</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Version" Version="7.0.230.0" Description="Keyboard download window, etc. - term for package version">Package version:</String>
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_KeyboardVersion" Version="9.0.442.0" Description="Keyboard download window, etc. - term for keyboard version">Keyboard version:</String>
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Author" Version="7.0.230.0" Description="Keyboard download window, etc. - term for author">Author:</String>
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Website" Version="7.0.230.0" Description="Keyboard download window, etc. - term for website">Website:</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Package" Version="7.0.230.0" Description="Keyboard download window, etc. - term for package">Package:</String>
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Fonts" Version="7.0.230.0" Description="Keyboard download window, etc. - term for fonts">Fonts:</String>
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Keyboards" Version="7.0.230.0" Description="Keyboard download window, etc. - term for keyboard layouts">Keyboard Layouts:</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Encodings" Version="7.0.230.0" Description="Keyboard download window, etc. - term for encodings (encodings include Unicode, ANSI, Non-Unicode, etc).">Encodings:</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_LayoutType" Version="7.0.230.0" Description="Keyboard download window, etc. - term for keyboard layout type (keyboard layout types include Fixed and Mnemonic)">Layout Type:</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_LayoutType_Positional" Version="7.0.230.0" Description="Keyboard download window, etc. - term for the fixed keyboard layout type">Fixed (Positional)</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_LayoutType_Mnemonic" Version="7.0.230.0" Description="Keyboard download window, etc. - term for the mnemonic keyboard layout type">Mapped to Windows layout (Mnemonic)</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Description" Version="7.0.230.0" Description="Keyboard download window, etc. - term for description">Description:</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_InstalledFor" Version="7.0.230.0" Description="Text preceding Install choices">Installed for:</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_InstalledFor_AllUsers" Version="7.0.230.0" Description="Install choice - install for all users">All users</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_InstalledFor_CurrentUser" Version="7.0.230.0" Description="Install choice - install for current user">Current user</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Languages" Version="9.0.420.0" Description="Text preceding linked language profiles">Languages:</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Languages_Uninstall" Version="9.0.420.0" Description="Remove language profile">&#x2715;</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Languages_Install" Version="9.0.420.0" Description="Add language profile">Add language</String>
-  
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_OnScreenKeyboard" Version="7.0.230.0" Description="Term for the On Screen Keyboard">On Screen Keyboard:</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_OnScreenKeyboard_Custom" Version="8.0.306.0" Description="(OSK) Custom term">Custom</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_OnScreenKeyboard_Installed" Version="7.0.230.0" Description="(OSK) Installed term">Installed</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_OnScreenKeyboard_NotInstalled" Version="7.0.230.0" Description="(OSK) Not installed term">Not installed</String>
-
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Documentation" Version="8.0.306.0" Description="Term for the Documentation">Documentation:</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Documentation_Installed" Version="8.0.306.0" Description="(Documentation) Installed term">Installed</String>
-  <String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Documentation_NotInstalled" Version="8.0.306.0" Description="(Documentation) Not installed term">Not installed</String>
-  
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Message" Version="7.0.230.0" Description="Keyboard download window, etc. - term for additional messages">Message:</String>
-<String Group="Configuration Dialog - Captions" Type="PlainText" Id="S_Caption_Copyright" Version="7.0.230.0" Description="Keyboard download window, etc. - term for copyright">Copyright:</String>
-
-<!-- Keyboards tab -->
-
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Button_PackageOptions" Version="7.0.230.0" Description="Keyboard Layouts - package options button">Package options</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Button_KeyboardOptions" Version="7.0.230.0" Description="Keyboard Layouts - standard options button">Options</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Button_InstallKeyboard" Version="7.0.230.0" Description="Keyboard Layouts - install keyboard button">Install keyboard...</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Button_DownloadKeyboard" Version="7.0.230.0" Description="Keyboard Layouts - download keyboard button">Download keyboard...</String>
-
-  <String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_Options" Version="8.0.287.0" Description="KL option button submenu - keyboard options">Keyboard options</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_Uninstall" Version="7.0.230.0" Description="KL option button submenu - uninstall keyboard">Uninstall</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_UninstallPackage" Version="7.0.230.0" Description="KL option button submenu - uninstall package">Uninstall package</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_ShowWelcome" Version="7.0.230.0" Description="KL option button submenu - show introductory help">Show introductory help</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_ChangeHotkey" Version="7.0.230.0" Description="KL option button submenu - change hotkey">Change hotkey</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_SetHotkey" Version="7.0.230.0" Description="KL option button submenu - set hotkey">Set hotkey</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_UninstallOnScreenKeyboard" Version="7.0.230.0" Description="KL option button submenu - uninstall OSK">Uninstall On Screen Keyboard</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Menu_InstallOnScreenKeyboard" Version="7.0.230.0" Description="KL option button submenu - install OSK">Install On Screen Keyboard...</String>
-
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="S_Keyboards_NoKeyboardsInstalled" Version="7.0.230.0" Description="Keyboard Layouts - notice of no keyboard layouts installed">You do not have any keyboards installed.  Click the Download Keyboard button to install a keyboard layout from the Keyman website.</String>
-<String Group="Configuration Dialog - Keyboard Layouts tab" Type="PlainText" Id="SKUninstallRequireAdmin" Version="7.1.251.0" Parameters="%0:s = keyboard layout name" Description="Keyboard Layouts - notice of ineligibility to uninstall a keyboard">You can only uninstall the keyboard '%0:s' if you are an Administrator</String>
-
-<!-- Options tab -->
-
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="kogGeneral" Version="7.0.230.0" Description="Options section - General">General</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="kogStartup" Version="7.0.230.0" Description="Options section - Startup">Startup</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="kogOSK" Version="7.0.244.0" Description="Options section - OSK">On Screen Keyboard</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="kogAdvanced" Version="7.0.230.0" Description="Options section - Advanced">Advanced</String>
-
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koKeyboardHotkeysAreToggle" Version="7.0.230.0" Description="General options - hotkeys toggle on AND off a keyboard layout">Keyboard hotkeys toggle keyboard activation</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koAltGrCtrlAlt" Version="7.0.230.0" Description="General options - Ctrl+Alt simulates AltGr on computers without AltGr">Simulate AltGr with Ctrl+Alt</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koDeadkeyConversion" Version="9.0.480.0" Description="Advanced options - Base keyboard deadkeys are treated as normal keys">Treat hardware deadkeys as plain keys</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koShowHints" Version="7.0.244.0" Description="General options - show/hide hint messages (resets hint messages individually disabled)">Show hint messages</String>
-
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koStartWithWindows" Version="7.0.230.0" Description="Startup options - Start Keyman with Windows start">Start when Windows starts</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koShowStartup" Version="7.0.230.0" Description="Startup options - show/hide splash screen">Show splash screen</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koShowWelcome" Version="7.0.230.0" Description="Startup options - show/hide welcome screen">Show welcome screen</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koCheckForUpdates" Version="7.0.230.0" Description="Startup options - check online weekly for updates">Automatically check keyman.com weekly for updates</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koTestKeymanFunctioning" Version="7.0.236.0" Description="Startup options - test for conflicting apps when Product starts">Test for conflicting applications when &Name; starts</String>
-
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koReleaseShiftKeysAfterKeyPress" Version="7.0.236.0" Description="OSK options - Releases shift/ctrl/alt on OSK after key press">Release Shift/Ctrl/Alt on On Screen Keyboard after clicking a key</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koAutoOpenOSK" Version="7.0.244.0" Description="OSK options - auto-open OSK">Always show On Screen Keyboard Window when Keyman keyboard is selected</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koAutoSwitchOSKPages" Version="7.0.244.0" Description="OSK options - when a keyboard is activated, switch to most appropriate page in OSK">Switch to appropriate On Screen Keyboard/Help automatically when a keyboard is selected</String>
-
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koTurnOnSurrogates" Version="7.0.230.0" Description="Advanced options - turn on Unicode suplementary character display (not needed in Vista)">Turn on Unicode supplementary character display (requires restart)</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koUnknownLanguage" Version="7.0.230.0" Description="Advanced options - installs Unknown Language in Windows Control Panel (should only be used for legacy layouts).">Turn on 'Unknown' language</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koDebugging" Version="7.0.230.0" Description="Advanced options - turn on debugging (which creates a very large file)">Debugging</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koSwitchLanguageWithKeyboard" Version="7.0.244.0" Description="Advanced options - switch Windows language when keyboard selected">Switch Windows language when a Keyman keyboard is selected</String>
-  <String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koSwitchLanguageForAllApplications" Version="7.1.274.0" Description="Advanced options - selected language applies to all applications">Select keyboard layout for all applications</String>
-<String Group="Configuration Dialog - Options tab" Type="FormatString" Id="koRunElevatedInVista" Version="7.0.230.0" Description="Advanced options - elevate user permission to highest permisable level">Always elevate user permissions when running in Windows Vista</String>
-
-<String Group="Configuration Dialog - Options tab" Type="PlainText" Id="S_Button_UILanguage" Version="7.0.230.0" Description="Options button - changes user interface language/localization">User interface language...</String>
-
-<String Group="Configuration Dialog - Options tab" Type="PlainText" Id="S_Button_BaseKeyboard" Version="9.0.445.0" Description="Options tab - base keyboard button">Base Keyboard...</String>
-  
-<!-- Hotkeys tab -->
-
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_Keyboard_Prefix" Version="7.0.230.0" Description="Hotkey - activation term preceding Keyman keyboard layout name. Note: include a space following."></String> <!-- e.g. "Activate [Korean KORDA] Keyboard" -->
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_Keyboard_Suffix" Version="7.0.230.0" Description="Hotkey - keyboard layout term following Keyman keybaord layout name. Note: include an initial space."></String>
-
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_Language_Prefix" Version="7.0.241.0" Description="Hotkey - activation term preceding Windows language name. Note: include a space following."></String> <!-- e.g. "Activate [Korean KORDA] Keyboard" -->
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_Language_Suffix" Version="7.0.241.0" Description="Hotkey - language term following Windows language name. Note: include an initial space."></String>
-
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_None" Version="7.0.230.0" Description="Hotkey - text used when no hotkey set for an option">(none)</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_TurnKeymanOff" Version="7.0.230.0" Description="Hotkey - Turn Product Off">Switch &Name; Off</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_OpenKeyboardMenu" Version="7.0.230.0" Description="Hotkey - Open Keyman systemtray menu">Open Keyboard Menu</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_ShowOnScreenKeyboard" Version="7.0.230.0" Description="Hotkey - show keyboard in OSK">Show On Screen Keyboard Pane</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_OpenConfiguration" Version="7.0.230.0" Description="Hotkey - open Keyman Configuration">Open Configuration</String>
-
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_ShowKeyboardUsage" Version="7.1.275.0" Description="Hotkey - show keyboard usage in OSK">Show Keyboard Usage Pane</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_ShowFontHelper" Version="7.1.275.0" Description="Hotkey - show font helper in OSK">Show Font Helper Pane</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_ShowCharacterMap" Version="7.1.275.0" Description="Hotkey - show character map in OSK">Show Character Map Pane</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_OpenTextEditor" Version="7.1.275.0" Description="Hotkey - open text editor">Open Text Editor</String>
-
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_SwitchLanguage" Version="8.0.294.0" Description="Hotkey - switch language window">Open Language Switcher</String>
-  
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_Control_Title" Version="7.1.274.0" Description="Hotkey - Control Title">General Hotkeys</String>
-<String Group="Configuration Dialog - Hotkeys tab" Type="PlainText" Id="S_Hotkey_Keyboard_Title" Version="7.1.274.0" Description="Hotkey - Keyboard Title">Keyboard Layouts</String>
-  
-<!-- Languages tab -->
-
-<String Group="Configuration Dialog - Languages tab" Type="PlainText" Id="S_Languages_InstalledLanguage" Version="7.0.230.0" Description="Languages - Windows installed languages column header">Installed Language</String>
-<String Group="Configuration Dialog - Languages tab" Type="PlainText" Id="S_Languages_WindowsLayout" Version="7.0.230.0" Description="Languages - Windows keyboard layout column header">Windows Layout</String>
-<String Group="Configuration Dialog - Languages tab" Type="PlainText" Id="S_Languages_KeymanKeyboard" Version="7.0.230.0" Description="Languages - Keyboard layout column header">Keyman Keyboard</String>
-
-<String Group="Configuration Dialog - Languages tab" Type="PlainText" Id="S_Languages_UseWindowsLayout" Version="7.0.230.0" Description="Default text used when a Windows language is associated with its standard Windows keyboard layout">(use Windows layout)</String>
-
-<!-- Support tab -->
-
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Button_UpgradeNow" Version="9.0.465.0" Description="">Upgrade now!</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Button_SendSupportRequest" Version="9.0.465.0" Description="">Send Support Request</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Support_ContactHeading" Version="9.0.465.0" Description="">Contact Keyman Support</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Support_ContactInstructions_Free" Version="9.0.465.0" Description="">If you have any issues using Keyman, just ask us for help.</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Button_CommunitySupport" Version="9.0.465.0" Description="">Open FirstVoices Help Center</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Support_CreatedBySIL" Version="11.0.1500.0" Description="Support - SIL statement">Created by SIL International</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Support_Copyright" Version="7.0.230.0" Description="Support - Product Copyright">Copyright &#xa9; SIL International. All Rights Reserved.</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Support_Version" Version="7.0.230.0" Description="Support - version">Version</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Support_EngineVersion" Version="7.0.230.0" Description="Support - engine version">Engine Version</String>
-
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Support_UsefulLinks" Version="8.0.294.0" Description="Support - Useful Links heading">Useful Links</String>
-
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Button_OnlineSupport" Version="7.0.230.0" Description="Support button - links to online support">Online Help</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Button_Diagnostics" Version="7.0.230.0" Description="Support button - offers a submenu with two diagnostic tools">Diagnostics</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Button_CheckForUpdates" Version="7.0.230.0" Description="Support button - manually checks for product updates">Check for Updates</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Button_ProxyConfig" Version="7.0.230.0" Description="Options button - allows manual adjustment of proxy settings">Proxy Settings...</String>
-
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Menu_Diagnostics_Diagnostics" Version="7.0.230.0" Description="Support button submenu - performs a diagnostic report">Diagnostics</String>
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="S_Menu_Diagnostics_CheckLanguages" Version="7.0.230.0" Description="Support button submenu - evaluates if Windows language settings are correct for current Keyman keyboard layouts">Check Language Settings</String>
-
-<String Group="Configuration Dialog - Support tab" Type="PlainText" Id="SKAllLanguageSettingsTestedOK" Version="7.1.250.0" Description="Support - result of positive evaluation: Windows language settings are correct for current Keyman keyboard layouts">Microsoft Windows appears to be correctly configured for your language(s).</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Download Keyboard Layout Dialog   -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="DownloadKeyboard" Width="740" Height="400">
-  <footerheight>40</footerheight>
-</Dialog>
-
-<String Group="Download Keyboard Dialog" Type="PlainText" Id="S_DownloadKeyboard_Title" Version="7.0.230.0" Description="Download keyboard layout from keyman.com dialog title">Download Keyboard From keyman.com</String>
-<String Group="Download Keyboard Dialog" Type="PlainText" Id="S_DownloadKeyboard_DownloadOnlyCheckbox" Version="7.0.230.0" Description="Download only option checkbox">Don't install, just download</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Install Keyboard Dialog           -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<!-- Note: this dialog uses captions from the Configuration dialog as well -->
-  
-<Dialog Id="InstallKeyboard" Width="600" Height="300" />
-
-<String Group="Install Keyboard Dialog" Type="PlainText" Id="S_InstallKeyboard_Title" Version="7.0.230.0" Description="Install keyboard/package dialog title">Install Keyboard/Package</String>
-
-<String Group="Install Keyboard Dialog" Type="PlainText" Id="S_InstallKeyboard_Tab_Details" Version="7.0.230.0" Description="Install keyboard/package - details">Details</String>
-<String Group="Install Keyboard Dialog" Type="PlainText" Id="S_InstallKeyboard_Tab_Readme" Version="7.0.230.0" Description="Install keyboard/package - readme">Readme</String>
-
-<String Group="Install Keyboard Dialog" Type="PlainText" Id="S_InstallKeyboard_Button_Install" Version="7.0.230.0" Description="Install keyboard/package - install button">Install</String>
-<String Group="Install Keyboard Dialog" Type="PlainText" Id="S_InstallKeyboard_Button_InstallAllUsers" Version="7.0.241.0" Description="Install keyboard/package - install for all users button">Install for all users</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Proxy Configuration Dialog        -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="ProxyConfiguration" Width="240" Height="176" />
-
-<String Group="Proxy Configuration Dialog" Type="PlainText" Id="S_ProxyConfiguration_Title" Version="7.0.230.0" Description="Proxy configuration dialog title">Proxy Server Configuration</String>
-
-<String Group="Proxy Configuration Dialog" Type="PlainText" Id="S_ProxyConfiguration_Server" Version="7.0.230.0" Description="Proxy dialog - fillable-field server">Server: </String>
-<String Group="Proxy Configuration Dialog" Type="PlainText" Id="S_ProxyConfiguration_Port" Version="7.0.230.0" Description="Proxy dialog - fillable-field port">Port: </String>
-<String Group="Proxy Configuration Dialog" Type="PlainText" Id="S_ProxyConfiguration_Username" Version="7.0.230.0" Description="Proxy dialog - fillable-field username">Username: </String>
-<String Group="Proxy Configuration Dialog" Type="PlainText" Id="S_ProxyConfiguration_Password" Version="7.0.230.0" Description="Proxy dialog - fillable-field password">Password: </String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Base Keyboard Dialog        -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="BaseKeyboard" Width="512" Height="160" />
-
-<String Group="Base Keyboard Dialog" Type="PlainText" Id="S_BaseKeyboard_Title" Version="9.0.445.0" Description="Base keyboard dialog title">Set Base Keyboard</String>
-<String Group="Base Keyboard Dialog" Type="PlainText" Id="S_BaseKeyboard_Text" Version="9.0.445.0" Description="Base keyboard dialog description">Select the base Latin script
-keyboard that you use in Windows.  Keyman keyboards will adapt automatically to your preferred layout.</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Hotkey Dialog                     -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="Hotkey Dialog" Type="FormatString" Id="SKChangeHotkeyTitle" Version="7.0.230.0" Description="Change Hotkey dialog title">Change Hotkey</String>
-
-<String Group="Hotkey Dialog" Type="FormatString" Id="SKButtonClearHotkey" Version="7.0.230.0" Parameters="&amp; = alt+ access-character" Description="Hotkey dialog - clear button">&amp;Clear Hotkey</String>
-<String Group="Hotkey Dialog" Type="FormatString" Id="SKSetHotkey_Keyboard" Version="7.0.230.0" Parameters="%0:s = Name of keyboard" Description="Hotkey dialog - message when setting hotkey for a keyboard">Select a standard hotkey or choose 'Custom' and hold Ctrl,Shift and/or Alt and type your desired hotkey for keyboard %0:s:</String>
-<String Group="Hotkey Dialog" Type="FormatString" Id="SKSetHotkey_Language" Version="7.0.241.0" Parameters="%0:s = Name of keyboard" Description="Hotkey dialog - message when setting hotkey for a language">Select a standard hotkey or choose 'Custom' and hold Ctrl,Shift and/or Alt and type your desired hotkey for language %0:s:</String>
-<String Group="Hotkey Dialog" Type="FormatString" Id="SKSetHotkey_Interface" Version="7.0.230.0" Description="Hotkey dialog - message displayed when changing a hotkey for a product feature (e.g. show menu or show on screen keyboard)">Select a standard hotkey or choose 'Custom' and hold Ctrl,Shift and/or Alt and type your desired hotkey:</String>
-
-<String Group="Hotkey Dialog" Type="FormatString" Id="SKUnsafeHotkey" Version="7.0.230.0" Parameters="%0:s = Hotkey" Description="Hotkey dialog - warning of hotkey conflict with standard keyboard use">The hotkey %0:s will conflict with normal keyboard use.  You should use at least Ctrl or Alt.  Do you want to change this now?</String>
-<String Group="Hotkey Dialog" Type="FormatString" Id="SKHotkeyConflicts_Keyboard" Version="7.0.230.0" Parameters="%0:s = Hotkey, %1:s = Conflicting keyboard" Description="Hotkey dialog - warning of hotkey conflict with hotkey for another keyboard">The hotkey %0:s conflicts with the hotkey selected for keyboard %1:s.  If you continue, the hotkey for keyboard %1:s will be cleared.  Continue?</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Keyboard for Install Dialog       -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="Select Keyboard for Install Dialog" Type="FormatString" Id="SKSelectKeyboardsTitle" Version="7.0.241.0" Description="Select Keyboards for Install dialog title">Select Keyboards to Install</String>
-<String Group="Select Keyboard for Install Dialog" Type="FormatString" Id="SKSelectKeyboardsBlurb" Version="7.0.241.0" Parameters="%0:s: Number of keyboards user can still install" Description="Select Keyboards for Install text">You cannot install all the keyboards in this package.  You can install a maximum of %0:d additional keyboards.  Please select the keyboards you wish to install from this package.</String>
-  
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Online Update Dialog              -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="OnlineUpdate" Width="470" Height="260" />
-  
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_Title" Version="7.0.230.0" Description="Update dialog title, where &Name; = product name">Updated &Name; Components Available</String>
-
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_NewVersionAvailable" Version="7.0.230.0" Description="Update dialog - updates available text">Updates for &Name_CN; are now available</String>
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_NewVersionPrompt" Version="7.1.255.0" Description="Update dialog - prompt to select updates">Please select the updates you wish to install:</String>
-  
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_InstallQuery" Version="7.0.230.0" Description="Update dialog - install query">Do you want to download and install this patch now?</String>
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_DownloadFrom" Version="7.0.230.0" Description="Update dialog - download information">You can download the new version from:</String>
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_DownloadQuery" Version="7.0.230.0" Description="Update dialog - keyman.com website visiting query">Do you want to visit the website now?</String>
-  
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_Button_InstallNow" Version="7.0.230.0" Description="Update dialog - install now button">Install Now</String>
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_Button_InstallLater" Version="7.0.230.0" Description="Update dialog - cancel button">Cancel</String>
-
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_OldVersionHead" Version="7.1.255.0" Description="Update dialog - old version">Old Version</String>
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_ComponentHead" Version="7.1.255.0" Description="Update dialog - update component">Updated Component</String>
-<String Group="Online Update Dialog" Type="PlainText" Id="S_Update_SizeHead" Version="7.1.255.0" Description="Update dialog - update size">Size</String>
-
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_KeymanText" Version="7.0.230.0" Parameters="%0:s = Current version number" Description="Update dialog - name and version of updatable product">&Name; %0:s</String>
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_PackageText" Version="7.0.230.0" Parameters="%0:s = Package description, %1:s = Current package version number" Description="Update dialog - name and version of updatable keyboard layout package">Keyboard %0:s %1:s</String>
-
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_UnableToContact" Version="7.0.230.0" Description="Update dialog - unable to access keyman.com warning">Unable to contact keyman.com - please make sure you have an active Internet connection and try again.</String>
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_UnableToContact_Error" Version="7.0.230.0" Parameters="%0:s = Error message" Description="Update dialog - unable to access keyman.com error message">Unable to contact keyman.com - please make sure you have an active Internet connection and try again.  The error received was: %0:s</String>
-
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_IconTitle" Version="8.0.288.0" Description="Update icon - title">&Name; updates are available</String>
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_IconText" Version="8.0.288.0" Description="Update icon - text">Click this icon to download and install updates</String>
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_IconMenuText" Version="8.0.288.0" Description="Update icon - install menu item">View and &amp;install &Name; updates</String>
-<String Group="Online Update Dialog" Type="FormatString" Id="SKUpdate_IconMenuExit" Version="8.0.288.0" Description="Update icon - exit menu item">E&amp;xit online update check</String>
-  
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Splash Dialog                     -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="Splash" Width="630" Height="450" />
-
-<String Group="Splash Dialog" Type="PlainText" Id="S_Splash_Title" Version="7.0.230.0" Description="Splash dialog title, with company, product and version name">&Name_CNV;</String>
-<String Group="Splash Dialog" Type="PlainText" Id="S_Splash_Name" Version="8.0.288.0" Description="Splash major title">&Name;</String>
-<String Group="Splash Dialog" Type="PlainText" Id="S_Splash_Version" Version="8.0.288.0" Description="Splash major version"></String>
-
-<String Group="Splash Dialog" Type="PlainText" Id="S_Splash_Start" Version="8.0.294.0" Description="Start Keyman button">Start Keyman</String>
-<String Group="Splash Dialog" Type="PlainText" Id="S_Splash_Exit" Version="8.0.294.0" Description="Exit button">Exit</String>
-  
-<String Group="Splash Dialog" Type="PlainText" Id="S_Splash_OtherTasks" Version="8.0.294.0" Description="Other tasks heading">Other tasks</String>
-  <String Group="Splash Dialog" Type="PlainText" Id="S_Splash_Configuration" Version="8.0.294.0" Description="Keyman Configuration link">Configuration</String>
-  <String Group="Splash Dialog" Type="PlainText" Id="S_Splash_ShowAtStartup" Version="9.0.341.0" Description="Show at Startup toggle">Show this screen at startup</String>
-  <String Group="Splash Dialog" Type="PlainText" Id="S_Splash_HideAtStartup" Version="9.0.431.0" Description="Hide at Startup toggle">Hide this screen at startup</String>
-      
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- UI Languages & Localization       -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="_LanguageInfo" Type="PlainText" Id="S_DisplayIn" Version="8.0.278.0" Description="'Display In' text label for UI language menu">Display in</String>
-<String Group="_LanguageInfo" Type="PlainText" Id="S_MoreUILanguagesMenu" Version="8.0.278.0" Description="More UI languages online menu item">Find other display languages online...</String>
-<String Group="_LanguageInfo" Type="PlainText" Id="S_ContributeUILanguagesMenu" Version="9.0.525.0" Description="Link to contribute to language UI">Help translate the user interface...</String>
-<String Group="_LanguageInfo" Type="FormatString" Id="SKUILanguageName" Version="7.0.230.0" Description="User interface language name in the UI language">English</String>
-<String Group="_LanguageInfo" Type="FormatString" Id="SKUILanguageNameWithEnglish" Version="7.0.230.0" Description="UI language name in the UI language with the English name in parentheses  (this message is used when the user gets stuck in a strange UI language)">English</String>
-<String Group="_LanguageInfo" Type="FormatString" Id="SKLanguageCode" Version="7.0.230.0" Description="The language code for the current translation">en</String>
-<String Group="_LanguageInfo" Type="FormatString" Id="SKDefaultLanguageCode" Version="7.0.230.0" Description="The default language code for this product.  This should be the language that the product is created in. For Keyman (all editions) this must stay 'en', for all translations.">en</String>
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKShortApplicationTitle" Version="7.0.230.0" Description="Product name">&Name;</String>
-
-<String Group="UI Language Dialog" Type="FormatString" Id="SKDialogSelectLanguage" Version="7.0.230.0" Description="Select UI dialog title">Select User Interface Language</String>
-
-<String Group="UI Language Dialog" Type="FormatString" Id="SKUILanguageHelp" Version="7.0.244.0" Description="UI dialog - instructions">Choose the language that you want displayed in the &Name; interface.</String>
-<String Group="UI Language Dialog" Type="FormatString" Id="SKButtonUILanguageDownload" Version="7.0.244.0" Description="UI dialog - 'More languages online' button">&amp;More languages online...</String>
-
-<String Group="UI Language Dialog" Type="FormatString" Id="SKDialogUILanguageCreateTranslation" Version="7.1.266.0" Description="Create a new UI translation online link">Create a new translation online</String>
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Language Config & Script Support  -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="LangSetup" Width="650" Height="375"></Dialog>
-	
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_Title" Version="7.0.230.0" Description="Language configuration tasks dialog title">Language Configuration Tasks</String>
-
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_TitleInnerPrefix" Version="7.0.230.0" Description="LCT dialog - subtitle text preceding language name(s)">Configure your computer to work with</String>
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_TitleInnerSuffix" Version="7.0.230.0" Description="LCT dialog - subtitle text following language name(s)"></String>
-
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_BlurbPrefix" Version="7.0.230.0" Description="LCT dialog - standard explanitory text preceding language name(s)">&Name; has detected that the following configuration tasks need to be completed in order for</String>
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_BlurbSuffix" Version="7.0.230.0" Description="LCT dialog - standard explanitory text following language name(s)">script(s) to work correctly on your computer:</String>
-
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_psrtMSOfficeLanguage" Version="7.0.230.0" Description="LCT dialog - language support for Microsoft Office">Microsoft Office Language Support</String>
-
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_MoreInfo" Version="7.0.230.0" Description="LCT dialog - link to help information about the proposed LCT">More&#160;Information...</String>
-
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_Ask" Version="7.0.230.0" Description="LCT dialog - request to complete tasks now">Do you want &Name; to complete these tasks now?</String>
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_Note" Version="7.0.230.0" Description="LCT dialog - note that system changes won't be uninstalled even if Product is"></String>
-
-<String Group="Language Setup Dialog" Type="PlainText" Id="S_LangSetup_SaveDisabledItems" Version="7.0.230.0" Description="LCT dialog - don't ask for this specific LCT again checkbox">Don't ask me about this again</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Hints                             -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="Hint" Width="450" Height="300">
-	<footerheight>40</footerheight>
-	<headerheight>40</headerheight>
-</Dialog>
-
-<String Group="Hints" Type="PlainText" Id="S_Button_ResetHints" Version="7.0.244.0" Description="Hint - options tab button to reset hints">Reset Hints</String>
-<String Group="HInts" Type="PlainText" Id="SKHintsReset" Version="7.0.244.0" Description="Hint - options tab dialog confirming reset of hints">All hint messages have been reset and will be displayed again.</String>
-
-<String Group="Hints" Type="HintTitle" Id="HintTitle_KH_EXITPRODUCT" Version="7.0.244.0" Description="Hint - dialog title upon attempting to exit product">Exit &Name;?</String>
-<String Group="Hints" Type="Hint" Id="Hint_KH_EXITPRODUCT" Version="7.0.244.0" Description="Hint - asks for confirmation, explains the difference between de-activating a keyboard layout and closing Product">Are you sure you want to exit &Name;?  Your Keyman keyboards will still be listed in the Windows languages, but will not be functional until you restart &Name;.</String>
-
-<String Group="Hints" Type="HintTitle" Id="HintTitle_KH_CLOSEOSK" Version="7.0.244.0" Description="Hint - dialog title upon closing the OSK">On Screen Keyboard Closed</String>
-<String Group="Hints" Type="Hint" Id="Hint_KH_CLOSEOSK" Version="7.0.244.0" Description="Hint - explains that Product is still running and iforms how to reopen OSK">You have closed the On Screen Keyboard.  &Name; is still running.  You can open the On Screen Keyboard at any time by clicking on the &Name; Icon and selecting "On Screen Keyboard"</String>
-
-<String Group="Hints" Type="PlainText" Id="S_HintDialog_DontShowHintAgain" Version="10.0.836.0" Description="Hint dialog - caption of checkbox at bottom of dialog">Don't show this hint again</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Help                              -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<Dialog Id="Help" Width="450" Height="300"></Dialog>
-<String Group="Help Dialog" Type="PlainText" Id="S_HelpTitle" Version="7.0.230.0" Description="Help - product name help">&Name; Help</String>
-<String Group="Help Dialog" Type="PlainText" Id="S_Help_Product" Version="7.0.230.0" Description="Help - help contents link title">Help Contents</String>
-
-<String Group="Help Dialog" Type="PlainText" Id="S_Help_Keyboard_Prefix" Version="7.0.230.0" Description="Help - text preceding keyboard name">Help on "</String>
-<String Group="Help Dialog" Type="PlainText" Id="S_Help_Keyboard_Suffix" Version="7.0.230.0" Description="Help - text following keyboard name">" keyboard</String>
-
-<String Group="Toolbar Context Help" Type="PlainText" Id="S_Toolbar_ViewOnScreenKeyboard" Version="7.0.230.0" Description="Toolbar help - View OSK pop-up text">View On Screen Keyboard</String>
-<String Group="Toolbar Context Help" Type="PlainText" Id="S_Toolbar_ViewKeyboardUsage" Version="7.0.230.0" Description="Toolbar help - View Keyboard Usage pop-up text">View Keyboard Usage</String>
-<String Group="Toolbar Context Help" Type="PlainText" Id="S_Toolbar_ViewFontHelper" Version="7.0.230.0" Description="Toolbar help - View Font Helper pop-up text">View Font Helper</String>
-<String Group="Toolbar Context Help" Type="PlainText" Caption="View Character Map" Version="7.0.230.0" Description="Toolbar help - View Character Map pop-up text">View Character Map</String>
-<String Group="Toolbar Context Help" Type="PlainText" Id="S_Menu_SwitchKeymanOff" Version="7.0.230.0" Description="Toolbar help - Switch Keyman Off pop-up text">Switch &Name; Off</String>
-<String Group="Toolbar Context Help" Type="PlainText" Id="S_Toolbar_OpenConfiguration" Version="7.0.230.0" Description="Toolbar help - Open Keyman Configuration pop-up text">Open &Name; Configuration</String>
-<String Group="Toolbar Context Help" Type="PlainText" Id="S_Toolbar_OpenHelp" Version="7.0.230.0" Description="Toolbar help - Open help pop-up text">Open Help</String>
-<String Group="Toolbar Context Help" Type="PlainText" Id="S_Toolbar_CloseOnScreenKeyboard" Version="7.0.230.0" Description="Toolbar help - Close OSK pop-up text">Close On Screen Keyboard</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Menu Items                        -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_SwitchKeymanOff" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Switch Keyman Off">Switch &Name; &amp;Off</String> 
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_OnScreenKeyboard" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - OSK">On Screen &amp;Keyboard</String>
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_KeyboardUsage" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Keyboard Usage">Keyboard &amp;Usage</String>
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_FontHelper" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Font Helper">&amp;Font Helper</String>
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_CharacterMap" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Character Map">Character &amp;Map</String>
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_TextEditor" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Text Editor">&amp;Text Editor...</String>
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_Configuration" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Configuration">&amp;Configuration...</String>
-
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_Help" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Help">&amp;Help...</String>
-<String Group="System Tray Menu Items" Type="PlainText" Id="S_Menu_Exit" Version="7.0.230.0" Parameters="&amp; precedes alt + access-character" Description="Systray item - Exit">E&amp;xit</String>
-
-<String Group="System Tray Menu Items" Type="PlainText" Id="SKMenu_NoKeyboardsInstalled" Version="7.0.230.0" Description="Systray - notice of no keyboard layouts installed">No keyboard layouts are installed.
-Choose "Configuration" to install a 
-keyboard layout for your language.</String>
-
-<String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_FadeWhenInactive" Version="7.0.230.0" Description="OSK right-click menu - fade OSK when mouse is elsewhere">Fade When Inactive</String>
-<String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_ShowToolbar" Version="7.0.230.0" Description="OSK right-click menu - show/hide OSK toolbar">Show Toolbar</String>
-<String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_SaveAsWebPage" Version="7.0.230.0" Description="OSK right-click menu - save diagram of active keyboard layout as a web page">Save as Web Page...</String>
-<String Group="On Screen Keyboard Menu Items" Type="PlainText" Id="S_OSKContext_Print" Version="7.0.230.0" Description="OSK right-click menu - print diagram of active keyboard layout">Print...</String>
-  
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- Formatted messages, assorted                                              -->
-<!-- These messages cannot contain HTML tags and are plain text                -->
-<!-- All text within these tags is whitespace-preserved by the Keyman COM API  -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<!-- General -->
-
-<String Group="Formatted Messages"
-        Type="FormatString" 
-        Id="SKApplicationTitle"
-		Version="7.0.230.0"
-		Description="Company and product name used for the title of message boxes and message dialogs">&Name_CN;</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKSplashVersion" Version="7.0.230.0" Parameters="%0:s = Version number string" Description="Version number">Version %0:s</String>
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKButtonHelp"  Version="7.0.230.0" Description="Help button in message boxes">Help</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKButtonPrint" Version="7.0.239.0" Description="Print button in Welcome dialog for keyboards">&amp;Print...</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKButtonDownload" Version="7.0.240.0" Description="Download button in Locale Selection dialog">&amp;Download...</String>
-
-<!-- Notices -->
-
-<String Group="Formatted Messages" 
-        Type="FormatString" 
-        Id="SKPackageAlreadyInstalled"
-		Version="7.0.230.0" 
-        Parameters="%0:s = Package to be uninstalled"
-		Description="Notice during package installation that a package with the same name is already installed.">A package with the name %0:s is already installed.  Do you want to uninstall it and install the new one?</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKKeyboardAlreadyInstalled" Version="7.0.230.0" Parameters="%0:s = Keyboard name" Description="Notice during keyboard layout installation that a keyboard layout with the same name is already installed.">A keyboard with the name '%0:s' is already installed.  If you continue, it will be uninstalled before the new one is installed.  Continue?</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKKeyboardPartOfPackage" Version="7.0.230.0" Parameters="%0:s = Keyboard name, %1:s = Package name" Description="Notice of need to uninstall an entire package">The keyboard '%0:s' is part of package '%1:s'.  You must uninstall the entire package.  Continue?</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKInstallOnlyAsAdmin" Version="7.0.230.0" Description="Notice of user ineligibility to install/uninstall keyboards">You can only install or uninstall keyboards as Administrator.  Use Control Panel to select languages for use as a normal user.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKSurrogatesRequiresRestart" Version="7.0.230.0" Description="Notice of surrogate setting change requiring Windows restart">Changing the setting of Surrogates requires Windows to be restarted.  Do you want to restart Windows now?</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKPackageDoesNotIncludeWelcome" Version="7.0.230.0" Parameters="%0:s = Package Name" Description="Notice of lack of introductory help">The package or keyboard '%0:s' does not include any introductory help.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKOSNotSupported" Version="7.0.230.0" Description="Notice of unsupported operating system">This operating system is not supported.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKActivation_Success" Version="7.0.230.0" Description="Notice of succesful licence activation">Your licence has been successfully activated.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKOnlineHelpFile" Version="7.0.230.0" Description="File name of the help file - must be .chm format.  The locale folder will be checked first for the file">KeymanDesktop.chm</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKCouldNotFindHelp" Version="7.0.230.0" Description="Notice of help file not found">The help file $(SKOnlineHelpFile) could not be found.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKDamagedKeyboard" Version="7.0.230.0" Description="Notice of damaged keyboard">&lt;Damaged keyboard&gt;</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKANSIEncoding" Version="7.0.230.0" Description="Keyboard with an ANSI or Codepage encoding">Codepage</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKUnicodeEncoding" Version="7.0.230.0" Description="Keyboard with a Unicode encoding">Unicode</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKDownloadProgress_Title" Version="7.0.230.0" Description="Notice of file downloading">Downloading File</String>
-    
-  
-<!-- Confirmation Requests -->
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKUninstallOnScreenKeyboard" Version="7.0.230.0" Parameters="%0:s = Keyboard name" Description="Request for confirmation to uninstall OSK for a keyboard layout">Are you sure you want to remove the on screen keyboard installed for %0:s?</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKUninstallKeyboard" Version="7.0.239.0" Parameters="%0:s = Keyboard name" Description="Request for confirmation to uninstall keyboard layout">Are you sure you want to uninstall keyboard %0:s?</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKUninstallPackage" Version="7.0.239.0" Parameters="%0:s = Package name, %1:s: Fonts list" Description="Request for confirmation to uninstall a package">Are you sure you want to uninstall package %0:s?
-
-%1:s</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKUninstallPackageFonts" Version="7.1.270.0" Parameters="%0:s = Fonts list" Description="Text embedded in SKUninstallPackage when fonts are ready for uninstall.">The following fonts will also be uninstalled: %0:s.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKActivation_OnlineNow" Version="7.0.230.0" Parameters="%0:s = Licence number string (e.g. ABC1-D2E3-FGHJ-KLMN-OPQR)" Description="Request for confirmation that the present activation method is desired">Do you want to activate $(SKShortApplicationTitle) online now with licence number %0:s?  If you click No, you can choose from alternate activation methods.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKUnicodeData_Build" Version="7.0.230.0" Description="Request to build Unicode Chracter Map database">The Character Map has a database of characters that needs to be built before it can be used.  Build it now?</String>
-
-<!-- Errors -->
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKUnicodeData_DatabaseCouldNotBeDeleted" Version="7.0.230.0" Parameters="%0:s = Error detail string" Description="Error deleting Unicode Character Map database">The Unicode Character database could not be deleted for a rebuild.  Error details are: %0:s</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKUnicodeData_CouldNotCreateDatabase" Version="7.0.230.0" Parameters="%0:s = Error details" Description="Error creating Unicode Character Map database">The Unicode Character database could not be created and has been disabled.  Error details are: %0:s</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKUnicodeData_DatabaseLoadFailedRebuild" Version="7.0.230.0" Parameters="%0:s = Error message" Description="Error loading Unicode Character Map database. Request to rebuild.">The Unicode character database did not load successfully (%0:s).  Rebuild it now?</String>
-
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKErrorActivatingBrowser" Version="7.0.230.0" Description="General URL error">Cannot activate browser or email program for this URL.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKCouldNotPrintKeyboard" Version="7.0.230.0" Description="Keyboard printing error">The keyboard could not be printed successfully.  Please save to a web page and print manually.</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKCannotStartProduct" Version="7.0.241.0" Parameters="%0:s: error message" Description="Error from Keyman failing to start keyman.exe due to an access denied or file not found">&Name; failed to start.  Please check your security settings to make sure that the program keyman.exe is allowed to start before continuing.  The error returned was:
-
-"%0:s"
-
-Do you want to try and start &Name; again now?</String>
-
-<!-- Warnings -->
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKDebuggingWarning" Version="7.0.230.0" Description="Warning upon starting debugging in the Options tab">&Name; debug information will be stored in a log file called %LOCALAPPDATA%\Keyman\Diag\system#.etl (where # is a number). You should exit &Name; before attempting to delete this file.
-
-WARNING: This file can grow large very quickly.  Enabling debugging may slow down your system and should only be done if advised by technical support.
-
-PRIVACY WARNING: Please note that the debug logfile records all keystrokes that you type.  You should only turn on the debug log for the duration of a debugging or diagnostic session.</String>
-
-<!-- Microsoft Office -->
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_Office" Version="7.1.259.0" Parameters="%0:s = language name, %1:s = Microsoft Office version" Description="Request to add editing support to a specific version of Microsoft office">Add %0:s editing support to %1:s</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_Office_Office2000" Version="7.1.259.0" Description="Local name for Microsoft Office 2000">Microsoft Office 2000</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_Office_OfficeXP" Version="7.1.259.0" Description="Local name for Microsoft Office XP">Microsoft Office XP</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_Office_Office2003" Version="7.1.259.0" Description="Local name for Microsoft Office 2003">Microsoft Office 2003</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_Office_Office2007" Version="7.1.259.0" Description="Local name for Microsoft Office 2007">Microsoft Office 2007</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_Office_Office2010" Version="8.0.294.0" Description="Local name for Microsoft Office 2010">Microsoft Office 2010</String>
-
-
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_WindowsLanguage_Link" Version="7.1.259.0" Parameters="%0:s = language name, %1:s = keyboard name" Description="Shown when Keyman wants to link a Windows language to a Keyman keyboard so that when one is selected by the user, the other automatically switches in">Link language %0:s to Keyman keyboard %1:s</String>
-<String Group="Formatted Messages" Type="FormatString" Id="SKLangCheck_WindowsLanguage_Install" Version="7.1.259.0" Parameters="%0:s = language name, %1:s = keyboard name" Description="Shown when Keyman wants to install  a Windows language and link it to a Keyman keyboard so that when one is selected by the user, the other automatically switches in">Install language %0:s and link to Keyman keyboard %1:s</String>
-
-<!-- OSK Font Helper -->
-  
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_PleaseWait1" Description="OSK Font helper loading message part 1">Please wait while &Name; finds the fonts that will work with</String>
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_PleaseWait2" Description="OSK Font helper loading message part 2">keyboard.</String>
-
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_NonUnicode1" Description="OSK Font helper non-Unicode part 1"></String>
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_NonUnicode2" Description="OSK Font helper non-Unicode part 2">is not a Unicode keyboard.  Fonts cannot be automatically located.  Please check the keyboard documentation for font information.</String>
-
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_MatchedFonts1" Description="OSK Font helper matched fonts part 1">The following fonts work with</String>
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_MatchedFonts2" Description="OSK Font helper matched fonts part 2">keyboard:</String>
-
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_PossibleFonts" Description="OSK Font helper additional possible fonts">The following fonts may also work:</String>
-
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_PossibleFontsOnly1" Description="OSK Font helper possible fonts part 1">The following fonts may work with</String>
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_PossibleFontsOnly2" Description="OSK Font helper possible fonts part 2">keyboard:</String>
-
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_NoFonts1a" Description="OSK Font helper no fonts part 1">No fonts were found on your system that work with </String>
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_NoFonts1b" Description="OSK Font helper no fonts part 2">.  Please <a href="keyman:welcome">check the documentation</a> to find fonts for this keyboard.</String>
-  
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_NoKeyboards" Description="OSK Font helper no keyboards">No keyboard layouts are currently installed or loaded.  Use &Name; Configuration to install a keyboard layout.</String>
-<String Group="OSK Font Helper" Type="HTML" Version="8.0.294.0" Id="S_OSK_FontHelper_ChooseKeyboard" Description="OSK Font helper choose keyboard">Please choose a &Name; keyboard to find the fonts that will work with it.</String>
-  
-<!-- OSK Hints -->
-
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint_Title" Description="On Screen Keyboard Hintbar title">Hint:</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint1" Description="On Screen Keyboard Hintbar hint">Resize the On Screen Keyboard by clicking and dragging on the window border</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint2" Description="On Screen Keyboard Hintbar hint">Move the On Screen Keyboard by clicking and dragging on the "&Name;" title</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint3a" Description="On Screen Keyboard Hintbar hint">Insert any Unicode character into your document with the</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint3b" Description="On Screen Keyboard Hintbar hint">Character Map Tool</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint4a" Description="On Screen Keyboard Hintbar hint">Find out which fonts will work with your language with the</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint4b" Description="On Screen Keyboard Hintbar hint">Font Helper Tool</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint5a" Description="On Screen Keyboard Hintbar hint">Get more help on the keyboard by clicking the</String>
-<String Group="OSK Hints" Type="Plain Text" Version="8.0.294.0" Id="S_OSK_Hint5b" Description="On Screen Keyboard Hintbar hint">Keyboard Usage button</String>
-
-<!-- - - - - - - - - - - - - - - - - - -->
-<!-- Text Editor                       -->
-<!-- - - - - - - - - - - - - - - - - - -->
-
-<String Group="Text Editor" Type="FormatString" Version="10.0.836.0" Id="SKTextEditorCaption" Description="Caption of Text Editor">Text Editor - &Name;</String>
-  
-</Locale>
diff --git a/oem/firstvoices/windows/src/xml/menu-frame.js b/oem/firstvoices/windows/src/xml/menu-frame.js
index 95aa0797c6..6c77e7478f 100644
--- a/oem/firstvoices/windows/src/xml/menu-frame.js
+++ b/oem/firstvoices/windows/src/xml/menu-frame.js
@@ -1,5 +1,5 @@
   var menuframe_activeindex=0, menuframe_items = [];
-          
+
   function menuframe_add(path, name, description, hotkey)
   {
     var n = menuframe_items.length;
@@ -13,18 +13,18 @@
     menuframe_items[n].menu_hotkey = hotkey;
     menuframe_items[n].menu_name = name;
   }
-  
+
   function menuframe_activate(n)
   {
     var p = menuframe_items[menuframe_activeindex], c = menuframe_items[n];
     var itemtype, blah;
-    
-    p.className='menuframe'; 
-    c.className='menuframe_active'; 
+
+    p.className='menuframe';
+    c.className='menuframe_active';
     menuframe_activeindex=n;
     document.getElementById('content_'+p.menu_name).style.display = 'none';
     document.getElementById('content_'+c.menu_name).style.display = 'block';
-    
+
     save_state();
 
     if(!loading_state) {
@@ -32,19 +32,19 @@
       for(var i = 0; i < q.length; i++) {
         blah = q[i].id;
         itemtype = blah.substr(0, 5);
-        
+
         if( itemtype == "list_" ) {
           q[i].focus();
           break;
         }
       }
     }
-    
+
     if(typeof window['menuframe_activate_'+c.menu_name] != 'undefined') {
       window['menuframe_activate_'+c.menu_name]();
     }
   }
-  
+
   function menuframe_keydown(event)
   //document.onkeydown = function()
   {
@@ -80,16 +80,11 @@
         }
         break;
       case 13:    // enter
-        if( event.target.id.substring(0,6) != 'button' && event.target.tagName != 'TEXTAREA' ) {
-          event.cancelBubble = true; event.returnValue = false;
-          location.href='keyman:footer_ok';
-          break;
-        }
-        event.cancelBubble = true; event.returnValue = true;
+        event.cancelBubble = true;
+        event.returnValue = event.target.id.substring(0,6) == 'button' || event.target.tagName == 'TEXTAREA';
         break;
       case 27:    // esc
         event.cancelBubble = true; event.returnValue = false;
-        location.href='keyman:footer_cancel';
         break;
       case 32:    // spacebar
         switch(event.srcElement.tagName.toLowerCase()) {
@@ -103,18 +98,18 @@
             document.getElementById(k).focus();
             break;
           case 'input': return true;
-          case 'div': 
-          case 'span': 
+          case 'div':
+          case 'span':
             if(event.srcElement.parentElement) {
               switch(event.srcElement.parentElement.id) {
                 case 'keyboards':
-                  keyboard_checkclick(event.srcElement.id.substring(5),true);
+                  keyboard_checkclick(event.srcElement.id.substring('list_keyboard_'.length),true);
                   break;
                 case 'options':
-                  options_updatecheck(event.srcElement.id.substring(5),true);
+                  options_updatecheck(event.srcElement.id.substring('list_option_'.length),true);
                   break;
-                case 'hotkeys':
-                  location.href='keyman:hotkey_set?index=hotkey_' + event.srcElement.id.substring(5);
+                case 'subcontent_hotkeys':
+                  location.href='keyman:hotkey_set?index=hotkey_' + event.srcElement.id.substring('list_hotkey_'.length);
                   break;
                 default:
                   break;
@@ -124,13 +119,13 @@
         }
         event.cancelBubble = true; event.returnValue = false; event.preventDefault(); break;
         break;
-      default: 
+      default:
         for(var i = 0; i < menuframe_items.length; i++)
           if(menuframe_items[i].menu_hotkey.charCodeAt(0) == event.keyCode && event.altKey)
           {
               event.cancelBubble = true; event.returnValue = false; menuframe_activate(i); break;
           }
-            
+
     }
   }
 
@@ -138,5 +133,4 @@
     document.onkeydown = menuframe_keydown;
   }
   doAttachEvent(window, 'load', menuframe_setup);
-  
- 
\ No newline at end of file
+
diff --git a/oem/firstvoices/windows/src/xml/menu.css b/oem/firstvoices/windows/src/xml/menu.css
index bf1dcdba94..b1b7bec882 100644
--- a/oem/firstvoices/windows/src/xml/menu.css
+++ b/oem/firstvoices/windows/src/xml/menu.css
@@ -1,6 +1,6 @@
 /* Popup menu styles */
 .menu
-{ 
+{
   white-space: nowrap;
   position: absolute;
   display: block;
@@ -9,22 +9,23 @@
   border: solid 1px #ACA899;
   font-size: 11px;
   padding: 4px;
-  background-image: url("menugrey.gif"); 
-  background-repeat: repeat-y; 
+  background-image: url("menugrey.gif");
+  background-repeat: repeat-y;
   background-position: 0 0;
   width: 220px;
   z-index: 100;
 }
 
 .menuitem
-{ 
-  display: block; 
-  padding: 4px 4px 4px 28px; 
+{
+  display: block;
+  padding: 4px 4px 4px 28px;
   margin: 1px;
+  cursor: default;
 }
- 
+
 .hover
-{ 
+{
   color: #000000;
   background: #FFE3DB;
   border: solid 1px #DB704F;
@@ -32,6 +33,21 @@
 }
 
 .down
-{ 
-  background: #DB704F; 
+{
+  background: #DB704F;
+}
+
+#menubackground {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(64,64,64,0.1);
+  display: none;
+}
+
+#menubackground.show {
+  display: block;
+  z-index: 99;
 }
diff --git a/oem/firstvoices/windows/src/xml/menu.js b/oem/firstvoices/windows/src/xml/menu.js
index 5016042016..b120341d4c 100644
--- a/oem/firstvoices/windows/src/xml/menu.js
+++ b/oem/firstvoices/windows/src/xml/menu.js
@@ -55,12 +55,15 @@ var menudiv = null, global_menu_elem_name = null;
 
     q = menudiv.children[0];
     q.focus();
+
+    document.getElementById('menubackground').className = 'show';
   }
 
   function HideMenu() {
     if(event.srcElement != menudiv) {
       global_menu_elem_name = null;
       menudiv.style.visibility='hidden';
+      document.getElementById('menubackground').className = '';
       try {
         if(lastfocus_item != null) lastfocus_item.focus();
       } catch(e) {
diff --git a/oem/firstvoices/windows/src/xml/onlineupdate.xsl b/oem/firstvoices/windows/src/xml/onlineupdate.xsl
index 2eeb2fbf23..931c0c106b 100644
--- a/oem/firstvoices/windows/src/xml/onlineupdate.xsl
+++ b/oem/firstvoices/windows/src/xml/onlineupdate.xsl
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8" ?>
-  
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:include href="elements.xsl"/>
 
   <xsl:variable name="dialoginfo_onlineupdate" select="$dialoginfo/Dialog[@Id='OnlineUpdate'][1]" />
-  
+
   <xsl:template match="/">
 
 <html>
 <head>
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
+  <script src="/app/sentry.bundle.min.js"></script>
+  <script src="/app/sentry.init.js"></script>
 <title><xsl:value-of select="$locale/string[@name='S_Update_Title']"/></title>
 <style type="text/css">
 
-* { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; }
+* { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI"; }
 
 html { overflow: hidden }
 
@@ -21,12 +24,12 @@ body {
  font-size:		11px;
  text-align:	justify;
  margin:	0px;
- width:         482px;
+ width:         469px;
  overflow: hidden;
 }
 
 .button {
- font: 11px <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />;
+ font: 11px <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI";
  height: 23px; width: 128px;
 }
 
@@ -36,17 +39,17 @@ body {
   .shieldButton {  }
   .shieldButton img { display: inline !important; }
 </xsl:if>
-  
+
 div {
-  font: 13.3px <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />
+  font: 13.3px <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI";
 }
 
-#border { 
+#border {
   border: none;
-  width: <xsl:value-of select="$dialoginfo_onlineupdate/@Width - 2" />px; 
-  height: <xsl:value-of select="$dialoginfo_onlineupdate/@Height - 2" />px;
+  width: 469px;
+  height: 375px;
   }
-  
+
 #header { background: white;  }
 
 #content {
@@ -59,10 +62,10 @@ div {
   bottom: 10px;
   text-align: center;
   width: 100%;
-}  
+}
 
 #UpdateContainer {
-	height: 76px;
+	height: 220px;
 	overflow-y: auto;
 	border: solid 1px gray;
 	margin: 12px 8px;
@@ -86,7 +89,6 @@ div {
 					{
 						if(event.keyCode == 13 <![CDATA[&&]]> (!event.srcElement.type || event.srcElement.type != 'button') <![CDATA[&&]]> !document.getElementById('submitButton').disabled)
 						{
-              
 							event.cancelBubble = true; event.returnValue = false;
 							location.href='keyman:installnow';
 						}
@@ -96,7 +98,6 @@ div {
 							location.href='keyman:installlater';
 						}
 					}
-          
           function updateTick(id)
           {
             enableControls();
@@ -105,7 +106,6 @@ div {
             if(e.checked) location.href='keyman:tickupdate?id='+id;
             else location.href='keyman:untickupdate?id='+id;
           }
-          
           function enableControls()
           {
             var e = false, admin = false;
@@ -131,9 +131,7 @@ div {
 <body onload="javascript:enableControls()">
 <div id="border">
   <div id="header">
-    <img alt='Keyman'>
-      <xsl:attribute name='src'><xsl:value-of select='/Keyman/templatepath' />keyman-desktop.png</xsl:attribute>
-    </img>  
+    <img alt='Keyman' src="/app/keyman-desktop.png" />
   </div>
   <div id='content'>
     <div id="NewVersionAvailable"><xsl:copy-of select="($locale/string[@name='S_Update_NewVersionAvailable'])[1]" /></div>
@@ -152,9 +150,7 @@ div {
   </div>
   <div id="footer">
     <button type="submit" id="submitButton" class='button shieldButton' onclick="javascript:location.href='keyman:installnow'">
-      <img alt="" style="vertical-align:middle; width: 16px; margin: 0 4px 0 2px;">
-        <xsl:attribute name="src"><xsl:value-of select='/Keyman/templatepath' />shield.png</xsl:attribute>
-      </img> 
+      <img alt="" style="vertical-align:middle; width: 16px; margin: 0 4px 0 2px;" src="/app/shield.png" />
       <xsl:value-of select="$locale/string[@name='S_Update_Button_InstallNow']"/>
     </button>
     &#160;
@@ -227,4 +223,4 @@ div {
     </xsl:choose>
     </tr>
   </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/proxyconfiguration.xsl b/oem/firstvoices/windows/src/xml/proxyconfiguration.xsl
index e044d1f0c2..89f631063c 100644
--- a/oem/firstvoices/windows/src/xml/proxyconfiguration.xsl
+++ b/oem/firstvoices/windows/src/xml/proxyconfiguration.xsl
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8" ?>
-  
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:include href="elements.xsl"/>
 
   <xsl:variable name="dialoginfo_proxyconfiguration" select="$dialoginfo/Dialog[@Id='ProxyConfiguration'][1]" />
-  
+
   <xsl:template match="/">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
+  <script src="/app/sentry.bundle.min.js"></script>
+  <script src="/app/sentry.init.js"></script>
 <title><xsl:value-of select="$locale/string[@name='S_ProxyConfiguration_Title']"/></title>
 <style type="text/css">
-  * { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; }
+  * { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI"; }
 
 html {
- font-size:		 11px;
+ font-size:		 13px;
  text-align:	justify;
  margin: 	 0px;
  width:    <xsl:value-of select="$dialoginfo_proxyconfiguration/@Width" />px;
@@ -24,7 +26,7 @@ html {
 }
 
 body {
- font-size:	 	 11px;
+ font-size:	 	 13px;
  text-align:	justify;
  margin:	 0px;
  width:    <xsl:value-of select="$dialoginfo_proxyconfiguration/@Width" />px;
@@ -38,15 +40,14 @@ body {
 }
 
 div {
-  font-size: 13.3px;
+  font-size: 13px;
 }
 
-#border { 
-  border: 1px solid #AD4A29; 
-  width: <xsl:value-of select="$dialoginfo_proxyconfiguration/@Width - 2" />px; 
+#border {
+  border: 1px solid #AD4A29;
+  width: <xsl:value-of select="$dialoginfo_proxyconfiguration/@Width - 2" />px;
   height: <xsl:value-of select="$dialoginfo_proxyconfiguration/@Height - 2" />px;
   }
-  
 #content {
  padding: 10px;
  text-align: center;
@@ -58,7 +59,7 @@ div {
   height: 36px;
   text-align: center;
   width: 100%;
-} 
+}
 
 .form { position: absolute; display: block; vertical-align: middle; height: 24px; }
 #ProxyServerLabel { left: 16px; top: 20px;}
@@ -85,7 +86,7 @@ div {
       '&username='+document.getElementById('Form_ProxyUsername').value+
       '&password='+document.getElementById('Form_ProxyPassword').value;
   }
-	
+
 	document.onkeydown = function()
 	{
 		if(event.keyCode == 13 && (!event.srcElement.type || event.srcElement.type != 'button')) ok();
@@ -102,11 +103,11 @@ div {
   <div id='content'>
     <div class='form' id="ProxyServerLabel"><xsl:value-of select="$locale/string[@name='S_ProxyConfiguration_Server']" /></div>
     <div class='form' id="ProxyServer">
-      <input type="text" id="Form_ProxyServer">
+      <input autofocus="autofocus" type="text" id="Form_ProxyServer">
         <xsl:attribute name="value"><xsl:value-of select="/Keyman/Proxy/Server"/></xsl:attribute>
       </input>
     </div>
-    
+
     <div class='form' id="ProxyPortLabel"><xsl:value-of select="$locale/string[@name='S_ProxyConfiguration_Port']" /></div>
     <div class='form' id="ProxyPort">
       <input type="text" id="Form_ProxyPort">
@@ -127,7 +128,7 @@ div {
         <xsl:attribute name="value"><xsl:value-of select="/Keyman/Proxy/Password"/></xsl:attribute>
       </input>
     </div>
-  </div>    
+  </div>
   <div id="footer">
     <input type="submit" class='button' onclick="javascript:ok()">
       <xsl:attribute name="value"><xsl:value-of select="$locale/string[@name='S_Button_OK']"/></xsl:attribute>
@@ -140,4 +141,4 @@ div {
 </body>
 </html>
     </xsl:template>
-  </xsl:stylesheet>
\ No newline at end of file
+  </xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/qrcode.min.js b/oem/firstvoices/windows/src/xml/qrcode.min.js
new file mode 100644
index 0000000000..993e88f396
--- /dev/null
+++ b/oem/firstvoices/windows/src/xml/qrcode.min.js
@@ -0,0 +1 @@
+var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c<a.length&&0==a[c];)c++;this.num=new Array(a.length-c+b);for(var d=0;d<a.length-c;d++)this.num[d]=a[d+c]}function j(a,b){this.totalCount=a,this.dataCount=b}function k(){this.buffer=[],this.length=0}function m(){return"undefined"!=typeof CanvasRenderingContext2D}function n(){var a=!1,b=navigator.userAgent;return/android/i.test(b)&&(a=!0,aMat=b.toString().match(/android ([0-9]\.[0-9])/i),aMat&&aMat[1]&&(a=parseFloat(aMat[1]))),a}function r(a,b){for(var c=1,e=s(a),f=0,g=l.length;g>=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=new Array(this.moduleCount);for(var e=0;e<this.moduleCount;e++)this.modules[d][e]=null}this.setupPositionProbePattern(0,0),this.setupPositionProbePattern(this.moduleCount-7,0),this.setupPositionProbePattern(0,this.moduleCount-7),this.setupPositionAdjustPattern(),this.setupTimingPattern(),this.setupTypeInfo(a,c),this.typeNumber>=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f<this.modules.length;f++)for(var g=f*e,h=0;h<this.modules[f].length;h++){var i=h*e,j=this.modules[f][h];j&&(d.beginFill(0,100),d.moveTo(i,g),d.lineTo(i+e,g),d.lineTo(i+e,g+e),d.lineTo(i,g+e),d.endFill())}return d},setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(var b=8;b<this.moduleCount-8;b++)null==this.modules[6][b]&&(this.modules[6][b]=0==b%2)},setupPositionAdjustPattern:function(){for(var a=f.getPatternPosition(this.typeNumber),b=0;b<a.length;b++)for(var c=0;c<a.length;c++){var d=a[b],e=a[c];if(null==this.modules[d][e])for(var g=-2;2>=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g<a.length&&(j=1==(1&a[g]>>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h<d.length;h++){var i=d[h];g.put(i.mode,4),g.put(i.getLength(),f.getLengthInBits(i.mode,a)),i.write(g)}for(var l=0,h=0;h<e.length;h++)l+=e[h].dataCount;if(g.getLengthInBits()>8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j<b.length;j++){var k=b[j].dataCount,l=b[j].totalCount-k;d=Math.max(d,k),e=Math.max(e,l),g[j]=new Array(k);for(var m=0;m<g[j].length;m++)g[j][m]=255&a.buffer[m+c];c+=k;var n=f.getErrorCorrectPolynomial(l),o=new i(g[j],n.getLength()-1),p=o.mod(n);h[j]=new Array(n.getLength()-1);for(var m=0;m<h[j].length;m++){var q=m+p.getLength()-h[j].length;h[j][m]=q>=0?p.get(q):0}}for(var r=0,m=0;m<b.length;m++)r+=b[m].totalCount;for(var s=new Array(r),t=0,m=0;d>m;m++)for(var j=0;j<b.length;j++)m<g[j].length&&(s[t++]=g[j][m]);for(var m=0;e>m;m++)for(var j=0;j<b.length;j++)m<h[j].length&&(s[t++]=h[j][m]);return s};for(var c={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},d={L:1,M:0,Q:3,H:2},e={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},f={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var b=a<<10;f.getBCHDigit(b)-f.getBCHDigit(f.G15)>=0;)b^=f.G15<<f.getBCHDigit(b)-f.getBCHDigit(f.G15);return(a<<10|b)^f.G15_MASK},getBCHTypeNumber:function(a){for(var b=a<<12;f.getBCHDigit(b)-f.getBCHDigit(f.G18)>=0;)b^=f.G18<<f.getBCHDigit(b)-f.getBCHDigit(f.G18);return a<<12|b},getBCHDigit:function(a){for(var b=0;0!=a;)b++,a>>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<<h;for(var h=8;256>h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;c<this.getLength();c++)for(var d=0;d<a.getLength();d++)b[c+d]^=g.gexp(g.glog(this.get(c))+g.glog(a.get(d)));return new i(b,0)},mod:function(a){if(this.getLength()-a.getLength()<0)return this;for(var b=g.glog(this.get(0))-g.glog(a.get(0)),c=new Array(this.getLength()),d=0;d<this.getLength();d++)c[d]=this.get(d);for(var d=0;d<a.getLength();d++)c[d]^=g.gexp(g.glog(a.get(d))+b);return new i(c,0).mod(a)}},j.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],j.getRSBlocks=function(a,b){var c=j.getRsBlockTable(a,b);if(void 0==c)throw new Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+b);for(var d=c.length/3,e=[],f=0;d>f;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=['<table style="border:0;border-collapse:collapse;">'],h=0;d>h;h++){g.push("<tr>");for(var i=0;d>i;i++)g.push('<td style="border:0;border-collapse:collapse;padding:0;margin:0;width:'+e+"px;height:"+f+"px;background-color:"+(a.isDark(h,i)?b.colorDark:b.colorLight)+';"></td>');g.push("</tr>")}g.push("</table>"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}();
\ No newline at end of file
diff --git a/oem/firstvoices/windows/src/xml/sentry.bundle.min.js b/oem/firstvoices/windows/src/xml/sentry.bundle.min.js
new file mode 100644
index 0000000000..262b934489
--- /dev/null
+++ b/oem/firstvoices/windows/src/xml/sentry.bundle.min.js
@@ -0,0 +1,3 @@
+/*! @sentry/browser 5.15.0 (3ce26d5c) | https://github.com/getsentry/sentry-javascript */
+var Sentry=function(n){var t=function(n,r){return(t=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(n,t){n.__proto__=t}||function(n,t){for(var r in t)t.hasOwnProperty(r)&&(n[r]=t[r])})(n,r)};function r(n,r){function e(){this.constructor=n}t(n,r),n.prototype=null===r?Object.create(r):(e.prototype=r.prototype,new e)}var e=function(){return(e=Object.assign||function(n){for(var t,r=1,e=arguments.length;r<e;r++)for(var i in t=arguments[r])Object.prototype.hasOwnProperty.call(t,i)&&(n[i]=t[i]);return n}).apply(this,arguments)};function i(n){var t="function"==typeof Symbol&&n[Symbol.iterator],r=0;return t?t.call(n):{next:function(){return n&&r>=n.length&&(n=void 0),{value:n&&n[r++],done:!n}}}}function o(n,t){var r="function"==typeof Symbol&&n[Symbol.iterator];if(!r)return n;var e,i,o=r.call(n),u=[];try{for(;(void 0===t||t-- >0)&&!(e=o.next()).done;)u.push(e.value)}catch(n){i={error:n}}finally{try{e&&!e.done&&(r=o.return)&&r.call(o)}finally{if(i)throw i.error}}return u}function u(){for(var n=[],t=0;t<arguments.length;t++)n=n.concat(o(arguments[t]));return n}var c,a,s,f;!function(n){n[n.None=0]="None",n[n.Error=1]="Error",n[n.Debug=2]="Debug",n[n.Verbose=3]="Verbose"}(c||(c={})),(a=n.Severity||(n.Severity={})).Fatal="fatal",a.Error="error",a.Warning="warning",a.Log="log",a.Info="info",a.Debug="debug",a.Critical="critical",function(n){n.fromString=function(t){switch(t){case"debug":return n.Debug;case"info":return n.Info;case"warn":case"warning":return n.Warning;case"error":return n.Error;case"fatal":return n.Fatal;case"critical":return n.Critical;case"log":default:return n.Log}}}(n.Severity||(n.Severity={})),function(n){n.Ok="ok",n.DeadlineExceeded="deadline_exceeded",n.Unauthenticated="unauthenticated",n.PermissionDenied="permission_denied",n.NotFound="not_found",n.ResourceExhausted="resource_exhausted",n.InvalidArgument="invalid_argument",n.Unimplemented="unimplemented",n.Unavailable="unavailable",n.InternalError="internal_error",n.UnknownError="unknown_error",n.Cancelled="cancelled",n.AlreadyExists="already_exists",n.FailedPrecondition="failed_precondition",n.Aborted="aborted",n.OutOfRange="out_of_range",n.DataLoss="data_loss"}(s||(s={})),function(n){n.fromHttpCode=function(t){if(t<400)return n.Ok;if(t>=400&&t<500)switch(t){case 401:return n.Unauthenticated;case 403:return n.PermissionDenied;case 404:return n.NotFound;case 409:return n.AlreadyExists;case 413:return n.FailedPrecondition;case 429:return n.ResourceExhausted;default:return n.InvalidArgument}if(t>=500&&t<600)switch(t){case 501:return n.Unimplemented;case 503:return n.Unavailable;case 504:return n.DeadlineExceeded;default:return n.InternalError}return n.UnknownError}}(s||(s={})),(f=n.Status||(n.Status={})).Unknown="unknown",f.Skipped="skipped",f.Success="success",f.RateLimit="rate_limit",f.Invalid="invalid",f.Failed="failed",function(n){n.fromHttpCode=function(t){return t>=200&&t<300?n.Success:429===t?n.RateLimit:t>=400&&t<500?n.Invalid:t>=500?n.Failed:n.Unknown}}(n.Status||(n.Status={}));var h=Object.setPrototypeOf||({__proto__:[]}instanceof Array?function(n,t){return n.__proto__=t,n}:function(n,t){for(var r in t)n.hasOwnProperty(r)||(n[r]=t[r]);return n});var v=function(n){function t(t){var r=this.constructor,e=n.call(this,t)||this;return e.message=t,e.name=r.prototype.constructor.name,h(e,r.prototype),e}return r(t,n),t}(Error);function l(n){switch(Object.prototype.toString.call(n)){case"[object Error]":case"[object Exception]":case"[object DOMException]":return!0;default:return x(n,Error)}}function d(n){return"[object ErrorEvent]"===Object.prototype.toString.call(n)}function p(n){return"[object DOMError]"===Object.prototype.toString.call(n)}function y(n){return"[object String]"===Object.prototype.toString.call(n)}function m(n){return null===n||"object"!=typeof n&&"function"!=typeof n}function b(n){return"[object Object]"===Object.prototype.toString.call(n)}function w(n){return"undefined"!=typeof Event&&x(n,Event)}function g(n){return"undefined"!=typeof Element&&x(n,Element)}function E(n){return Boolean(n&&n.then&&"function"==typeof n.then)}function x(n,t){try{return n instanceof t}catch(n){return!1}}function j(n,t){return void 0===t&&(t=0),"string"!=typeof n||0===t?n:n.length<=t?n:n.substr(0,t)+"..."}function k(n,t){if(!Array.isArray(n))return"";for(var r=[],e=0;e<n.length;e++){var i=n[e];try{r.push(String(i))}catch(n){r.push("[value cannot be serialized]")}}return r.join(t)}function _(n,t){return r=t,"[object RegExp]"===Object.prototype.toString.call(r)?t.test(n):"string"==typeof t&&-1!==n.indexOf(t);var r}function S(n,t){return n.require(t)}function O(){return"[object process]"===Object.prototype.toString.call("undefined"!=typeof process?process:0)}var T={};function D(){return O()?global:"undefined"!=typeof window?window:"undefined"!=typeof self?self:T}function R(){var n=D(),t=n.crypto||n.msCrypto;if(void 0!==t&&t.getRandomValues){var r=new Uint16Array(8);t.getRandomValues(r),r[3]=4095&r[3]|16384,r[4]=16383&r[4]|32768;var e=function(n){for(var t=n.toString(16);t.length<4;)t="0"+t;return t};return e(r[0])+e(r[1])+e(r[2])+e(r[3])+e(r[4])+e(r[5])+e(r[6])+e(r[7])}return"xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx".replace(/[xy]/g,function(n){var t=16*Math.random()|0;return("x"===n?t:3&t|8).toString(16)})}function N(n){if(!n)return{};var t=n.match(/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/);if(!t)return{};var r=t[6]||"",e=t[8]||"";return{host:t[4],path:t[5],protocol:t[2],relative:t[5]+r+e}}function I(n){if(n.message)return n.message;if(n.exception&&n.exception.values&&n.exception.values[0]){var t=n.exception.values[0];return t.type&&t.value?t.type+": "+t.value:t.type||t.value||n.event_id||"<unknown>"}return n.event_id||"<unknown>"}function C(n){var t=D();if(!("console"in t))return n();var r=t.console,e={};["debug","info","warn","error","log","assert"].forEach(function(n){n in t.console&&r[n].__sentry_original__&&(e[n]=r[n],r[n]=r[n].__sentry_original__)});var i=n();return Object.keys(e).forEach(function(n){r[n]=e[n]}),i}function M(n,t,r){n.exception=n.exception||{},n.exception.values=n.exception.values||[],n.exception.values[0]=n.exception.values[0]||{},n.exception.values[0].value=n.exception.values[0].value||t||"",n.exception.values[0].type=n.exception.values[0].type||r||"Error"}function A(n,t){void 0===t&&(t={});try{n.exception.values[0].mechanism=n.exception.values[0].mechanism||{},Object.keys(t).forEach(function(r){n.exception.values[0].mechanism[r]=t[r]})}catch(n){}}function U(n){try{for(var t=n,r=[],e=0,i=0,o=" > ".length,u=void 0;t&&e++<5&&!("html"===(u=q(t))||e>1&&i+r.length*o+u.length>=80);)r.push(u),i+=u.length,t=t.parentNode;return r.reverse().join(" > ")}catch(n){return"<unknown>"}}function q(n){var t,r,e,i,o,u=n,c=[];if(!u||!u.tagName)return"";if(c.push(u.tagName.toLowerCase()),u.id&&c.push("#"+u.id),(t=u.className)&&y(t))for(r=t.split(/\s+/),o=0;o<r.length;o++)c.push("."+r[o]);var a=["type","name","title","alt"];for(o=0;o<a.length;o++)e=a[o],(i=u.getAttribute(e))&&c.push("["+e+'="'+i+'"]');return c.join("")}var L=Date.now(),H=0,P={now:function(){var n=Date.now()-L;return n<H&&(n=H),H=n,n},timeOrigin:L},F=function(){if(O())try{return S(module,"perf_hooks").performance}catch(n){return P}return D().performance&&void 0===performance.timeOrigin&&(performance.timeOrigin=performance.timing&&performance.timing.navigationStart||L),D().performance||P}();function W(){return(F.timeOrigin+F.now())/1e3}var X=6e4;function B(n,t){if(!t)return X;var r=parseInt(""+t,10);if(!isNaN(r))return 1e3*r;var e=Date.parse(""+t);return isNaN(e)?X:e-n}var $="<anonymous>";function G(n){try{return n&&"function"==typeof n&&n.name||$}catch(n){return $}}var J=D(),z="Sentry Logger ",V=function(){function n(){this.t=!1}return n.prototype.disable=function(){this.t=!1},n.prototype.enable=function(){this.t=!0},n.prototype.log=function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];this.t&&C(function(){J.console.log(z+"[Log]: "+n.join(" "))})},n.prototype.warn=function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];this.t&&C(function(){J.console.warn(z+"[Warn]: "+n.join(" "))})},n.prototype.error=function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];this.t&&C(function(){J.console.error(z+"[Error]: "+n.join(" "))})},n}();J.__SENTRY__=J.__SENTRY__||{};var K,Q=J.__SENTRY__.logger||(J.__SENTRY__.logger=new V),Y=function(){function n(){this.i="function"==typeof WeakSet,this.o=this.i?new WeakSet:[]}return n.prototype.memoize=function(n){if(this.i)return!!this.o.has(n)||(this.o.add(n),!1);for(var t=0;t<this.o.length;t++){if(this.o[t]===n)return!0}return this.o.push(n),!1},n.prototype.unmemoize=function(n){if(this.i)this.o.delete(n);else for(var t=0;t<this.o.length;t++)if(this.o[t]===n){this.o.splice(t,1);break}},n}();function Z(n,t,r){if(t in n){var e=n[t],i=r(e);if("function"==typeof i)try{i.prototype=i.prototype||{},Object.defineProperties(i,{__sentry_original__:{enumerable:!1,value:e}})}catch(n){}n[t]=i}}function nn(n){if(l(n)){var t=n,r={message:t.message,name:t.name,stack:t.stack};for(var e in t)Object.prototype.hasOwnProperty.call(t,e)&&(r[e]=t[e]);return r}if(w(n)){var i=n,o={};o.type=i.type;try{o.target=g(i.target)?U(i.target):Object.prototype.toString.call(i.target)}catch(n){o.target="<unknown>"}try{o.currentTarget=g(i.currentTarget)?U(i.currentTarget):Object.prototype.toString.call(i.currentTarget)}catch(n){o.currentTarget="<unknown>"}for(var e in"undefined"!=typeof CustomEvent&&x(n,CustomEvent)&&(o.detail=i.detail),i)Object.prototype.hasOwnProperty.call(i,e)&&(o[e]=i);return o}return n}function tn(n){return function(n){return~-encodeURI(n).split(/%..|./).length}(JSON.stringify(n))}function rn(n,t,r){void 0===t&&(t=3),void 0===r&&(r=102400);var e=un(n,t);return tn(e)>r?rn(n,t-1,r):e}function en(n,t){return"domain"===t&&n&&"object"==typeof n&&n.u?"[Domain]":"domainEmitter"===t?"[DomainEmitter]":"undefined"!=typeof global&&n===global?"[Global]":"undefined"!=typeof window&&n===window?"[Window]":"undefined"!=typeof document&&n===document?"[Document]":b(r=n)&&"nativeEvent"in r&&"preventDefault"in r&&"stopPropagation"in r?"[SyntheticEvent]":"number"==typeof n&&n!=n?"[NaN]":void 0===n?"[undefined]":"function"==typeof n?"[Function: "+G(n)+"]":n;var r}function on(n,t,r,e){if(void 0===r&&(r=1/0),void 0===e&&(e=new Y),0===r)return function(n){var t=Object.prototype.toString.call(n);if("string"==typeof n)return n;if("[object Object]"===t)return"[Object]";if("[object Array]"===t)return"[Array]";var r=en(n);return m(r)?r:t}(t);if(null!=t&&"function"==typeof t.toJSON)return t.toJSON();var i=en(t,n);if(m(i))return i;var o=nn(t),u=Array.isArray(t)?[]:{};if(e.memoize(t))return"[Circular ~]";for(var c in o)Object.prototype.hasOwnProperty.call(o,c)&&(u[c]=on(c,o[c],r-1,e));return e.unmemoize(t),u}function un(n,t){try{return JSON.parse(JSON.stringify(n,function(n,r){return on(n,r,t)}))}catch(n){return"**non-serializable**"}}function cn(n,t){void 0===t&&(t=40);var r=Object.keys(nn(n));if(r.sort(),!r.length)return"[object has no keys]";if(r[0].length>=t)return j(r[0],t);for(var e=r.length;e>0;e--){var i=r.slice(0,e).join(", ");if(!(i.length>t))return e===r.length?i:j(i,t)}return""}!function(n){n.PENDING="PENDING",n.RESOLVED="RESOLVED",n.REJECTED="REJECTED"}(K||(K={}));var an=function(){function n(n){var t=this;this.s=K.PENDING,this.h=[],this.v=function(n){t.l(K.RESOLVED,n)},this.p=function(n){t.l(K.REJECTED,n)},this.l=function(n,r){t.s===K.PENDING&&(E(r)?r.then(t.v,t.p):(t.s=n,t.m=r,t.g()))},this.j=function(n){t.h=t.h.concat(n),t.g()},this.g=function(){t.s!==K.PENDING&&(t.s===K.REJECTED?t.h.forEach(function(n){n.onrejected&&n.onrejected(t.m)}):t.h.forEach(function(n){n.onfulfilled&&n.onfulfilled(t.m)}),t.h=[])};try{n(this.v,this.p)}catch(n){this.p(n)}}return n.prototype.toString=function(){return"[object SyncPromise]"},n.resolve=function(t){return new n(function(n){n(t)})},n.reject=function(t){return new n(function(n,r){r(t)})},n.all=function(t){return new n(function(r,e){if(Array.isArray(t))if(0!==t.length){var i=t.length,o=[];t.forEach(function(t,u){n.resolve(t).then(function(n){o[u]=n,0===(i-=1)&&r(o)}).then(null,e)})}else r([]);else e(new TypeError("Promise.all requires an array as input."))})},n.prototype.then=function(t,r){var e=this;return new n(function(n,i){e.j({onfulfilled:function(r){if(t)try{return void n(t(r))}catch(n){return void i(n)}else n(r)},onrejected:function(t){if(r)try{return void n(r(t))}catch(n){return void i(n)}else i(t)}})})},n.prototype.catch=function(n){return this.then(function(n){return n},n)},n.prototype.finally=function(t){var r=this;return new n(function(n,e){var i,o;return r.then(function(n){o=!1,i=n,t&&t()},function(n){o=!0,i=n,t&&t()}).then(function(){o?e(i):n(i)})})},n}(),sn=function(){function n(n){this.k=n,this._=[]}return n.prototype.isReady=function(){return void 0===this.k||this.length()<this.k},n.prototype.add=function(n){var t=this;return this.isReady()?(-1===this._.indexOf(n)&&this._.push(n),n.then(function(){return t.remove(n)}).then(null,function(){return t.remove(n).then(null,function(){})}),n):an.reject(new v("Not adding Promise due to buffer limit reached."))},n.prototype.remove=function(n){return this._.splice(this._.indexOf(n),1)[0]},n.prototype.length=function(){return this._.length},n.prototype.drain=function(n){var t=this;return new an(function(r){var e=setTimeout(function(){n&&n>0&&r(!1)},n);an.all(t._).then(function(){clearTimeout(e),r(!0)}).then(null,function(){r(!0)})})},n}();function fn(){if(!("fetch"in D()))return!1;try{return new Headers,new Request(""),new Response,!0}catch(n){return!1}}function hn(n){return n&&/^function fetch\(\)\s+\{\s+\[native code\]\s+\}$/.test(n.toString())}function vn(){if(!fn())return!1;try{return new Request("_",{referrerPolicy:"origin"}),!0}catch(n){return!1}}var ln,dn=D(),pn={},yn={};function mn(n){if(!yn[n])switch(yn[n]=!0,n){case"console":!function(){if(!("console"in dn))return;["debug","info","warn","error","log","assert"].forEach(function(n){n in dn.console&&Z(dn.console,n,function(t){return function(){for(var r=[],e=0;e<arguments.length;e++)r[e]=arguments[e];wn("console",{args:r,level:n}),t&&Function.prototype.apply.call(t,dn.console,r)}})})}();break;case"dom":!function(){if(!("document"in dn))return;dn.document.addEventListener("click",Sn("click",wn.bind(null,"dom")),!1),dn.document.addEventListener("keypress",On(wn.bind(null,"dom")),!1),["EventTarget","Node"].forEach(function(n){var t=dn[n]&&dn[n].prototype;t&&t.hasOwnProperty&&t.hasOwnProperty("addEventListener")&&(Z(t,"addEventListener",function(n){return function(t,r,e){return r&&r.handleEvent?("click"===t&&Z(r,"handleEvent",function(n){return function(t){return Sn("click",wn.bind(null,"dom"))(t),n.call(this,t)}}),"keypress"===t&&Z(r,"handleEvent",function(n){return function(t){return On(wn.bind(null,"dom"))(t),n.call(this,t)}})):("click"===t&&Sn("click",wn.bind(null,"dom"),!0)(this),"keypress"===t&&On(wn.bind(null,"dom"))(this)),n.call(this,t,r,e)}}),Z(t,"removeEventListener",function(n){return function(t,r,e){var i=r;try{i=i&&(i.__sentry_wrapped__||i)}catch(n){}return n.call(this,t,i,e)}}))})}();break;case"xhr":!function(){if(!("XMLHttpRequest"in dn))return;var n=XMLHttpRequest.prototype;Z(n,"open",function(n){return function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var e=t[1];return this.__sentry_xhr__={method:y(t[0])?t[0].toUpperCase():t[0],url:t[1]},y(e)&&"POST"===this.__sentry_xhr__.method&&e.match(/sentry_key/)&&(this.__sentry_own_request__=!0),n.apply(this,t)}}),Z(n,"send",function(n){return function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var i=this,o={args:t,startTimestamp:Date.now(),xhr:i};return wn("xhr",e({},o)),i.addEventListener("readystatechange",function(){if(4===i.readyState){try{i.__sentry_xhr__&&(i.__sentry_xhr__.status_code=i.status)}catch(n){}wn("xhr",e({},o,{endTimestamp:Date.now()}))}}),n.apply(this,t)}})}();break;case"fetch":!function(){if(!function(){if(!fn())return!1;var n=D();if(hn(n.fetch))return!0;var t=!1,r=n.document;if(r)try{var e=r.createElement("iframe");e.hidden=!0,r.head.appendChild(e),e.contentWindow&&e.contentWindow.fetch&&(t=hn(e.contentWindow.fetch)),r.head.removeChild(e)}catch(n){Q.warn("Could not create sandbox iframe for pure fetch check, bailing to window.fetch: ",n)}return t}())return;Z(dn,"fetch",function(n){return function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var i={args:t,fetchData:{method:gn(t),url:En(t)},startTimestamp:Date.now()};return wn("fetch",e({},i)),n.apply(dn,t).then(function(n){return wn("fetch",e({},i,{endTimestamp:Date.now(),response:n})),n},function(n){throw wn("fetch",e({},i,{endTimestamp:Date.now(),error:n})),n})}})}();break;case"history":!function(){if(n=D(),t=n.chrome,r=t&&t.app&&t.app.runtime,e="history"in n&&!!n.history.pushState&&!!n.history.replaceState,r||!e)return;var n,t,r,e;var i=dn.onpopstate;function o(n){return function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var e=t.length>2?t[2]:void 0;if(e){var i=ln,o=String(e);ln=o,wn("history",{from:i,to:o})}return n.apply(this,t)}}dn.onpopstate=function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];var r=dn.location.href,e=ln;if(ln=r,wn("history",{from:e,to:r}),i)return i.apply(this,n)},Z(dn.history,"pushState",o),Z(dn.history,"replaceState",o)}();break;case"error":Tn=dn.onerror,dn.onerror=function(n,t,r,e,i){return wn("error",{column:e,error:i,line:r,msg:n,url:t}),!!Tn&&Tn.apply(this,arguments)};break;case"unhandledrejection":Dn=dn.onunhandledrejection,dn.onunhandledrejection=function(n){return wn("unhandledrejection",n),!Dn||Dn.apply(this,arguments)};break;default:Q.warn("unknown instrumentation type:",n)}}function bn(n){n&&"string"==typeof n.type&&"function"==typeof n.callback&&(pn[n.type]=pn[n.type]||[],pn[n.type].push(n.callback),mn(n.type))}function wn(n,t){var r,e;if(n&&pn[n])try{for(var o=i(pn[n]||[]),u=o.next();!u.done;u=o.next()){var c=u.value;try{c(t)}catch(t){Q.error("Error while triggering instrumentation handler.\nType: "+n+"\nName: "+G(c)+"\nError: "+t)}}}catch(n){r={error:n}}finally{try{u&&!u.done&&(e=o.return)&&e.call(o)}finally{if(r)throw r.error}}}function gn(n){return void 0===n&&(n=[]),"Request"in dn&&x(n[0],Request)&&n[0].method?String(n[0].method).toUpperCase():n[1]&&n[1].method?String(n[1].method).toUpperCase():"GET"}function En(n){return void 0===n&&(n=[]),"string"==typeof n[0]?n[0]:"Request"in dn&&x(n[0],Request)?n[0].url:String(n[0])}var xn,jn,kn=1e3,_n=0;function Sn(n,t,r){return void 0===r&&(r=!1),function(e){xn=void 0,e&&jn!==e&&(jn=e,_n&&clearTimeout(_n),r?_n=setTimeout(function(){t({event:e,name:n})}):t({event:e,name:n}))}}function On(n){return function(t){var r;try{r=t.target}catch(n){return}var e=r&&r.tagName;e&&("INPUT"===e||"TEXTAREA"===e||r.isContentEditable)&&(xn||Sn("input",n)(t),clearTimeout(xn),xn=setTimeout(function(){xn=void 0},kn))}}var Tn=null;var Dn=null;var Rn=/^(?:(\w+):)\/\/(?:(\w+)(?::(\w+))?@)([\w\.-]+)(?::(\d+))?\/(.+)/,Nn=function(){function n(n){"string"==typeof n?this.S(n):this.O(n),this.T()}return n.prototype.toString=function(n){void 0===n&&(n=!1);var t=this,r=t.host,e=t.path,i=t.pass,o=t.port,u=t.projectId;return t.protocol+"://"+t.user+(n&&i?":"+i:"")+"@"+r+(o?":"+o:"")+"/"+(e?e+"/":e)+u},n.prototype.S=function(n){var t=Rn.exec(n);if(!t)throw new v("Invalid Dsn");var r=o(t.slice(1),6),e=r[0],i=r[1],u=r[2],c=void 0===u?"":u,a=r[3],s=r[4],f=void 0===s?"":s,h="",l=r[5],d=l.split("/");d.length>1&&(h=d.slice(0,-1).join("/"),l=d.pop()),this.O({host:a,pass:c,path:h,projectId:l,port:f,protocol:e,user:i})},n.prototype.O=function(n){this.protocol=n.protocol,this.user=n.user,this.pass=n.pass||"",this.host=n.host,this.port=n.port||"",this.path=n.path||"",this.projectId=n.projectId},n.prototype.T=function(){var n=this;if(["protocol","user","host","projectId"].forEach(function(t){if(!n[t])throw new v("Invalid Dsn")}),"http"!==this.protocol&&"https"!==this.protocol)throw new v("Invalid Dsn");if(this.port&&isNaN(parseInt(this.port,10)))throw new v("Invalid Dsn")},n}(),In=function(){function n(){this.D=!1,this.R=[],this.N=[],this.I=[],this.C={},this.M={},this.A={},this.U={}}return n.prototype.addScopeListener=function(n){this.R.push(n)},n.prototype.addEventProcessor=function(n){return this.N.push(n),this},n.prototype.q=function(){var n=this;this.D||(this.D=!0,setTimeout(function(){n.R.forEach(function(t){t(n)}),n.D=!1}))},n.prototype.L=function(n,t,r,i){var o=this;return void 0===i&&(i=0),new an(function(u,c){var a=n[i];if(null===t||"function"!=typeof a)u(t);else{var s=a(e({},t),r);E(s)?s.then(function(t){return o.L(n,t,r,i+1).then(u)}).then(null,c):o.L(n,s,r,i+1).then(u).then(null,c)}})},n.prototype.setUser=function(n){return this.C=n||{},this.q(),this},n.prototype.setTags=function(n){return this.M=e({},this.M,n),this.q(),this},n.prototype.setTag=function(n,t){var r;return this.M=e({},this.M,((r={})[n]=t,r)),this.q(),this},n.prototype.setExtras=function(n){return this.A=e({},this.A,n),this.q(),this},n.prototype.setExtra=function(n,t){var r;return this.A=e({},this.A,((r={})[n]=t,r)),this.q(),this},n.prototype.setFingerprint=function(n){return this.H=n,this.q(),this},n.prototype.setLevel=function(n){return this.P=n,this.q(),this},n.prototype.setTransaction=function(n){return this.F=n,this.W&&(this.W.transaction=n),this.q(),this},n.prototype.setContext=function(n,t){var r;return this.U=e({},this.U,((r={})[n]=t,r)),this.q(),this},n.prototype.setSpan=function(n){return this.W=n,this.q(),this},n.prototype.getSpan=function(){return this.W},n.clone=function(t){var r=new n;return t&&(r.I=u(t.I),r.M=e({},t.M),r.A=e({},t.A),r.U=e({},t.U),r.C=t.C,r.P=t.P,r.W=t.W,r.F=t.F,r.H=t.H,r.N=u(t.N)),r},n.prototype.clear=function(){return this.I=[],this.M={},this.A={},this.C={},this.U={},this.P=void 0,this.F=void 0,this.H=void 0,this.W=void 0,this.q(),this},n.prototype.addBreadcrumb=function(n,t){var r=e({timestamp:W()},n);return this.I=void 0!==t&&t>=0?u(this.I,[r]).slice(-t):u(this.I,[r]),this.q(),this},n.prototype.clearBreadcrumbs=function(){return this.I=[],this.q(),this},n.prototype.X=function(n){n.fingerprint=n.fingerprint?Array.isArray(n.fingerprint)?n.fingerprint:[n.fingerprint]:[],this.H&&(n.fingerprint=n.fingerprint.concat(this.H)),n.fingerprint&&!n.fingerprint.length&&delete n.fingerprint},n.prototype.applyToEvent=function(n,t){return this.A&&Object.keys(this.A).length&&(n.extra=e({},this.A,n.extra)),this.M&&Object.keys(this.M).length&&(n.tags=e({},this.M,n.tags)),this.C&&Object.keys(this.C).length&&(n.user=e({},this.C,n.user)),this.U&&Object.keys(this.U).length&&(n.contexts=e({},this.U,n.contexts)),this.P&&(n.level=this.P),this.F&&(n.transaction=this.F),this.W&&(n.contexts=e({trace:this.W.getTraceContext()},n.contexts)),this.X(n),n.breadcrumbs=u(n.breadcrumbs||[],this.I),n.breadcrumbs=n.breadcrumbs.length>0?n.breadcrumbs:void 0,this.L(u(Cn(),this.N),n,t)},n}();function Cn(){var n=D();return n.__SENTRY__=n.__SENTRY__||{},n.__SENTRY__.globalEventProcessors=n.__SENTRY__.globalEventProcessors||[],n.__SENTRY__.globalEventProcessors}function Mn(n){Cn().push(n)}var An=3,Un=function(){function n(n,t,r){void 0===t&&(t=new In),void 0===r&&(r=An),this.B=r,this.$=[],this.$.push({client:n,scope:t})}return n.prototype.G=function(n){for(var t,r=[],e=1;e<arguments.length;e++)r[e-1]=arguments[e];var i=this.getStackTop();i&&i.client&&i.client[n]&&(t=i.client)[n].apply(t,u(r,[i.scope]))},n.prototype.isOlderThan=function(n){return this.B<n},n.prototype.bindClient=function(n){this.getStackTop().client=n,n&&n.setupIntegrations&&n.setupIntegrations()},n.prototype.pushScope=function(){var n=this.getStack(),t=n.length>0?n[n.length-1].scope:void 0,r=In.clone(t);return this.getStack().push({client:this.getClient(),scope:r}),r},n.prototype.popScope=function(){return void 0!==this.getStack().pop()},n.prototype.withScope=function(n){var t=this.pushScope();try{n(t)}finally{this.popScope()}},n.prototype.getClient=function(){return this.getStackTop().client},n.prototype.getScope=function(){return this.getStackTop().scope},n.prototype.getStack=function(){return this.$},n.prototype.getStackTop=function(){return this.$[this.$.length-1]},n.prototype.captureException=function(n,t){var r=this.J=R(),i=t;if(!t){var o=void 0;try{throw new Error("Sentry syntheticException")}catch(n){o=n}i={originalException:n,syntheticException:o}}return this.G("captureException",n,e({},i,{event_id:r})),r},n.prototype.captureMessage=function(n,t,r){var i=this.J=R(),o=r;if(!r){var u=void 0;try{throw new Error(n)}catch(n){u=n}o={originalException:n,syntheticException:u}}return this.G("captureMessage",n,t,e({},o,{event_id:i})),i},n.prototype.captureEvent=function(n,t){var r=this.J=R();return this.G("captureEvent",n,e({},t,{event_id:r})),r},n.prototype.lastEventId=function(){return this.J},n.prototype.addBreadcrumb=function(n,t){var r=this.getStackTop();if(r.scope&&r.client){var i=r.client.getOptions&&r.client.getOptions()||{},o=i.beforeBreadcrumb,u=void 0===o?null:o,c=i.maxBreadcrumbs,a=void 0===c?100:c;if(!(a<=0)){var s=W(),f=e({timestamp:s},n),h=u?C(function(){return u(f,t)}):f;null!==h&&r.scope.addBreadcrumb(h,Math.min(a,100))}}},n.prototype.setUser=function(n){var t=this.getStackTop();t.scope&&t.scope.setUser(n)},n.prototype.setTags=function(n){var t=this.getStackTop();t.scope&&t.scope.setTags(n)},n.prototype.setExtras=function(n){var t=this.getStackTop();t.scope&&t.scope.setExtras(n)},n.prototype.setTag=function(n,t){var r=this.getStackTop();r.scope&&r.scope.setTag(n,t)},n.prototype.setExtra=function(n,t){var r=this.getStackTop();r.scope&&r.scope.setExtra(n,t)},n.prototype.setContext=function(n,t){var r=this.getStackTop();r.scope&&r.scope.setContext(n,t)},n.prototype.configureScope=function(n){var t=this.getStackTop();t.scope&&t.client&&n(t.scope)},n.prototype.run=function(n){var t=Ln(this);try{n(this)}finally{Ln(t)}},n.prototype.getIntegration=function(n){var t=this.getClient();if(!t)return null;try{return t.getIntegration(n)}catch(t){return Q.warn("Cannot retrieve integration "+n.id+" from the current Hub"),null}},n.prototype.startSpan=function(n,t){return void 0===t&&(t=!1),this.V("startSpan",n,t)},n.prototype.traceHeaders=function(){return this.V("traceHeaders")},n.prototype.V=function(n){for(var t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r];var e=qn().__SENTRY__;if(e&&e.extensions&&"function"==typeof e.extensions[n])return e.extensions[n].apply(this,t);Q.warn("Extension method "+n+" couldn't be found, doing nothing.")},n}();function qn(){var n=D();return n.__SENTRY__=n.__SENTRY__||{extensions:{},hub:void 0},n}function Ln(n){var t=qn(),r=Fn(t);return Wn(t,n),r}function Hn(){var n=qn();return Pn(n)&&!Fn(n).isOlderThan(An)||Wn(n,new Un),O()?function(n){try{var t=S(module,"domain"),r=t.active;if(!r)return Fn(n);if(!Pn(r)||Fn(r).isOlderThan(An)){var e=Fn(n).getStackTop();Wn(r,new Un(e.client,In.clone(e.scope)))}return Fn(r)}catch(t){return Fn(n)}}(n):Fn(n)}function Pn(n){return!!(n&&n.__SENTRY__&&n.__SENTRY__.hub)}function Fn(n){return n&&n.__SENTRY__&&n.__SENTRY__.hub?n.__SENTRY__.hub:(n.__SENTRY__=n.__SENTRY__||{},n.__SENTRY__.hub=new Un,n.__SENTRY__.hub)}function Wn(n,t){return!!n&&(n.__SENTRY__=n.__SENTRY__||{},n.__SENTRY__.hub=t,!0)}function Xn(n){for(var t=[],r=1;r<arguments.length;r++)t[r-1]=arguments[r];var e=Hn();if(e&&e[n])return e[n].apply(e,u(t));throw new Error("No hub defined or "+n+" was not found on the hub, please open a bug report.")}function captureException(n){var t;try{throw new Error("Sentry syntheticException")}catch(n){t=n}return Xn("captureException",n,{originalException:n,syntheticException:t})}function Bn(n){Xn("withScope",n)}var $n=function(){function n(n){this.dsn=n,this.K=new Nn(n)}return n.prototype.getDsn=function(){return this.K},n.prototype.getStoreEndpoint=function(){return""+this.Y()+this.getStoreEndpointPath()},n.prototype.getStoreEndpointWithUrlEncodedAuth=function(){var n,t={sentry_key:this.K.user,sentry_version:"7"};return this.getStoreEndpoint()+"?"+(n=t,Object.keys(n).map(function(t){return encodeURIComponent(t)+"="+encodeURIComponent(n[t])}).join("&"))},n.prototype.Y=function(){var n=this.K,t=n.protocol?n.protocol+":":"",r=n.port?":"+n.port:"";return t+"//"+n.host+r},n.prototype.getStoreEndpointPath=function(){var n=this.K;return(n.path?"/"+n.path:"")+"/api/"+n.projectId+"/store/"},n.prototype.getRequestHeaders=function(n,t){var r=this.K,e=["Sentry sentry_version=7"];return e.push("sentry_client="+n+"/"+t),e.push("sentry_key="+r.user),r.pass&&e.push("sentry_secret="+r.pass),{"Content-Type":"application/json","X-Sentry-Auth":e.join(", ")}},n.prototype.getReportDialogEndpoint=function(n){void 0===n&&(n={});var t=this.K,r=this.Y()+(t.path?"/"+t.path:"")+"/api/embed/error-page/",e=[];for(var i in e.push("dsn="+t.toString()),n)if("user"===i){if(!n.user)continue;n.user.name&&e.push("name="+encodeURIComponent(n.user.name)),n.user.email&&e.push("email="+encodeURIComponent(n.user.email))}else e.push(encodeURIComponent(i)+"="+encodeURIComponent(n[i]));return e.length?r+"?"+e.join("&"):r},n}(),Gn=[];function Jn(n){var t={};return function(n){var t=n.defaultIntegrations&&u(n.defaultIntegrations)||[],r=n.integrations,e=[];if(Array.isArray(r)){var i=r.map(function(n){return n.name}),o=[];t.forEach(function(n){-1===i.indexOf(n.name)&&-1===o.indexOf(n.name)&&(e.push(n),o.push(n.name))}),r.forEach(function(n){-1===o.indexOf(n.name)&&(e.push(n),o.push(n.name))})}else"function"==typeof r?(e=r(t),e=Array.isArray(e)?e:[e]):e=u(t);var c=e.map(function(n){return n.name});return-1!==c.indexOf("Debug")&&e.push.apply(e,u(e.splice(c.indexOf("Debug"),1))),e}(n).forEach(function(n){t[n.name]=n,function(n){-1===Gn.indexOf(n.name)&&(n.setupOnce(Mn,Hn),Gn.push(n.name),Q.log("Integration installed: "+n.name))}(n)}),t}var zn,Vn=function(){function n(n,t){this.Z={},this.nn=!1,this.tn=new n(t),this.rn=t,t.dsn&&(this.en=new Nn(t.dsn))}return n.prototype.captureException=function(n,t,r){var e=this,i=t&&t.event_id;return this.nn=!0,this.in().eventFromException(n,t).then(function(n){return e.on(n,t,r)}).then(function(n){i=n&&n.event_id,e.nn=!1}).then(null,function(n){Q.error(n),e.nn=!1}),i},n.prototype.captureMessage=function(n,t,r,e){var i=this,o=r&&r.event_id;return this.nn=!0,(m(n)?this.in().eventFromMessage(""+n,t,r):this.in().eventFromException(n,r)).then(function(n){return i.on(n,r,e)}).then(function(n){o=n&&n.event_id,i.nn=!1}).then(null,function(n){Q.error(n),i.nn=!1}),o},n.prototype.captureEvent=function(n,t,r){var e=this,i=t&&t.event_id;return this.nn=!0,this.on(n,t,r).then(function(n){i=n&&n.event_id,e.nn=!1}).then(null,function(n){Q.error(n),e.nn=!1}),i},n.prototype.getDsn=function(){return this.en},n.prototype.getOptions=function(){return this.rn},n.prototype.flush=function(n){var t=this;return this.un(n).then(function(r){return clearInterval(r.interval),t.in().getTransport().close(n).then(function(n){return r.ready&&n})})},n.prototype.close=function(n){var t=this;return this.flush(n).then(function(n){return t.getOptions().enabled=!1,n})},n.prototype.setupIntegrations=function(){this.cn()&&(this.Z=Jn(this.rn))},n.prototype.getIntegration=function(n){try{return this.Z[n.id]||null}catch(t){return Q.warn("Cannot retrieve integration "+n.id+" from the current Client"),null}},n.prototype.un=function(n){var t=this;return new an(function(r){var e=0,i=0;clearInterval(i),i=setInterval(function(){t.nn?(e+=1,n&&e>=n&&r({interval:i,ready:!1})):r({interval:i,ready:!0})},1)})},n.prototype.in=function(){return this.tn},n.prototype.cn=function(){return!1!==this.getOptions().enabled&&void 0!==this.en},n.prototype.an=function(n,t,r){var i=this,o=this.getOptions(),u=o.environment,c=o.release,a=o.dist,s=o.maxValueLength,f=void 0===s?250:s,h=o.normalizeDepth,v=void 0===h?3:h,l=e({},n);void 0===l.environment&&void 0!==u&&(l.environment=u),void 0===l.release&&void 0!==c&&(l.release=c),void 0===l.dist&&void 0!==a&&(l.dist=a),l.message&&(l.message=j(l.message,f));var d=l.exception&&l.exception.values&&l.exception.values[0];d&&d.value&&(d.value=j(d.value,f));var p=l.request;p&&p.url&&(p.url=j(p.url,f)),void 0===l.event_id&&(l.event_id=r&&r.event_id?r.event_id:R()),this.sn(l.sdk);var y=an.resolve(l);return t&&(y=t.applyToEvent(l,r)),y.then(function(n){return"number"==typeof v&&v>0?i.fn(n,v):n})},n.prototype.fn=function(n,t){return n?e({},n,n.breadcrumbs&&{breadcrumbs:n.breadcrumbs.map(function(n){return e({},n,n.data&&{data:un(n.data,t)})})},n.user&&{user:un(n.user,t)},n.contexts&&{contexts:un(n.contexts,t)},n.extra&&{extra:un(n.extra,t)}):null},n.prototype.sn=function(n){var t=Object.keys(this.Z);n&&t.length>0&&(n.integrations=t)},n.prototype.on=function(n,t,r){var e=this,i=this.getOptions(),o=i.beforeSend,u=i.sampleRate;return this.cn()?"number"==typeof u&&Math.random()>u?an.reject("This event has been sampled, will not send event."):new an(function(i,u){e.an(n,r,t).then(function(n){if(null!==n){var r=n;if(t&&t.data&&!0===t.data.__sentry__||!o)return e.in().sendEvent(r),void i(r);var c=o(n,t);if(void 0===c)Q.error("`beforeSend` method has to return `null` or a valid event.");else if(E(c))e.hn(c,i,u);else{if(null===(r=c))return Q.log("`beforeSend` returned `null`, will not send event."),void i(null);e.in().sendEvent(r),i(r)}}else u("An event processor returned null, will not send event.")}).then(null,function(n){e.captureException(n,{data:{__sentry__:!0},originalException:n}),u("Event processing pipeline threw an error, original event will not be sent. Details have been sent as a new event.\nReason: "+n)})}):an.reject("SDK not enabled, will not send event.")},n.prototype.hn=function(n,t,r){var e=this;n.then(function(n){null!==n?(e.in().sendEvent(n),t(n)):r("`beforeSend` returned `null`, will not send event.")}).then(null,function(n){r("beforeSend rejected with "+n)})},n}(),Kn=function(){function t(){}return t.prototype.sendEvent=function(t){return an.resolve({reason:"NoopTransport: Event has been skipped because no Dsn is configured.",status:n.Status.Skipped})},t.prototype.close=function(n){return an.resolve(!0)},t}(),Qn=function(){function n(n){this.rn=n,this.rn.dsn||Q.warn("No DSN provided, backend will not do anything."),this.vn=this.ln()}return n.prototype.ln=function(){return new Kn},n.prototype.eventFromException=function(n,t){throw new v("Backend has to implement `eventFromException` method")},n.prototype.eventFromMessage=function(n,t,r){throw new v("Backend has to implement `eventFromMessage` method")},n.prototype.sendEvent=function(n){this.vn.sendEvent(n).then(null,function(n){Q.error("Error while sending event: "+n)})},n.prototype.getTransport=function(){return this.vn},n}();var Yn=function(){function n(){this.name=n.id}return n.prototype.setupOnce=function(){zn=Function.prototype.toString,Function.prototype.toString=function(){for(var n=[],t=0;t<arguments.length;t++)n[t]=arguments[t];var r=this.__sentry_original__||this;return zn.apply(r,n)}},n.id="FunctionToString",n}(),Zn=[/^Script error\.?$/,/^Javascript error: Script error\.? on line 0$/],nt=function(){function n(t){void 0===t&&(t={}),this.rn=t,this.name=n.id}return n.prototype.setupOnce=function(){Mn(function(t){var r=Hn();if(!r)return t;var e=r.getIntegration(n);if(e){var i=r.getClient(),o=i?i.getOptions():{},u=e.dn(o);if(e.pn(t,u))return null}return t})},n.prototype.pn=function(n,t){return this.yn(n,t)?(Q.warn("Event dropped due to being internal Sentry Error.\nEvent: "+I(n)),!0):this.mn(n,t)?(Q.warn("Event dropped due to being matched by `ignoreErrors` option.\nEvent: "+I(n)),!0):this.bn(n,t)?(Q.warn("Event dropped due to being matched by `blacklistUrls` option.\nEvent: "+I(n)+".\nUrl: "+this.wn(n)),!0):!this.gn(n,t)&&(Q.warn("Event dropped due to not being matched by `whitelistUrls` option.\nEvent: "+I(n)+".\nUrl: "+this.wn(n)),!0)},n.prototype.yn=function(n,t){if(void 0===t&&(t={}),!t.ignoreInternal)return!1;try{return n&&n.exception&&n.exception.values&&n.exception.values[0]&&"SentryError"===n.exception.values[0].type||!1}catch(n){return!1}},n.prototype.mn=function(n,t){return void 0===t&&(t={}),!(!t.ignoreErrors||!t.ignoreErrors.length)&&this.En(n).some(function(n){return t.ignoreErrors.some(function(t){return _(n,t)})})},n.prototype.bn=function(n,t){if(void 0===t&&(t={}),!t.blacklistUrls||!t.blacklistUrls.length)return!1;var r=this.wn(n);return!!r&&t.blacklistUrls.some(function(n){return _(r,n)})},n.prototype.gn=function(n,t){if(void 0===t&&(t={}),!t.whitelistUrls||!t.whitelistUrls.length)return!0;var r=this.wn(n);return!r||t.whitelistUrls.some(function(n){return _(r,n)})},n.prototype.dn=function(n){return void 0===n&&(n={}),{blacklistUrls:u(this.rn.blacklistUrls||[],n.blacklistUrls||[]),ignoreErrors:u(this.rn.ignoreErrors||[],n.ignoreErrors||[],Zn),ignoreInternal:void 0===this.rn.ignoreInternal||this.rn.ignoreInternal,whitelistUrls:u(this.rn.whitelistUrls||[],n.whitelistUrls||[])}},n.prototype.En=function(n){if(n.message)return[n.message];if(n.exception)try{var t=n.exception.values&&n.exception.values[0]||{},r=t.type,e=void 0===r?"":r,i=t.value,o=void 0===i?"":i;return[""+o,e+": "+o]}catch(t){return Q.error("Cannot extract message for event "+I(n)),[]}return[]},n.prototype.wn=function(n){try{if(n.stacktrace){var t=n.stacktrace.frames;return t&&t[t.length-1].filename||null}if(n.exception){var r=n.exception.values&&n.exception.values[0].stacktrace&&n.exception.values[0].stacktrace.frames;return r&&r[r.length-1].filename||null}return null}catch(t){return Q.error("Cannot extract url for event "+I(n)),null}},n.id="InboundFilters",n}(),tt=Object.freeze({FunctionToString:Yn,InboundFilters:nt}),rt="?",et=/^\s*at (?:(.*?) ?\()?((?:file|https?|blob|chrome-extension|address|native|eval|webpack|<anonymous>|[-a-z]+:|.*bundle|\/).*?)(?::(\d+))?(?::(\d+))?\)?\s*$/i,it=/^\s*(.*?)(?:\((.*?)\))?(?:^|@)?((?:file|https?|blob|chrome|webpack|resource|moz-extension).*?:\/.*?|\[native code\]|[^@]*(?:bundle|\d+\.js))(?::(\d+))?(?::(\d+))?\s*$/i,ot=/^\s*at (?:((?:\[object object\])?.+) )?\(?((?:file|ms-appx|https?|webpack|blob):.*?):(\d+)(?::(\d+))?\)?\s*$/i,ut=/(\S+) line (\d+)(?: > eval line \d+)* > eval/i,ct=/\((\S*)(?::(\d+))(?::(\d+))\)/;function at(n){var t=null,r=n&&n.framesToPop;try{if(t=function(n){if(!n||!n.stacktrace)return null;for(var t,r=n.stacktrace,e=/ line (\d+).*script (?:in )?(\S+)(?:: in function (\S+))?$/i,i=/ line (\d+), column (\d+)\s*(?:in (?:<anonymous function: ([^>]+)>|([^\)]+))\((.*)\))? in (.*):\s*$/i,o=r.split("\n"),u=[],c=0;c<o.length;c+=2){var a=null;(t=e.exec(o[c]))?a={url:t[2],func:t[3],args:[],line:+t[1],column:null}:(t=i.exec(o[c]))&&(a={url:t[6],func:t[3]||t[4],args:t[5]?t[5].split(","):[],line:+t[1],column:+t[2]}),a&&(!a.func&&a.line&&(a.func=rt),u.push(a))}if(!u.length)return null;return{message:ft(n),name:n.name,stack:u}}(n))return st(t,r)}catch(n){}try{if(t=function(n){if(!n||!n.stack)return null;for(var t,r,e,i=[],o=n.stack.split("\n"),u=0;u<o.length;++u){if(r=et.exec(o[u])){var c=r[2]&&0===r[2].indexOf("native");r[2]&&0===r[2].indexOf("eval")&&(t=ct.exec(r[2]))&&(r[2]=t[1],r[3]=t[2],r[4]=t[3]),e={url:r[2]&&0===r[2].indexOf("address at ")?r[2].substr("address at ".length):r[2],func:r[1]||rt,args:c?[r[2]]:[],line:r[3]?+r[3]:null,column:r[4]?+r[4]:null}}else if(r=ot.exec(o[u]))e={url:r[2],func:r[1]||rt,args:[],line:+r[3],column:r[4]?+r[4]:null};else{if(!(r=it.exec(o[u])))continue;r[3]&&r[3].indexOf(" > eval")>-1&&(t=ut.exec(r[3]))?(r[1]=r[1]||"eval",r[3]=t[1],r[4]=t[2],r[5]=""):0!==u||r[5]||void 0===n.columnNumber||(i[0].column=n.columnNumber+1),e={url:r[3],func:r[1]||rt,args:r[2]?r[2].split(","):[],line:r[4]?+r[4]:null,column:r[5]?+r[5]:null}}!e.func&&e.line&&(e.func=rt),i.push(e)}if(!i.length)return null;return{message:ft(n),name:n.name,stack:i}}(n))return st(t,r)}catch(n){}return{message:ft(n),name:n&&n.name,stack:[],failed:!0}}function st(n,t){try{return e({},n,{stack:n.stack.slice(t)})}catch(t){return n}}function ft(n){var t=n&&n.message;return t?t.error&&"string"==typeof t.error.message?t.error.message:t:"No error message"}var ht=50;function vt(n){var t=dt(n.stack),r={type:n.name,value:n.message};return t&&t.length&&(r.stacktrace={frames:t}),void 0===r.type&&""===r.value&&(r.value="Unrecoverable error caught"),r}function lt(n){return{exception:{values:[vt(n)]}}}function dt(n){if(!n||!n.length)return[];var t=n,r=t[0].func||"",e=t[t.length-1].func||"";return-1===r.indexOf("captureMessage")&&-1===r.indexOf("captureException")||(t=t.slice(1)),-1!==e.indexOf("sentryWrapped")&&(t=t.slice(0,-1)),t.map(function(n){return{colno:null===n.column?void 0:n.column,filename:n.url||t[0].url,function:n.func||"?",in_app:!0,lineno:null===n.line?void 0:n.line}}).slice(0,ht).reverse()}function pt(n,t,r){var e,i;if(void 0===r&&(r={}),d(n)&&n.error)return e=lt(at(n=n.error));if(p(n)||(i=n,"[object DOMException]"===Object.prototype.toString.call(i))){var o=n,u=o.name||(p(o)?"DOMError":"DOMException"),c=o.message?u+": "+o.message:u;return M(e=yt(c,t,r),c),e}return l(n)?e=lt(at(n)):b(n)||w(n)?(A(e=function(n,t,r){var e={exception:{values:[{type:w(n)?n.constructor.name:r?"UnhandledRejection":"Error",value:"Non-Error "+(r?"promise rejection":"exception")+" captured with keys: "+cn(n)}]},extra:{__serialized__:rn(n)}};if(t){var i=dt(at(t).stack);e.stacktrace={frames:i}}return e}(n,t,r.rejection),{synthetic:!0}),e):(M(e=yt(n,t,r),""+n,void 0),A(e,{synthetic:!0}),e)}function yt(n,t,r){void 0===r&&(r={});var e={message:n};if(r.attachStacktrace&&t){var i=dt(at(t).stack);e.stacktrace={frames:i}}return e}var mt=function(){function n(n){this.options=n,this._=new sn(30),this.url=new $n(this.options.dsn).getStoreEndpointWithUrlEncodedAuth()}return n.prototype.sendEvent=function(n){throw new v("Transport Class has to implement `sendEvent` method")},n.prototype.close=function(n){return this._.drain(n)},n}(),bt=D(),wt=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.xn=new Date(Date.now()),n}return r(e,t),e.prototype.sendEvent=function(t){var r=this;if(new Date(Date.now())<this.xn)return Promise.reject({event:t,reason:"Transport locked till "+this.xn+" due to too many requests.",status:429});var e={body:JSON.stringify(t),method:"POST",referrerPolicy:vn()?"origin":""};return void 0!==this.options.headers&&(e.headers=this.options.headers),this._.add(new an(function(t,i){bt.fetch(r.url,e).then(function(e){var o=n.Status.fromHttpCode(e.status);if(o!==n.Status.Success){if(o===n.Status.RateLimit){var u=Date.now();r.xn=new Date(u+B(u,e.headers.get("Retry-After"))),Q.warn("Too many requests, backing off till: "+r.xn)}i(e)}else t({status:o})}).catch(i)}))},e}(mt),gt=function(t){function e(){var n=null!==t&&t.apply(this,arguments)||this;return n.xn=new Date(Date.now()),n}return r(e,t),e.prototype.sendEvent=function(t){var r=this;return new Date(Date.now())<this.xn?Promise.reject({event:t,reason:"Transport locked till "+this.xn+" due to too many requests.",status:429}):this._.add(new an(function(e,i){var o=new XMLHttpRequest;for(var u in o.onreadystatechange=function(){if(4===o.readyState){var t=n.Status.fromHttpCode(o.status);if(t!==n.Status.Success){if(t===n.Status.RateLimit){var u=Date.now();r.xn=new Date(u+B(u,o.getResponseHeader("Retry-After"))),Q.warn("Too many requests, backing off till: "+r.xn)}i(o)}else e({status:t})}},o.open("POST",r.url),r.options.headers)r.options.headers.hasOwnProperty(u)&&o.setRequestHeader(u,r.options.headers[u]);o.send(JSON.stringify(t))}))},e}(mt),Et=Object.freeze({BaseTransport:mt,FetchTransport:wt,XHRTransport:gt}),xt=function(t){function i(){return null!==t&&t.apply(this,arguments)||this}return r(i,t),i.prototype.ln=function(){if(!this.rn.dsn)return t.prototype.ln.call(this);var n=e({},this.rn.transportOptions,{dsn:this.rn.dsn});return this.rn.transport?new this.rn.transport(n):fn()?new wt(n):new gt(n)},i.prototype.eventFromException=function(t,r){var e=pt(t,r&&r.syntheticException||void 0,{attachStacktrace:this.rn.attachStacktrace});return A(e,{handled:!0,type:"generic"}),e.level=n.Severity.Error,r&&r.event_id&&(e.event_id=r.event_id),an.resolve(e)},i.prototype.eventFromMessage=function(t,r,e){void 0===r&&(r=n.Severity.Info);var i=yt(t,e&&e.syntheticException||void 0,{attachStacktrace:this.rn.attachStacktrace});return i.level=r,e&&e.event_id&&(i.event_id=e.event_id),an.resolve(i)},i}(Qn),jt="sentry.javascript.browser",kt=function(n){function t(t){return void 0===t&&(t={}),n.call(this,xt,t)||this}return r(t,n),t.prototype.an=function(t,r,i){return t.platform=t.platform||"javascript",t.sdk=e({},t.sdk,{name:jt,packages:u(t.sdk&&t.sdk.packages||[],[{name:"npm:@sentry/browser",version:"5.15.0"}]),version:"5.15.0"}),n.prototype.an.call(this,t,r,i)},t.prototype.showReportDialog=function(n){void 0===n&&(n={});var t=D().document;if(t)if(this.cn()){var r=n.dsn||this.getDsn();if(n.eventId)if(r){var e=t.createElement("script");e.async=!0,e.src=new $n(r).getReportDialogEndpoint(n),n.onLoad&&(e.onload=n.onLoad),(t.head||t.body).appendChild(e)}else Q.error("Missing `Dsn` option in showReportDialog call");else Q.error("Missing `eventId` option in showReportDialog call")}else Q.error("Trying to call showReportDialog with Sentry Client is disabled")},t}(Vn),_t=0;function St(){return _t>0}function Ot(n,t,r){if(void 0===t&&(t={}),"function"!=typeof n)return n;try{if(n.__sentry__)return n;if(n.__sentry_wrapped__)return n.__sentry_wrapped__}catch(t){return n}var sentryWrapped=function(){var i=Array.prototype.slice.call(arguments);try{r&&"function"==typeof r&&r.apply(this,arguments);var o=i.map(function(n){return Ot(n,t)});return n.handleEvent?n.handleEvent.apply(this,o):n.apply(this,o)}catch(n){throw _t+=1,setTimeout(function(){_t-=1}),Bn(function(r){r.addEventProcessor(function(n){var r=e({},n);return t.mechanism&&(M(r,void 0,void 0),A(r,t.mechanism)),r.extra=e({},r.extra,{arguments:i}),r}),captureException(n)}),n}};try{for(var i in n)Object.prototype.hasOwnProperty.call(n,i)&&(sentryWrapped[i]=n[i])}catch(n){}n.prototype=n.prototype||{},sentryWrapped.prototype=n.prototype,Object.defineProperty(n,"__sentry_wrapped__",{enumerable:!1,value:sentryWrapped}),Object.defineProperties(sentryWrapped,{__sentry__:{enumerable:!1,value:!0},__sentry_original__:{enumerable:!1,value:n}});try{Object.getOwnPropertyDescriptor(sentryWrapped,"name").configurable&&Object.defineProperty(sentryWrapped,"name",{get:function(){return n.name}})}catch(n){}return sentryWrapped}var Tt=function(){function t(n){this.name=t.id,this.jn=!1,this.kn=!1,this.rn=e({onerror:!0,onunhandledrejection:!0},n)}return t.prototype.setupOnce=function(){Error.stackTraceLimit=50,this.rn.onerror&&(Q.log("Global Handler attached: onerror"),this._n()),this.rn.onunhandledrejection&&(Q.log("Global Handler attached: onunhandledrejection"),this.Sn())},t.prototype._n=function(){var n=this;this.jn||(bn({callback:function(r){var e=r.error,i=Hn(),o=i.getIntegration(t),u=e&&!0===e.__sentry_own_request__;if(o&&!St()&&!u){var c=i.getClient(),a=m(e)?n.On(r.msg,r.url,r.line,r.column):n.Tn(pt(e,void 0,{attachStacktrace:c&&c.getOptions().attachStacktrace,rejection:!1}),r.url,r.line,r.column);A(a,{handled:!1,type:"onerror"}),i.captureEvent(a,{originalException:e})}},type:"error"}),this.jn=!0)},t.prototype.Sn=function(){var r=this;this.kn||(bn({callback:function(e){var i=e;try{"reason"in e?i=e.reason:"detail"in e&&"reason"in e.detail&&(i=e.detail.reason)}catch(n){}var o=Hn(),u=o.getIntegration(t),c=i&&!0===i.__sentry_own_request__;if(!u||St()||c)return!0;var a=o.getClient(),s=m(i)?r.Dn(i):pt(i,void 0,{attachStacktrace:a&&a.getOptions().attachStacktrace,rejection:!0});s.level=n.Severity.Error,A(s,{handled:!1,type:"onunhandledrejection"}),o.captureEvent(s,{originalException:i})},type:"unhandledrejection"}),this.kn=!0)},t.prototype.On=function(n,t,r,e){var i,o=d(n)?n.message:n;if(y(o)){var u=o.match(/^(?:[Uu]ncaught (?:exception: )?)?(?:((?:Eval|Internal|Range|Reference|Syntax|Type|URI|)Error): )?(.*)$/i);u&&(i=u[1],o=u[2])}var c={exception:{values:[{type:i||"Error",value:o}]}};return this.Tn(c,t,r,e)},t.prototype.Dn=function(n){return{exception:{values:[{type:"UnhandledRejection",value:"Non-Error promise rejection captured with value: "+n}]}}},t.prototype.Tn=function(n,t,r,e){n.exception=n.exception||{},n.exception.values=n.exception.values||[],n.exception.values[0]=n.exception.values[0]||{},n.exception.values[0].stacktrace=n.exception.values[0].stacktrace||{},n.exception.values[0].stacktrace.frames=n.exception.values[0].stacktrace.frames||[];var i=isNaN(parseInt(e,10))?void 0:e,o=isNaN(parseInt(r,10))?void 0:r,u=y(t)&&t.length>0?t:function(){try{return document.location.href}catch(n){return""}}();return 0===n.exception.values[0].stacktrace.frames.length&&n.exception.values[0].stacktrace.frames.push({colno:i,filename:u,function:"?",in_app:!0,lineno:o}),n},t.id="GlobalHandlers",t}(),Dt=function(){function n(){this.Rn=0,this.name=n.id}return n.prototype.Nn=function(n){return function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var e=t[0];return t[0]=Ot(e,{mechanism:{data:{function:G(n)},handled:!0,type:"instrument"}}),n.apply(this,t)}},n.prototype.In=function(n){return function(t){return n(Ot(t,{mechanism:{data:{function:"requestAnimationFrame",handler:G(n)},handled:!0,type:"instrument"}}))}},n.prototype.Cn=function(n){var t=D(),r=t[n]&&t[n].prototype;r&&r.hasOwnProperty&&r.hasOwnProperty("addEventListener")&&(Z(r,"addEventListener",function(t){return function(r,e,i){try{"function"==typeof e.handleEvent&&(e.handleEvent=Ot(e.handleEvent.bind(e),{mechanism:{data:{function:"handleEvent",handler:G(e),target:n},handled:!0,type:"instrument"}}))}catch(n){}return t.call(this,r,Ot(e,{mechanism:{data:{function:"addEventListener",handler:G(e),target:n},handled:!0,type:"instrument"}}),i)}}),Z(r,"removeEventListener",function(n){return function(t,r,e){var i=r;try{i=i&&(i.__sentry_wrapped__||i)}catch(n){}return n.call(this,t,i,e)}}))},n.prototype.Mn=function(n){return function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var e=this;return["onload","onerror","onprogress","onreadystatechange"].forEach(function(n){n in e&&"function"==typeof e[n]&&Z(e,n,function(t){var r={mechanism:{data:{function:n,handler:G(t)},handled:!0,type:"instrument"}};return t.__sentry_original__&&(r.mechanism.data.handler=G(t.__sentry_original__)),Ot(t,r)})}),n.apply(this,t)}},n.prototype.setupOnce=function(){this.Rn=this.Rn;var n=D();Z(n,"setTimeout",this.Nn.bind(this)),Z(n,"setInterval",this.Nn.bind(this)),Z(n,"requestAnimationFrame",this.In.bind(this)),"XMLHttpRequest"in n&&Z(XMLHttpRequest.prototype,"send",this.Mn.bind(this)),["EventTarget","Window","Node","ApplicationCache","AudioTrackList","ChannelMergerNode","CryptoOperation","EventSource","FileReader","HTMLUnknownElement","IDBDatabase","IDBRequest","IDBTransaction","KeyOperation","MediaController","MessagePort","ModalWindow","Notification","SVGElementInstance","Screen","TextTrack","TextTrackCue","TextTrackList","WebSocket","WebSocketWorker","Worker","XMLHttpRequest","XMLHttpRequestEventTarget","XMLHttpRequestUpload"].forEach(this.Cn.bind(this))},n.id="TryCatch",n}(),Rt=function(){function t(n){this.name=t.id,this.rn=e({console:!0,dom:!0,fetch:!0,history:!0,sentry:!0,xhr:!0},n)}return t.prototype.An=function(t){var r={category:"console",data:{arguments:t.args,logger:"console"},level:n.Severity.fromString(t.level),message:k(t.args," ")};if("assert"===t.level){if(!1!==t.args[0])return;r.message="Assertion failed: "+(k(t.args.slice(1)," ")||"console.assert"),r.data.arguments=t.args.slice(1)}Hn().addBreadcrumb(r,{input:t.args,level:t.level})},t.prototype.Un=function(n){var t;try{t=n.event.target?U(n.event.target):U(n.event)}catch(n){t="<unknown>"}0!==t.length&&Hn().addBreadcrumb({category:"ui."+n.name,message:t},{event:n.event,name:n.name})},t.prototype.qn=function(n){if(n.endTimestamp){if(n.xhr.__sentry_own_request__)return;Hn().addBreadcrumb({category:"xhr",data:n.xhr.__sentry_xhr__,type:"http"},{xhr:n.xhr})}else this.rn.sentry&&n.xhr.__sentry_own_request__&&Nt(n.args[0])},t.prototype.Ln=function(t){if(t.endTimestamp){var r=Hn().getClient(),i=r&&r.getDsn();if(this.rn.sentry&&i){var o=new $n(i).getStoreEndpoint();if(o&&-1!==t.fetchData.url.indexOf(o)&&"POST"===t.fetchData.method&&t.args[1]&&t.args[1].body)return void Nt(t.args[1].body)}t.error?Hn().addBreadcrumb({category:"fetch",data:e({},t.fetchData,{status_code:t.response.status}),level:n.Severity.Error,type:"http"},{data:t.error,input:t.args}):Hn().addBreadcrumb({category:"fetch",data:e({},t.fetchData,{status_code:t.response.status}),type:"http"},{input:t.args,response:t.response})}},t.prototype.Hn=function(n){var t=D(),r=n.from,e=n.to,i=N(t.location.href),o=N(r),u=N(e);o.path||(o=i),i.protocol===u.protocol&&i.host===u.host&&(e=u.relative),i.protocol===o.protocol&&i.host===o.host&&(r=o.relative),Hn().addBreadcrumb({category:"navigation",data:{from:r,to:e}})},t.prototype.setupOnce=function(){var n=this;this.rn.console&&bn({callback:function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];n.An.apply(n,u(t))},type:"console"}),this.rn.dom&&bn({callback:function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];n.Un.apply(n,u(t))},type:"dom"}),this.rn.xhr&&bn({callback:function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];n.qn.apply(n,u(t))},type:"xhr"}),this.rn.fetch&&bn({callback:function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];n.Ln.apply(n,u(t))},type:"fetch"}),this.rn.history&&bn({callback:function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];n.Hn.apply(n,u(t))},type:"history"})},t.id="Breadcrumbs",t}();function Nt(t){try{var r=JSON.parse(t);Hn().addBreadcrumb({category:"sentry."+("transaction"===r.type?"transaction":"event"),event_id:r.event_id,level:r.level||n.Severity.fromString("error"),message:I(r)},{event:r})}catch(n){Q.error("Error while adding sentry type breadcrumb")}}var It="cause",Ct=5,Mt=function(){function n(t){void 0===t&&(t={}),this.name=n.id,this.Pn=t.key||It,this.k=t.limit||Ct}return n.prototype.setupOnce=function(){Mn(function(t,r){var e=Hn().getIntegration(n);return e?e.Fn(t,r):t})},n.prototype.Fn=function(n,t){if(!(n.exception&&n.exception.values&&t&&x(t.originalException,Error)))return n;var r=this.Wn(t.originalException,this.Pn);return n.exception.values=u(r,n.exception.values),n},n.prototype.Wn=function(n,t,r){if(void 0===r&&(r=[]),!x(n[t],Error)||r.length+1>=this.k)return r;var e=vt(at(n[t]));return this.Wn(n[t],t,u([e],r))},n.id="LinkedErrors",n}(),At=D(),Ut=function(){function n(){this.name=n.id}return n.prototype.setupOnce=function(){Mn(function(t){if(Hn().getIntegration(n)){if(!At.navigator||!At.location)return t;var r=t.request||{};return r.url=r.url||At.location.href,r.headers=r.headers||{},r.headers["User-Agent"]=At.navigator.userAgent,e({},t,{request:r})}return t})},n.id="UserAgent",n}(),qt=Object.freeze({GlobalHandlers:Tt,TryCatch:Dt,Breadcrumbs:Rt,LinkedErrors:Mt,UserAgent:Ut}),Lt=[new nt,new Yn,new Dt,new Rt,new Tt,new Mt,new Ut];var Ht={},Pt=D();Pt.Sentry&&Pt.Sentry.Integrations&&(Ht=Pt.Sentry.Integrations);var Ft=e({},Ht,tt,qt);return n.BrowserClient=kt,n.Hub=Un,n.Integrations=Ft,n.SDK_NAME=jt,n.SDK_VERSION="5.15.0",n.Scope=In,n.Transports=Et,n.addBreadcrumb=function(n){Xn("addBreadcrumb",n)},n.addGlobalEventProcessor=Mn,n.captureEvent=function(n){return Xn("captureEvent",n)},n.captureException=captureException,n.captureMessage=function(n,t){var r;try{throw new Error(n)}catch(n){r=n}return Xn("captureMessage",n,t,{originalException:n,syntheticException:r})},n.close=function(n){var t=Hn().getClient();return t?t.close(n):an.reject(!1)},n.configureScope=function(n){Xn("configureScope",n)},n.defaultIntegrations=Lt,n.flush=function(n){var t=Hn().getClient();return t?t.flush(n):an.reject(!1)},n.forceLoad=function(){},n.getCurrentHub=Hn,n.getHubFromCarrier=Fn,n.init=function(n){if(void 0===n&&(n={}),void 0===n.defaultIntegrations&&(n.defaultIntegrations=Lt),void 0===n.release){var t=D();t.SENTRY_RELEASE&&t.SENTRY_RELEASE.id&&(n.release=t.SENTRY_RELEASE.id)}!function(n,t){!0===t.debug&&Q.enable();var r=Hn(),e=new n(t);r.bindClient(e)}(kt,n)},n.lastEventId=function(){return Hn().lastEventId()},n.onLoad=function(n){n()},n.setContext=function(n,t){Xn("setContext",n,t)},n.setExtra=function(n,t){Xn("setExtra",n,t)},n.setExtras=function(n){Xn("setExtras",n)},n.setTag=function(n,t){Xn("setTag",n,t)},n.setTags=function(n){Xn("setTags",n)},n.setUser=function(n){Xn("setUser",n)},n.showReportDialog=function(n){void 0===n&&(n={}),n.eventId||(n.eventId=Hn().lastEventId());var t=Hn().getClient();t&&t.showReportDialog(n)},n.withScope=Bn,n.wrap=function(n){return Ot(n)()},n}({});
+//# sourceMappingURL=bundle.min.js.map
diff --git a/oem/firstvoices/windows/src/xml/sentry.init.js.in b/oem/firstvoices/windows/src/xml/sentry.init.js.in
new file mode 100644
index 0000000000..14584a19be
--- /dev/null
+++ b/oem/firstvoices/windows/src/xml/sentry.init.js.in
@@ -0,0 +1,40 @@
+// init.js
+// Initializes Sentry with Keyman definitions
+// This file is dynamically built from init.js.in into init.js
+// which allows us to easily populate a release tag. This
+// transform is made in TIKE's makefile with mkver
+//
+// DO NOT MODIFY init.js; instead make changes in init.js.in.
+//
+
+Sentry.init({
+  dsn: 'https://92eb58e6005d47daa33c9c9e39458eb7@sentry.keyman.com/5',  // Keyman for Windows
+  environment: '$Environment',
+  release: 'release-$VersionWithTag'
+});
+
+function keymanEnableDiagnostics() {
+  var e = document.createElement('button');
+  e.style.zIndex = '1000';
+  e.style.position = 'fixed';
+  e.style.right = '10px';
+  e.style.top = '10px';
+  e.style.height = '24px';
+  e.innerText = 'Test Exception';
+  e.onclick = function() {
+    var boo = null.boo();
+  }
+  document.body.appendChild(e);
+
+  e = document.createElement('button');
+  e.style.zIndex = '1000';
+  e.style.position = 'fixed';
+  e.style.right = '10px';
+  e.style.top = '38px';
+  e.style.height = '24px';
+  e.innerText = 'Test Event';
+  e.onclick = function() {
+    Sentry.captureMessage('Test Event');
+  }
+  document.body.appendChild(e);
+}
diff --git a/oem/firstvoices/windows/src/xml/sil-logo-blue.png b/oem/firstvoices/windows/src/xml/sil-logo-blue.png
index e51c0804a3..e0d7ab6b37 100644
Binary files a/oem/firstvoices/windows/src/xml/sil-logo-blue.png and b/oem/firstvoices/windows/src/xml/sil-logo-blue.png differ
diff --git a/oem/firstvoices/windows/src/xml/splash.css b/oem/firstvoices/windows/src/xml/splash.css
index 03caf54211..b79c1c6143 100644
--- a/oem/firstvoices/windows/src/xml/splash.css
+++ b/oem/firstvoices/windows/src/xml/splash.css
@@ -1,22 +1,18 @@
-* { 
-  font-family: Calibri;
-}
-
-html, body { 
+html, body {
   padding: 0px;
-  margin: 0px; 
-  overflow: hidden; 
+  margin: 0px;
+  overflow: hidden;
   font-size: 15px;
   background: white;
 }
 
-div { 
-  position: static; 
+div {
+  position: static;
 }
 
 #size {
-  position: absolute; 
-  left: 0; 
+  position: absolute;
+  left: 0;
   top: 0;
   border: solid 1px #444444;
   background: white;
@@ -27,12 +23,17 @@ div {
 #displaylanguage { top: 40px; right: 12px; position: absolute; color: white; }
 #displaylanguage a { color: white; }
 
-#titleBox { 
-  position: absolute; left: 20px; top: 24px; background: url("keyman-desktop-for-first-voices-486x86-black.png"); width: 486px; height: 86px; 
+#titleBox {
+  position: absolute;
+  left: 20px;
+  top: 24px;
+  background: url("keyman-desktop-for-first-voices-486x86-black.png");
+  width: 486px;
+  height: 86px;
 }
 
 #silLogo {
-  position: absolute; right: 20px; top: 24px; background: url("fpcc-53x50.png"); width: 53px; height: 50px; 
+  position: absolute; right: 20px; top: 24px; background: url("fpcc-53x50.png"); width: 53px; height: 50px;
 }
 
 #family {
@@ -44,15 +45,19 @@ div {
   left: 0;
   bottom: 0;
   position: absolute;
-  width: 700px; 
+  width: 700px;
   padding: 8px;
 }
 
-#version { 
-  position: absolute; font-size: 0.8em; right: 90px; bottom: 10px; color: #F68924 
+#version {
+  position: absolute;
+  font-size: 0.8em;
+  right: 120px;
+  bottom: 10px;
+  color: #F68924;
 }
 
-#beta { 
+#beta {
   color: red; font-weight: bold;
 }
 
@@ -65,7 +70,7 @@ div {
   height: 84px;
   max-height: 84px;
   overflow-y: auto;
-  width: 400px;
+  width: 360px;
   padding: 0 16px 0 0;
 }
 
@@ -78,23 +83,22 @@ a.button {
 }
 
 .btn {
-  float: left; 
-  width: 160px; 
-  height: 26px; 
+  float: left;
+  width: 160px;
+  height: 26px;
   font-weight: bold;
-  font-size: 18px;
-  font-family: Calibri;
-  padding: 6px 12px 2px 12px;
-  text-align: center; 
+  font-size: 16px;
+  padding: 4px 12px 2px 12px;
+  text-align: center;
   border-radius: 4px;
-  color: #33333f; 
+  color: #33333f;
 }
 
-.btn-orange { 
-  background: #F68924; 
+.btn-orange {
+  background: #F68924;
 }
 
-.btn-blue { 
+.btn-blue {
   background: #79C3DA;
 }
 
@@ -103,23 +107,23 @@ a.button {
   color: #fcf8f8;
 }
 
-.btn-small { 
-  width: 61px; 
-  height: 20px; 
-  font-size: 15px; 
-  padding: 2px 6px 0 6px; 
+.btn-small {
+  width: 61px;
+  height: 20px;
+  font-size: 15px;
+  padding: 1px 6px 1px 6px;
   background: #F68924;
-  border-radius: 3px; 
+  border-radius: 3px;
 }
 
-#ribbon { 
+#ribbon {
   display:none;
-  position: absolute; 
-  left: 0; 
-  top: 100px; 
-  width: 100%; 
-  height: 8px; 
-  background: #79C3DA; 
+  position: absolute;
+  left: 0;
+  top: 100px;
+  width: 100%;
+  height: 8px;
+  background: #79C3DA;
 }
 
 #ribbon div {
@@ -138,24 +142,34 @@ a.button {
   background: #CC3846;
 }
 
-#tasks { 
-  position: absolute; 
+#tasks {
+  position: absolute;
   left: 0; bottom: 0; margin-left: 8px; margin-bottom: 8px; font-size: 13px }
 #tasks div { margin-bottom: 2px; margin-left: 4px }
 
-#startNow { 
-  left: 434px;
-  top: 352px; 
+#startNow {
+  right: 12px;
+  top: 352px;
   height: 1.2em;
 }
 
+#startNow .btn,
+#config .btn {
+  width: 215px;
+  text-overflow: ellipsis;
+}
+
 #config {
-  left: 434px;
+  right: 12px;
   top: 392px;
 }
 
 #exit { right: 12px; bottom: 12px; }
 
+#exit .btn-small {
+  width: 90px;
+}
+
 #tasks div#showAtStartupBox { margin-top: 6px; margin-left: 0; }
 #tasks a, #showAtStartupLabel { color: #F68924; text-decoration: none; }
 #tasks a:hover { text-decoration: underline; }
diff --git a/oem/firstvoices/windows/src/xml/splash.xsl b/oem/firstvoices/windows/src/xml/splash.xsl
index 7ad28b0ccb..83b2ee6bca 100644
--- a/oem/firstvoices/windows/src/xml/splash.xsl
+++ b/oem/firstvoices/windows/src/xml/splash.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-  
+
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:include href="elements.xsl"/>
@@ -8,12 +8,14 @@
 
 <html>
 <head>
-  <meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
+  <script src="/app/sentry.bundle.min.js"></script>
+  <script src="/app/sentry.init.js"></script>
   <title><xsl:value-of select="($locale/string[@name='S_Splash_Name'])[1]" />&#160;<xsl:value-of select="/Keyman/version-info/@versionRelease" /></title>
-  <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>menu.css</xsl:attribute></link>
-  <link rel="stylesheet" type="text/css"><xsl:attribute name="href"><xsl:value-of select="/Keyman/templatepath"/>splash.css</xsl:attribute></link>
-  <script type="text/javascript"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>menu.js</xsl:attribute><xsl:text> </xsl:text></script>
-  <script type="text/javascript"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>splash.js</xsl:attribute><xsl:text> </xsl:text></script>
+  <style> * { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI";} </style>
+  <link rel="stylesheet" type="text/css" href="/app/menu.css" />
+  <link rel="stylesheet" type="text/css" href="/app/splash.css" />
+  <script src="/app/menu.js"></script>
+  <script src="/app/splash.js"></script>
 </head>
 
 <body>
@@ -26,12 +28,12 @@
   <div id="titleBox"></div>
   <div id="silLogo"></div>
   <div id="family"></div>
-  
+
   <a href="keyman:start" id="startNow" class="button">
     <div class="btn btn-blue"><xsl:value-of select="$locale/string[@name='S_Splash_Start']"/></div>
   </a>
   <a class="button" id="config" href="keyman:config"><div class="btn btn-orange"><xsl:value-of select="$locale/string[@name='S_Splash_Configuration']"/></div></a>
-  
+
   <a href="keyman:exit" id="exit" class="button"><div class="btn btn-small"><xsl:value-of select="$locale/string[@name='S_Splash_Exit']"/></div></a>
 
   <div id="tasks">
@@ -40,20 +42,20 @@
       <label for="showAtStartupBox"><xsl:value-of select="$locale/string[@name='S_Splash_ShowAtStartup']"/></label>
     </div>
   </div>
-  
+
   <div id="keyboards">
     <xsl:apply-templates select="//KeymanKeyboardInstalled[loaded]"/>
     <xsl:if test="count(//KeymanKeyboardInstalled[loaded]) = 0">No keyboards loaded - <a href="keyman:config">Open Configuration</a></xsl:if>
   </div>
- 
+
   <div id="version"><xsl:value-of select="/Keyman/Version"/></div>
 </div>
 </body>
 </html>
   </xsl:template>
-  
+
 <xsl:template match="KeymanKeyboardInstalled">
   <div><xsl:value-of select="name" /></div>
 </xsl:template>
-    
+
 </xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/strings.xml b/oem/firstvoices/windows/src/xml/strings.xml
new file mode 100644
index 0000000000..e585e05bab
--- /dev/null
+++ b/oem/firstvoices/windows/src/xml/strings.xml
@@ -0,0 +1,1197 @@
+<?xml version="1.0"?>
+
+<!--
+  strings.xml: Contains all localizable strings for Keyman for Windows
+  * Create a user interface translation for Keyman for Windows at https://translate.keyman.com/
+-->
+
+<resources>
+
+  <!-- Context: System -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.266.0 -->
+  <string name="S_LocaleAuthors" comment="Name(s) of people who created this translation - i.e. your name">Keyman</string>
+
+  <!-- Context: _Font -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SK_UIFontName" comment="The standard font">Segoe UI</string>
+
+  <!-- Context: _Font -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SK_UIFontSize" comment="The standard font size">9</string>
+
+
+  
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonYes" comment="Yes button in message boxes">&amp;Yes</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonNo" comment="No button in message boxes">&amp;No</string>
+
+  <!-- Context: General Strings -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_OK" comment="Ok button term">OK</string>
+
+  <!-- Context: General Strings -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_Cancel" comment="Cancel button term">Cancel</string>
+
+  <!-- Context: General Strings -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_Close" comment="Close button term">Close</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonOK" comment="OK button in message boxes">OK</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonCancel" comment="Cancel button in message boxes">Cancel</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.330.0 -->
+  <string name="SKBalloonClickToSelectKeyboard" comment="Balloon that shows when Keyman icon is first shown during the tutorial">Click this icon to select a keyboard</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.330.0 -->
+  <string name="SKBalloonOSKClosed" comment="Balloon that shows when OSK is closed">Keyman is still running.  Click this icon to use your language keyboard at any time</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0.234 -->
+  <string name="SKBalloonKeymanIsRunning" comment="Balloon that shows when user tries to start Keyman but it is already running">Keyman for FirstVoices is already running. Click the Keyman for FirstVoices icon in the system notification area to use your language keyboard</string>
+  
+  <!-- Context: Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ConfigurationTitle" comment="Configuration dialog title, which includes the product name">Keyman for FirstVoices Configuration</string>
+
+  <!-- Context: Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.239.0 -->
+  <string name="S_Caption_Help" comment="Configuration dialog link to Help">Help</string>
+
+  
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Keyboards" comment="Keyboard Layouts tab name">Keyboard Layouts</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Keyboards_AccessChar" comment="Direct access to the Keyboard Layouts tab using alt+">K</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Options" comment="Options tab name">Options</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Options_AccessChar" comment="Direct access to the Options tab using alt+">O</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkeys" comment="Hotkeys tab name">Hotkeys</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkeys_AccessChar" comment="Direct access to the Hotkeys tab using alt+">H</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support" comment="Support tab name">Support</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support_AccessChar" comment="Direct access to the Support tab using alt+">S</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.493.0 -->
+  <string name="S_KeepInTouch" comment="Keep in touch tab name">Keep in Touch</string>
+
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.492.0 -->
+  <string name="S_KeepInTouch_AccessChar" comment="Direct access to the Keep in Touch tab using alt+">T</string>
+
+  
+  
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Filename" comment="Keyboard download window, etc. - term for filename">Filename:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Version" comment="Keyboard download window, etc. - term for package version">Package version:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.442.0 -->
+  <string name="S_Caption_KeyboardVersion" comment="Keyboard download window, etc. - term for keyboard version">Keyboard version:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Author" comment="Keyboard download window, etc. - term for author">Author:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Website" comment="Keyboard download window, etc. - term for website">Website:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Package" comment="Keyboard download window, etc. - term for package">Package:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Fonts" comment="Keyboard download window, etc. - term for fonts">Fonts:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Keyboards" comment="Keyboard download window, etc. - term for keyboard layouts">Keyboard Layouts:</string>
+
+  <!-- Context: Keyboard Install Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Caption_Keyboard" comment="Keyboard install dialog - term for a single keyboard layout">Keyboard Layout:</string>
+
+  <!-- Context: Keyboard Install Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Caption_KeyboardLanguage" comment="Keyboard install dialog - term for caption for language selector a single keyboard layout">Keyboard Language:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Encodings" comment="Keyboard download window, etc. - term for encodings (encodings include Unicode, ANSI, Non-Unicode, etc).">Encodings:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_LayoutType" comment="Keyboard download window, etc. - term for keyboard layout type (keyboard layout types include Fixed and Mnemonic)">Layout Type:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_LayoutType_Positional" comment="Keyboard download window, etc. - term for the fixed keyboard layout type">Fixed (Positional)</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_LayoutType_Mnemonic" comment="Keyboard download window, etc. - term for the mnemonic keyboard layout type">Mapped to Windows layout (Mnemonic)</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.420.0 -->
+  <string name="S_Caption_Languages" comment="Text preceding linked language profiles">Languages:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.420.0 -->
+  <string name="S_Languages_Uninstall" comment="Remove language profile">✕</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.420.0 -->
+  <string name="S_Languages_Install" comment="Add language profile">Add language</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_OnScreenKeyboard" comment="Term for the On Screen Keyboard">On Screen Keyboard:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_OnScreenKeyboard_Custom" comment="(OSK) Custom term">Custom</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OnScreenKeyboard_Installed" comment="(OSK) Installed term">Installed</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OnScreenKeyboard_NotInstalled" comment="(OSK) Not installed term">Not installed</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_Caption_Documentation" comment="Term for the Documentation">Documentation:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_Documentation_Installed" comment="(Documentation) Installed term">Installed</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_Documentation_NotInstalled" comment="(Documentation) Not installed term">Not installed</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Message" comment="Keyboard download window, etc. - term for additional messages">Message:</string>
+
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Copyright" comment="Keyboard download window, etc. - term for copyright">Copyright:</string>
+
+  <!-- Context: Configuration Dialog - Footer -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Footer_ChangesImmediate" comment="Short-term (14.0) message explaining why Ok and Cancel buttons are no longer present">Changes are applied immediately</string>
+  
+  <!-- Context: Configuration Dialog - Footer -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_InstallKeyboard" comment="Keyboard Layouts - install keyboard button">Install keyboard...</string>
+
+  <!-- Context: Configuration Dialog - Footer -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_DownloadKeyboard" comment="Keyboard Layouts - download keyboard button">Download keyboard...</string>
+
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.287.0 -->
+  <string name="S_Menu_Options" comment="KL option button submenu - keyboard options">Keyboard options</string>
+
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Keyboards_NoKeyboardsInstalled" comment="Keyboard Layouts - notice of no keyboard layouts installed">You do not have any keyboards installed.  Click the Download Keyboard button to install a keyboard layout from the Keyman website.</string>
+
+  <!-- Parameters: %1$s = keyboard layout name -->
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- Introduced: 7.1.251.0 -->
+  <!-- String Type: PlainText -->
+  <string name="SKUninstallRequireAdmin" comment="Keyboard Layouts - notice of ineligibility to uninstall a keyboard">You can only uninstall the keyboard \'%1$s\' if you are an Administrator</string>
+
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share" comment="Keyboard Layouts - share selected keyboard button">Share keyboard</string>
+
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share_QRCode" comment="Keyboard Layouts - caption explaining QRCode, plus prefix to link to share">Scan this code to load this keyboard on another device or </string>
+
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share_Link" comment="Keyboard Layouts - text for link to share">share online</string>
+
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share_LinkSuffix" comment="Keyboard Layouts - suffix for link to share"/>
+
+  
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="kogGeneral" comment="Options section - General">General</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="kogStartup" comment="Options section - Startup">Startup</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="kogOSK" comment="Options section - OSK">On Screen Keyboard</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="kogAdvanced" comment="Options section - Advanced">Advanced</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koKeyboardHotkeysAreToggle" comment="General options - hotkeys toggle on AND off a keyboard layout">Keyboard hotkeys toggle keyboard activation</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koAltGrCtrlAlt" comment="General options - Ctrl+Alt simulates AltGr on computers without AltGr">Simulate AltGr with Ctrl+Alt</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 9.0.480.0 -->
+  <string name="koDeadkeyConversion" comment="Advanced options - Base keyboard deadkeys are treated as normal keys">Treat hardware deadkeys as plain keys</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="koShowHints" comment="General options - show/hide hint messages (resets hint messages individually disabled)">Show hint messages</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0 -->
+  <string name="koAutomaticallyReportErrors" comment="General options - report errors to Keyman team automatically">Automatically report errors to keyman.com</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0 -->
+  <string name="koAutomaticallyReportUsage" comment="General options - report anonymous usage to Keyman team automatically">Share anonymous usage statistics with keyman.com</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koStartWithWindows" comment="Startup options - Start Keyman with Windows start">Start when Windows starts</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koShowStartup" comment="Startup options - show/hide splash screen">Show splash screen</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">Show welcome screen</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koCheckForUpdates" comment="Startup options - check online weekly for updates">Automatically check keyman.com weekly for updates</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.236.0 -->
+  <string name="koTestKeymanFunctioning" comment="Startup options - test for conflicting apps when Product starts">Test for conflicting applications when Keyman for FirstVoices starts</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.236.0 -->
+  <string name="koReleaseShiftKeysAfterKeyPress" comment="OSK options - Releases shift/ctrl/alt on OSK after key press">Release Shift/Ctrl/Alt on On Screen Keyboard after clicking a key</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="koAutoOpenOSK" comment="OSK options - auto-open OSK">Always show On Screen Keyboard Window when a FirstVoices keyboard is selected</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="koAutoSwitchOSKPages" comment="OSK options - when a keyboard is activated, switch to most appropriate page in OSK">Switch to appropriate On Screen Keyboard/Help automatically when a keyboard is selected</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koTurnOnSurrogates" comment="Advanced options - turn on Unicode suplementary character display (not needed in Vista)">Turn on Unicode supplementary character display (requires restart)</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koUnknownLanguage" comment="Advanced options - installs Unknown Language in Windows Control Panel (should only be used for legacy layouts).">Turn on \'Unknown\' language</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koDebugging" comment="Advanced options - turn on debugging (which creates a very large file)">Debugging</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="koSwitchLanguageWithKeyboard" comment="Advanced options - switch Windows language when keyboard selected">Switch Windows language when a FirstVoices keyboard is selected</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.1.274.0 -->
+  <string name="koSwitchLanguageForAllApplications" comment="Advanced options - selected language applies to all applications">Select keyboard layout for all applications</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koRunElevatedInVista" comment="Advanced options - elevate user permission to highest permissible level">Always elevate user permissions when running in Windows Vista</string>
+
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.445.0 -->
+  <string name="S_Button_BaseKeyboard" comment="Options tab - base keyboard button">Base Keyboard...</string>
+
+  
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.241.0 -->
+  <string name="S_Hotkey_Language_Prefix" comment="Hotkey - activation term preceding Windows language name. Note: include a space following."/>
+  <!-- e.g. "Activate [Korean KORDA] Keyboard" -->
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.241.0 -->
+  <string name="S_Hotkey_Language_Suffix" comment="Hotkey - language term following Windows language name. Note: include an initial space."/>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_None" comment="Hotkey - text used when no hotkey set for an option">(none)</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_TurnKeymanOff" comment="Hotkey - Turn Product Off">Switch Keyman for FirstVoices Off</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_OpenKeyboardMenu" comment="Hotkey - Open Keyman system tray menu">Open Keyboard Menu</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_ShowOnScreenKeyboard" comment="Hotkey - show keyboard in OSK">Show On Screen Keyboard Pane</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_OpenConfiguration" comment="Hotkey - open Keyman Configuration">Open Configuration</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.275.0 -->
+  <string name="S_Hotkey_ShowFontHelper" comment="Hotkey - show font helper in OSK">Show Font Helper Pane</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.275.0 -->
+  <string name="S_Hotkey_ShowCharacterMap" comment="Hotkey - show character map in OSK">Show Character Map Pane</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.275.0 -->
+  <string name="S_Hotkey_OpenTextEditor" comment="Hotkey - open text editor">Open Text Editor</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Hotkey_SwitchLanguage" comment="Hotkey - switch language window">Open Language Switcher</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.274.0 -->
+  <string name="S_Hotkey_Control_Title" comment="Hotkey - Control Title">General Hotkeys</string>
+
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.274.0 -->
+  <string name="S_Hotkey_Keyboard_Title" comment="Hotkey - Keyboard Title">Keyboard Layouts</string>
+
+  
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.465.0 -->
+  <string name="S_Support_ContactInstructions_Free" comment="">If you have any issues using Keyman for FirstVoices, just ask a question on the FirstVoices Help Center.</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.465.0 -->
+  <string name="S_Button_CommunitySupport" comment="">Open FirstVoices Help Center</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 11.0.1500.0 -->
+  <string name="S_Support_CreatedBySIL" comment="Support - SIL statement">Created by SIL International</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support_Copyright" comment="Support - Product Copyright">Copyright © SIL International. All Rights Reserved.</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support_Version" comment="Support - version">Version</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Support_UsefulLinks" comment="Support - Useful Links heading">Useful Links</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_OnlineSupport" comment="Support button - links to online support">Online Help</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_CheckForUpdates" comment="Support button - manually checks for product updates">Check for Updates</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_ProxyConfig" comment="Options button - allows manual adjustment of proxy settings">Proxy Settings...</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_SettingsManager" comment="Options button - access to the Settings Manager">Keyman System Settings...</string>
+
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">Diagnostics</string>
+
+  
+
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_DownloadKeyboard_Title" comment="Download keyboard layout from keyman.com dialog title">Download Keyboard From keyman.com</string>
+
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_DownloadKeyboard_DownloadOnlyCheckbox" comment="Download only option checkbox">Don\'t install, just download</string>
+
+  <!-- Parameters: %1$s = Error Message, %2$d Error Code -->
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_DownloadKeyboard_DownloadError" comment="Message shown when there is an error downloading the keyboard package">Unable to download keyboard, error %2$d: %1$s</string>
+
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Button_Back" comment="Back button">&lt; Back</string>
+  
+  
+
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Title" comment="Install keyboard/package dialog title">Install Keyboard/Package</string>
+
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Tab_Details" comment="Install keyboard/package - details">Details</string>
+
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Tab_Readme" comment="Install keyboard/package - readme">Readme</string>
+
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Button_Install" comment="Install keyboard/package - install button">Install</string>
+
+  
+  
+
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Title" comment="Proxy configuration dialog title">Proxy Server Configuration</string>
+
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Server" comment="Proxy dialog - fillable-field server">Server: </string>
+
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Port" comment="Proxy dialog - fillable-field port">Port: </string>
+
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Username" comment="Proxy dialog - fillable-field username">Username: </string>
+
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Password" comment="Proxy dialog - fillable-field password">Password: </string>
+
+  
+  
+
+  <!-- Context: Base Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.445.0 -->
+  <string name="S_BaseKeyboard_Title" comment="Base keyboard dialog title">Set Base Keyboard</string>
+
+  <!-- Context: Base Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.445.0 -->
+  <string name="S_BaseKeyboard_Text" comment="Base keyboard dialog description">Select the base Latin script
+keyboard that you use in Windows.  Keyman for FirstVoices will adapt automatically to your preferred layout.</string>
+
+  
+
+
+  <!-- Context: Hotkey Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKChangeHotkeyTitle" comment="Change Hotkey dialog title">Change Hotkey</string>
+
+  <!-- Parameters: %1$s = Name of keyboard -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 7.0.241.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKSetHotkey_Language" comment="Hotkey dialog - message when setting hotkey for a language">Select a standard hotkey or choose \'Custom\' and hold Ctrl,Shift and/or Alt and type your desired hotkey for language %1$s:</string>
+
+  <!-- Context: Hotkey Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKSetHotkey_Interface" comment="Hotkey dialog - message displayed when changing a hotkey for a product feature (e.g. show menu or show on screen keyboard)">Select a standard hotkey or choose \'Custom\' and hold Ctrl,Shift and/or Alt and type your desired hotkey:</string>
+
+  <!-- Parameters: %1$s = Hotkey -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnsafeHotkey" comment="Hotkey dialog - warning of hotkey conflict with standard keyboard use">The hotkey %1$s will conflict with normal keyboard use.  You should use at least Ctrl or Alt.  Do you want to change this now\?</string>
+
+  <!-- Parameters: %1$s = Hotkey, %2$s = Conflicting keyboard -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKHotkeyConflicts_Keyboard" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another keyboard">The hotkey %1$s conflicts with the hotkey selected for keyboard %2$s.  If you continue, the hotkey for keyboard %2$s will be cleared.  Continue\?</string>
+
+  <!-- Parameters: %1$s = Hotkey -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 14.0.117 -->
+  <!-- String Type: FormatString -->
+  <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">The hotkey %1$s conflicts with another hotkey.  If you continue, the other hotkey will be cleared.  Continue\?</string>
+
+  
+  
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_Title" comment="Update dialog title, where Keyman = product name">Updated Keyman for FirstVoices Components Available</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_NewVersionAvailable" comment="Update dialog - updates available text">Updates for Keyman for FirstVoices are now available</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_NewVersionPrompt" comment="Update dialog - prompt to select updates">Please select the updates you wish to install:</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_DownloadFrom" comment="Update dialog - download information">You can download the new version from:</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_Button_InstallNow" comment="Update dialog - install now button">Install Now</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_Button_InstallLater" comment="Update dialog - cancel button">Cancel</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_OldVersionHead" comment="Update dialog - old version">Old Version</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_ComponentHead" comment="Update dialog - update component">Updated Component</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_SizeHead" comment="Update dialog - update size">Size</string>
+
+  <!-- Parameters: %1$s = Current version number -->
+  <!-- Context: Online Update Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUpdate_KeymanText" comment="Update dialog - name and version of updatable product">Keyman for FirstVoices %1$s</string>
+
+  <!-- Parameters: %1$s = Package description, %2$s = Current package version number -->
+  <!-- Context: Online Update Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUpdate_PackageText" comment="Update dialog - name and version of updatable keyboard layout package">Keyboard %1$s %2$s</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUpdate_UnableToContact" comment="Update dialog - unable to access keyman.com warning">Unable to contact keyman.com - please make sure you have an active Internet connection and try again.</string>
+
+  <!-- Parameters: %1$s = Error message -->
+  <!-- Context: Online Update Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUpdate_UnableToContact_Error" comment="Update dialog - unable to access keyman.com error message">Unable to contact keyman.com - please make sure you have an active Internet connection and try again.  The error received was: %1$s</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconTitle" comment="Update icon - title">Keyman for FirstVoices updates are available</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconText" comment="Update icon - text">Click this icon to download and install updates</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconMenuText" comment="Update icon - install menu item">View and &amp;install Keyman for FirstVoices updates</string>
+
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">E&amp;xit online update check</string>
+
+  
+  
+
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="S_Splash_Name" comment="Splash major title">Keyman for FirstVoices</string>
+
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Splash_Start" comment="Start Keyman button">Start Keyman for FirstVoices</string>
+
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Splash_Exit" comment="Exit button">Exit</string>
+
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Splash_Configuration" comment="Keyman Configuration link">Configuration</string>
+
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.341.0 -->
+  <string name="S_Splash_ShowAtStartup" comment="Show at Startup toggle">Show this screen at startup</string>
+
+  
+  
+
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.278.0 -->
+  <string name="S_DisplayIn" comment="'Display In' text label for UI language menu">Display in</string>
+
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.278.0 -->
+  <string name="S_MoreUILanguagesMenu" comment="More UI languages online menu item">Find other display languages online...</string>
+
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.525.0 -->
+  <string name="S_ContributeUILanguagesMenu" comment="Link to contribute to language UI">Help translate the user interface...</string>
+
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUILanguageName" comment="User interface language name in the UI language">English</string>
+
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUILanguageNameWithEnglish" comment="UI language name in the UI language with the English name in parentheses  (this message is used when the user gets stuck in a strange UI language)">English</string>
+
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKLanguageCode" comment="The language code for the current translation">en</string>
+
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKDefaultLanguageCode" comment="The default language code for this product.  This should be the language that the product is created in. For Keyman this must stay 'en', for all translations.">en</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKShortApplicationTitle" comment="Product name">Keyman for FirstVoices</string>
+
+  
+  
+
+  <!-- Context: Hints -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="S_Button_ResetHints" comment="Hint - options tab button to reset hints">Reset Hints</string>
+
+  <!-- Context: Hints -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="SKHintsReset" comment="Hint - options tab dialog confirming reset of hints">All hint messages have been reset and will be displayed again.</string>
+
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: HintTitle -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="HintTitle_KH_EXITPRODUCT" comment="Hint - dialog title upon attempting to exit product">Exit Keyman for FirstVoices\?</string>
+
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: Hint -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="Hint_KH_EXITPRODUCT" comment="Hint - asks for confirmation, explains the difference between de-activating a keyboard layout and closing Product">Are you sure you want to exit Keyman for FirstVoices\?  Your FirstVoices keyboards will still be listed in the Windows languages, but will not be functional until you restart Keyman for FirstVoices.</string>
+
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: HintTitle -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="HintTitle_KH_CLOSEOSK" comment="Hint - dialog title upon closing the OSK">On Screen Keyboard Closed</string>
+
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: Hint -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="Hint_KH_CLOSEOSK" comment="Hint - explains that Product is still running and informs how to reopen OSK">You have closed the On Screen Keyboard.  Keyman for FirstVoices is still running.  You can open the On Screen Keyboard at any time by clicking on the Keyman for FirstVoices Icon and selecting "On Screen Keyboard"</string>
+
+  <!-- Context: Hints -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 10.0.836.0 -->
+  <string name="S_HintDialog_DontShowHintAgain" comment="Hint dialog - caption of checkbox at bottom of dialog">Don\'t show this hint again</string>
+
+  
+  
+
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_HelpTitle" comment="Help - product name help">Keyman for FirstVoices Help</string>
+
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Help_Product" comment="Help - help contents link title">Help Contents</string>
+
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Help_Keyboard_Prefix" comment="Help - text preceding keyboard name">Help on "</string>
+
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Help_Keyboard_Suffix" comment="Help - text following keyboard name">" keyboard</string>
+
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_ViewOnScreenKeyboard" comment="Toolbar help - View OSK pop-up text">View On Screen Keyboard</string>
+
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_ViewFontHelper" comment="Toolbar help - View Font Helper pop-up text">View Font Helper</string>
+
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_ViewCharacterMap" comment="Toolbar help - View Character Map pop-up text">View Character Map</string>
+
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_OpenConfiguration" comment="Toolbar help - Open Keyman Configuration pop-up text">Open Keyman for FirstVoices Configuration</string>
+
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_OpenHelp" comment="Toolbar help - Open help pop-up text">Open Help</string>
+
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_CloseOnScreenKeyboard" comment="Toolbar help - Close OSK pop-up text">Close On Screen Keyboard</string>
+
+  
+  
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_SwitchKeymanOff" comment="Systray item - Switch Keyman Off [&amp; precedes alt + access-character]">Switch Keyman for FirstVoices &amp;Off</string>
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_OnScreenKeyboard" comment="Systray item - OSK [&amp; precedes alt + access-character]">On Screen &amp;Keyboard</string>
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_FontHelper" comment="Systray item - Font Helper [&amp; precedes alt + access-character]">&amp;Font Helper</string>
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_CharacterMap" comment="Systray item - Character Map [&amp; precedes alt + access-character]">Character &amp;Map</string>
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_TextEditor" comment="Systray item - Text Editor [&amp; precedes alt + access-character]">&amp;Text Editor...</string>
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Configuration" comment="Systray item - Configuration [&amp; precedes alt + access-character]">&amp;Configuration...</string>
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Help" comment="Systray item - Help [&amp; precedes alt + access-character]">&amp;Help...</string>
+
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Exit" comment="Systray item - Exit [&amp; precedes alt + access-character]">E&amp;xit</string>
+
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_FadeWhenInactive" comment="OSK right-click menu - fade OSK when mouse is elsewhere">Fade When Inactive</string>
+
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_ShowToolbar" comment="OSK right-click menu - show/hide OSK toolbar">Show Toolbar</string>
+
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_SaveAsWebPage" comment="OSK right-click menu - save diagram of active keyboard layout as a web page">Save as Web Page...</string>
+
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_Print" comment="OSK right-click menu - print diagram of active keyboard layout">Print...</string>
+
+
+  
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKApplicationTitle" comment="Product name used for the title of message boxes and message dialogs">Keyman for FirstVoices</string>
+
+  <!-- Parameters: %1$s = Version number string -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKSplashVersion" comment="Version number">Version %1$s</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.239.0 -->
+  <string name="SKButtonPrint" comment="Print button in Welcome dialog for keyboards">&amp;Print...</string>
+
+  
+
+  <!-- Parameters: %1$s = Package to be uninstalled -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKPackageAlreadyInstalled" comment="Notice during package installation that a package with the same name is already installed.">A package with the name %1$s is already installed.  Do you want to uninstall it and install the new one\?</string>
+
+  <!-- Parameters: %1$s = Keyboard name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKKeyboardAlreadyInstalled" comment="Notice during keyboard layout installation that a keyboard layout with the same name is already installed.">A keyboard with the name \'%1$s\' is already installed.  If you continue, it will be uninstalled before the new one is installed.  Continue\?</string>
+
+  <!-- Parameters: %1$s = Keyboard name, %2$s = Package name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKKeyboardPartOfPackage" comment="Notice of need to uninstall an entire package">The keyboard \'%1$s\' is part of package \'%2$s\'.  You must uninstall the entire package.  Continue\?</string>
+
+  <!-- PArameters: %1$s = BCP 47 code -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 14.0.211 -->
+  <!-- String Type: FormatString -->
+  <string name="SKInstallLanguageTransientLimit" comment="Message shown when Keyman is unable to install a Windows language for a keyboard">Unable to install keyboard language; Windows has a limit of 4 custom \'transient\' languages, and you may have reached this limit.</string>
+
+  <!-- Parameters: %1$s = Package Name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKPackageDoesNotIncludeWelcome" comment="Notice of lack of introductory help">The package or keyboard \'%1$s\' does not include any introductory help.</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKOSNotSupported" comment="Notice of unsupported operating system">This operating system is not supported.</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKOnlineHelpFile" comment="File name of the help file - must be .chm format.  The locale folder will be checked first for the file">KeymanDesktop.chm</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKCouldNotFindHelp" comment="Notice of help file not found">The help file could not be found.</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKANSIEncoding" comment="Keyboard with an ANSI or Codepage encoding">Codepage</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUnicodeEncoding" comment="Keyboard with a Unicode encoding">Unicode</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKDownloadProgress_Title" comment="Notice of file downloading">Downloading File</string>
+
+  
+
+
+  <!-- Parameters: %1$s = Keyboard name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallOnScreenKeyboard" comment="Request for confirmation to uninstall OSK for a keyboard layout">Are you sure you want to remove the on screen keyboard installed for %1$s\?</string>
+
+  <!-- Parameters: %1$s = Keyboard name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.239.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallKeyboard" comment="Request for confirmation to uninstall keyboard layout">Are you sure you want to uninstall keyboard %1$s\?</string>
+
+  <!-- Parameters: %1$s = Package name, %2$s: Fonts list -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.239.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallPackage" comment="Request for confirmation to uninstall a package">Are you sure you want to uninstall package %1$s\?\n\n%2$s</string>
+
+  <!-- Parameters: %1$s = Fonts list -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.1.270.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallPackageFonts" comment="Text embedded in SKUninstallPackage when fonts are ready for uninstall.">The following fonts will also be uninstalled: %1$s.</string>
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUnicodeData_Build" comment="Request to build Unicode Character Map database">The Character Map has a database of characters that needs to be built before it can be used.  Build it now\?</string>
+
+  
+
+
+  <!-- Parameters: %1$s = Error detail string -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnicodeData_DatabaseCouldNotBeDeleted" comment="Error deleting Unicode Character Map database">The Unicode Character database could not be deleted for a rebuild.  Error details are: %1$s</string>
+
+  <!-- Parameters: %1$s = Error details -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnicodeData_CouldNotCreateDatabase" comment="Error creating Unicode Character Map database">The Unicode Character database could not be created and has been disabled.  Error details are: %1$s</string>
+
+  <!-- Parameters: %1$s = Error message -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnicodeData_DatabaseLoadFailedRebuild" comment="Error loading Unicode Character Map database. Request to rebuild.">The Unicode character database did not load successfully (%1$s).  Rebuild it now\?</string>
+
+
+  <!-- Parameters: %1$s: error message -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.241.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKCannotStartProduct" comment="Error from Keyman failing to start keyman.exe due to an access denied or file not found">Keyman for FirstVoices failed to start.  Please check your security settings to make sure that the program keyman.exe is allowed to start before continuing.  The error returned was:\n\n"%1$s"\n\nDo you want to try and start Keyman for FirstVoices again now\?</string>
+
+
+
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKDebuggingWarning" comment="Warning upon starting debugging in the Options tab">Keyman debug information will be stored in a log file called %LOCALAPPDATA%\Keyman\Diag\system#.etl (where # is a number). You should exit Keyman for FirstVoices before attempting to delete this file.\n\n\WARNING: This file can grow large very quickly.  Enabling debugging may slow down your system and should only be done if advised by technical support.\n\nPRIVACY WARNING: Please note that the debug logfile records all keystrokes that you type.  You should only turn on the debug log for the duration of a debugging or diagnostic session.</string>
+
+
+
+
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_PleaseWait" comment="OSK Font helper message">Please wait while searching for related fonts for keyboard %1$s</string>
+
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_NonUnicode" comment="OSK Font helper non-Unicode keyboard">Keyboard %1$s is not a Unicode keyboard. Fonts cannot be automatically located.  Please check the keyboard documentation for font information.</string>
+
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_NoKeyboards" comment="OSK Font helper no keyboards">No keyboard layouts are currently installed or loaded.</string>
+
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_ChooseKeyboard" comment="OSK Font helper choose keyboard">Please select a FirstVoices keyboard to find related fonts.</string>
+
+
+  
+  <!-- Context: Text Editor -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 10.0.836.0 -->
+  <string name="SKTextEditorCaption" comment="Caption of Text Editor">Text Editor - Keyman for FirstVoices</string>
+
+</resources>
diff --git a/oem/firstvoices/windows/src/xml/vkhints.xsl b/oem/firstvoices/windows/src/xml/vkhints.xsl
deleted file mode 100644
index e165b706d9..0000000000
--- a/oem/firstvoices/windows/src/xml/vkhints.xsl
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:include href="elements.xsl"/>
-
-	<xsl:template match="/">
-
-		<html>
-			<head>
-				<!--<META http-equiv="Page-Enter" CONTENT="progid:DXImageTransform.Microsoft.Pixelate(Duration=1)" />-->
-
-				<title>hintbar</title>
-				<style type="text/css">
-          * { font-family: Tahoma; font-size: 11px; }
-
-          body { padding: 0px 0px 0px 0px; margin: 0px; overflow: hidden;  width: 100%; height: 100%; background: #5E97A8 ; }
-          html { padding: 0px; margin: 0px; overflow: hidden; }
-
-          #size { width: 100%; height: 20px; position: absolute; top: -30px }
-
-          #outer { height: 100%; width: 100%; position: absolute; left: 0; top: 0; overflow: hidden; }
-          #center { position: relative; left: 0; top: 50%; width: 100%; height: 100% }
-          #inner { position: relative; top: -50%; width: 100%; height: 100%; overflow: hidden; white-space: nowrap; padding: 2px 0px 0px 0px; }
-          #control { padding-right: 2px; padding-left: 2px; position: absolute; top: -50%; right: -1px; padding-top: 2px; z-index: 1; background: #5E97A8; }
-
-          a.button, a.button:visited { padding: 2px; display: block; float: left; }
-          a.button:hover { background: #A1BDD7; }
-          a.button img { border: none }
-
-          .hint { color: #222222; display: none; white-space: nowrap; position: relative; left: 0; top: 2px; height: 16px; vertical-align: middle; float: left; }
-          .hint img { vertical-align: bottom; width:16px; height:16px; }
-          #hinttitle { color: #222222; display: block; height: 16px; vertical-align: middle; padding: 0 4px 0 4px; background: #5E97A8; z-index: 2; position: relative; left: 0; top: 2px; float: left; }
-        </style><script type="text/javascript"><![CDATA[
-					var hints = new Array(), currhint = 0, activehint = null, scrollInterval = 0, startScrollTimeout = null, autohintInterval = null;
-					function finishload()
-					{
-						var elems = document.getElementsByTagName('div');
-						for(var i in elems)
-						if(elems[i].className == 'hint') hints.push(elems[i]);
-						nexthint();
-					}
-          
-          function filterchange()
-          {
-            if(inner.filters[0].status == 0)
-            {
-              setScrollTimeout(2000);
-              inner.style.filter='';
-            }
-          }
-          
-          function setScrollTimeout(tm)
-          {
-            if(startScrollTimeout != null) window.clearTimeout(startScrollTimeout);
-            startScrollTimeout = window.setTimeout(startScroll, tm);
-          }
-          
-          function startScroll()
-          {
-            stopScroll();
-            if(!activehint) return;
-            activehint.style.left = '0px';
-            if(activehint.offsetWidth+activehint.offsetLeft > inner.offsetWidth - control.offsetWidth)
-              scrollInterval = window.setInterval(scroll, 75);
-          }
-          
-          function stopScroll()
-          {
-            if(scrollInterval != null) window.clearInterval(scrollInterval);
-            scrollInterval = null;
-          }
-
-          function scroll()
-          {
-            if(!activehint) return;
-            if(activehint.offsetWidth+activehint.offsetLeft > inner.offsetWidth - control.offsetWidth)
-              activehint.style.left = (activehint.offsetLeft-hinttitle.offsetWidth-1) + 'px';
-            else
-            {
-              stopScroll();
-              setScrollTimeout(5000);
-            }
-          }
-          
-					function autohint()
-					{
-            inner.style.filter='progid:DXImageTransform.Microsoft.Fade(duration=0.25,overlap=1.0)';
-						inner.filters[0].Apply();
-            gotohint(1);
-						inner.filters[0].Play();
-          }
-          
-          function gotohint(n)
-          {
-						if(hints.length == 0) return;
-						
-            stopScroll();
-            
-						hints[currhint].style.display = '';
-            hints[currhint].style.left = '0px';
-            currhint += n;
-						if(currhint >= hints.length) currhint = 0;
-            else if (currhint < 0) currhint = hints.length - 1;
-						hints[currhint].style.display = 'block';
-            activehint = hints[currhint];
-					}
-
-          function nexthint()
-					{
-            inner.style.filter='';
-            gotohint(1);
-            if(autohintInterval != null) window.clearInterval(autohintInterval);
-            autohintInterval = window.setInterval(autohint, 5000);
-            setScrollTimeout(2000);
-					}
-
-					function prevhint()
-					{
-            inner.style.filter='';
-						gotohint(-1);
-            if(autohintInterval != null) window.clearInterval(autohintInterval);
-            autohintInterval = window.setInterval(autohint, 5000);
-            setScrollTimeout(2000);
-					}
-				]]></script>
-			</head>
-
-			<body onload="finishload()">
-				<div id="size"></div>
-				<div id="outer">
-					<div id="center">
-						<div id="control">
-							<a class="button" href="javascript:prevhint();">
-								<img style="height:13px; width:13px">
-									<xsl:attribute name="src">
-										<xsl:value-of select="/Keyman/templatepath"/>hint_prev.gif
-									</xsl:attribute>
-								</img>
-							</a>
-							<a class="button" href="javascript:nexthint();">
-								<img style="height:13px; width:13px">
-									<xsl:attribute name="src">
-										<xsl:value-of select="/Keyman/templatepath"/>hint_next.gif
-									</xsl:attribute>
-								</img>
-							</a>
-              <a class="button" href="javascript:location.href='keyman:closehintbar'">
-                <img style="height:13px; width:13px"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>hint_close.gif</xsl:attribute></img>
-              </a>
-						</div>
-
-						<div id="inner" onfilterchange="filterchange()">
-							<div id="hinttitle"><b><xsl:value-of select="$locale/string[@name='S_OSK_Hint_Title']"/></b></div>
-              <div class="hint"><xsl:value-of select="$locale/string[@name='S_OSK_Hint1']" /></div>
-              <div class="hint"><xsl:value-of select="$locale/string[@name='S_OSK_Hint2']" /></div>
-              <div class="hint">
-                <xsl:value-of select="$locale/string[@name='S_OSK_Hint3a']" />
-                <xsl:text xml:space="preserve"> </xsl:text>
-                <img alt="icon"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>charmapicon.gif</xsl:attribute></img>
-                <xsl:text xml:space="preserve"> </xsl:text>
-                <xsl:value-of select="$locale/string[@name='S_OSK_Hint3b']" />
-              </div>
-              <div class="hint">
-                <xsl:value-of select="$locale/string[@name='S_OSK_Hint4a']" />
-                <xsl:text xml:space="preserve"> </xsl:text>
-                <img alt="icon"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>fonthinticon.gif</xsl:attribute></img>
-                <xsl:text xml:space="preserve"> </xsl:text>
-                <xsl:value-of select="$locale/string[@name='S_OSK_Hint4b']" />
-              </div>
-              <div class="hint">
-                <xsl:value-of select="$locale/string[@name='S_OSK_Hint5a']" />
-                <xsl:text xml:space="preserve"> </xsl:text>
-                <img alt="icon"><xsl:attribute name="src"><xsl:value-of select="/Keyman/templatepath"/>keyboardhelpicon.gif</xsl:attribute></img>
-                <xsl:text xml:space="preserve"> </xsl:text>
-                <xsl:value-of select="$locale/string[@name='S_OSK_Hint5b']" />
-              </div>
-						</div>
-					</div>
-				</div>
-			</body>
-		</html>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/oem/firstvoices/windows/src/xml/welcome_fonts.xsl b/oem/firstvoices/windows/src/xml/welcome_fonts.xsl
index a812594091..ab3780a854 100644
--- a/oem/firstvoices/windows/src/xml/welcome_fonts.xsl
+++ b/oem/firstvoices/windows/src/xml/welcome_fonts.xsl
@@ -8,11 +8,11 @@
 
 		<html>
 			<head>
-				<!-- META http-equiv="Page-Enter" CONTENT="progid:DXImageTransform.Microsoft.Pixelate(Duration=1)" / -->
-
+        <script src="/app/sentry.bundle.min.js"></script>
+        <script src="/app/sentry.init.js"></script>
 				<title>fonts</title>
 				<style type="text/css">
-					* { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />; font-size: 13.3px; }
+					* { font-family: <xsl:value-of select="($locale/string[@name='SK_UIFontName'])[1]" />, "Segoe UI"; font-size: 13.3px; }
 
 					body { padding: 24px 16px; margin: 0px; overflow: auto; height: 100%; background: #A0C1DC; border: none; }
 					html { padding: 0px; margin: 0px; overflow: auto; }
@@ -60,20 +60,16 @@
 						<div><xsl:copy-of select="$locale/string[@name='S_FontHelper_NoFonts'][1]"/></div>
 					</xsl:otherwise>
 				</xsl:choose>
-				
+
 				<div style="margin-top: 24px">
           <xsl:copy-of select="$locale/string[@name='S_FontHelper_Hint1']"/>
           <xsl:text xml:space="preserve"> </xsl:text>
-          <img style="vertical-align: middle; margin: 0 2px 0 0">
-					  <xsl:attribute name="src">
-						  <xsl:value-of select="/Keyman/templatepath"/>fonthinticon.gif
-					  </xsl:attribute>
-				  </img>
+          <img style="vertical-align: middle; margin: 0 2px 0 0" src="/app/fonthinticon.gif" />
           <xsl:text xml:space="preserve"> </xsl:text>
           <xsl:copy-of select="$locale/string[@name='S_FontHelper_Hint2']"/>
         </div>
 			</body>
-			
+
 		</html>
 	</xsl:template>
 
@@ -83,11 +79,11 @@
 				<a>
 					<xsl:attribute name="href">keyman:selectfont?font=<xsl:value-of select="@Name"/></xsl:attribute>
 					<xsl:value-of select="@Name" />
-				</a> 
+				</a>
 			</td>
 			<td>
 				<xsl:value-of select="@Coverage" />%
 			</td>
 		</tr>
 	</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/windows/src/desktop/help/htmlink.lua b/resources/build/htmlink.lua
similarity index 100%
rename from windows/src/desktop/help/htmlink.lua
rename to resources/build/htmlink.lua
diff --git a/resources/build/trigger-definitions.inc.sh b/resources/build/trigger-definitions.inc.sh
index 704b0952c6..d1d6375c45 100644
--- a/resources/build/trigger-definitions.inc.sh
+++ b/resources/build/trigger-definitions.inc.sh
@@ -9,11 +9,11 @@ available_platforms=(android ios linux mac web windows)
 # e.g. android='common/models|common/predictive-text'
 # will expand into android='^(android|(oem/[^/]+/android)|common/models|common/predictive-text)'
 
-watch_android='web|common/models|common/predictive-text|common/lexical-model-types'
-watch_ios='web|common/models|common/predictive-text|common/lexical-model-types'
+watch_android='web|common/models|common/predictive-text|common/lexical-model-types|common/core/web'
+watch_ios='web|common/models|common/predictive-text|common/lexical-model-types|common/core/web'
 watch_linux='common/engine'
 watch_mac='common/engine'
-watch_web='common/models|common/predictive-text|common/lexical-model-types'
+watch_web='common/models|common/predictive-text|common/lexical-model-types|common/core/web'
 
 # Windows currently builds Developer and Desktop, so we need everything from common,developer,web
 watch_windows='common|developer|web'
diff --git a/resources/build/version/src/fixupHistory.ts b/resources/build/version/src/fixupHistory.ts
index 42d7bdc8b7..00b4813d04 100644
--- a/resources/build/version/src/fixupHistory.ts
+++ b/resources/build/version/src/fixupHistory.ts
@@ -223,17 +223,20 @@ export const sendCommentToPullRequestAndRelatedIssues = async (
   // https://docs.github.com/en/rest/guides/best-practices-for-integrators#dealing-with-abuse-rate-limits
   let result: Promise<any> = Promise.resolve();
   pulls.forEach(pull => {
-    console.log(`Creating comment on Pull Request #{pull}`);
+
     result = result
       // At least 1 second delay between requests; we'll do 10 seconds
       .then(() => new Promise(resolve => setTimeout(resolve, 10000)))
       // Always serially rather than in parallel
-      .then(() => octokit.issues.createComment({
-        owner: 'keymanapp',
-        repo: 'keyman',
-        issue_number: pull,
-        body: messagePull,
-      }));
+      .then(() => {
+        console.log(`Creating comment on Pull Request #${pull}`);
+        return octokit.issues.createComment({
+          owner: 'keymanapp',
+          repo: 'keyman',
+          issue_number: pull,
+          body: messagePull,
+        })
+      });
   });
 
   return result;
diff --git a/windows/src/Makefile b/windows/src/Makefile
index d89939aa84..b3b56b8a32 100644
--- a/windows/src/Makefile
+++ b/windows/src/Makefile
@@ -232,12 +232,12 @@ build-release-wrapper: clean-output global-versions
     $(MAKE) dirs
     $(MAKE) build-tools
 !ifdef QUICK_BUILD_KEYMAN
-    $(MAKE) build
-    $(MAKE) build-release
+    $(MAKE) -DSIGNCODE_BUILD build
+    $(MAKE) -DSIGNCODE_BUILD build-release
     $(MAKE) signcode
 !else
-    $(MAKE) build unit-tests
-    $(MAKE) build-release
+    $(MAKE) -DSIGNCODE_BUILD build unit-tests
+    $(MAKE) -DSIGNCODE_BUILD build-release
     $(MAKE) signcode
     $(MAKE) -DTARGET=test test
     $(MAKE) backup
diff --git a/windows/src/desktop/help/build.sh b/windows/src/desktop/help/build.sh
index a429bfd0a0..13131bccb0 100644
--- a/windows/src/desktop/help/build.sh
+++ b/windows/src/desktop/help/build.sh
@@ -136,7 +136,7 @@ build_hhc() {
 # Compile all .md to .htm
 #
 
-MDLUA="$THIS_DIR/htmlink.lua"
+MDLUA="$KEYMAN_ROOT/resources/build/htmlink.lua"
 MD=`find -name "*.md"`
 DESTCHM="$THIS_DIR/../../../bin/help/desktop"
 
diff --git a/windows/src/desktop/kmshell/main/UfrmMain.pas b/windows/src/desktop/kmshell/main/UfrmMain.pas
index 3d1d20ca8d..34b19eae15 100644
--- a/windows/src/desktop/kmshell/main/UfrmMain.pas
+++ b/windows/src/desktop/kmshell/main/UfrmMain.pas
@@ -172,6 +172,7 @@ uses
   Hints,
   HotkeyUtils,
   initprog,
+  Keyman.Configuration.System.TIPMaintenance,
   Keyman.Configuration.UI.UfrmDiagnosticTests,
   KeymanOptionNames,
   KeymanVersion,
@@ -553,10 +554,38 @@ end;
 procedure TfrmMain.Keyboard_ClickCheck(params: TStringList);
 var
   kbd: IKeymanKeyboardInstalled;
+  lang: IKeymanKeyboardLanguageInstalled2;
+  loaded: Boolean;
 begin
   if GetKeyboardFromParams(params, kbd) then
   begin
-    kbd.Loaded := StrToBool(params.Values['value']);
+    loaded := StrToBool(params.Values['value']);
+    if (params.Values['install'] <> '') and (kbd.Languages.Count > 0) then
+    begin
+      // For Keyman for FirstVoices, we will install the suggested language
+      // only when the checkbox is ticked, not when the keyboard is installed.
+      kbd.Loaded := True;
+      lang := kbd.Languages.Items[0] as IKeymanKeyboardLanguageInstalled2;
+      if loaded and not lang.IsInstalled then
+      begin
+        if not TTipMaintenance.DoInstall(kbd.ID, lang.WindowsBCP47Code) then
+        begin
+          // We'll need to refresh in this situation as the checkbox state will
+          // not match reality
+          ShowMessage(MsgFromIdFormat(SKInstallLanguageTransientLimit, [lang.WindowsBCP47Code]));
+          kbd.Loaded := False;
+          DoApply;
+          DoRefresh;
+        end;
+      end
+      else if not loaded and lang.IsInstalled then
+      begin
+        lang.Uninstall;
+        kbd.Loaded := False;
+      end;
+    end
+    else
+      kbd.Loaded := loaded;
     DoApply; // No need to refresh page (checkbox state will already be correct)
   end;
 end;
diff --git a/windows/src/desktop/kmshell/xml/menu.css b/windows/src/desktop/kmshell/xml/menu.css
index 27e222a59d..b1b7bec882 100644
--- a/windows/src/desktop/kmshell/xml/menu.css
+++ b/windows/src/desktop/kmshell/xml/menu.css
@@ -1,6 +1,6 @@
 /* Popup menu styles */
 .menu
-{ 
+{
   white-space: nowrap;
   position: absolute;
   display: block;
@@ -9,23 +9,23 @@
   border: solid 1px #ACA899;
   font-size: 11px;
   padding: 4px;
-  background-image: url("menugrey.gif"); 
-  background-repeat: repeat-y; 
+  background-image: url("menugrey.gif");
+  background-repeat: repeat-y;
   background-position: 0 0;
   width: 220px;
   z-index: 100;
 }
 
 .menuitem
-{ 
-  display: block; 
-  padding: 4px 4px 4px 28px; 
+{
+  display: block;
+  padding: 4px 4px 4px 28px;
   margin: 1px;
   cursor: default;
 }
- 
+
 .hover
-{ 
+{
   color: #000000;
   background: #FFE3DB;
   border: solid 1px #DB704F;
@@ -33,8 +33,8 @@
 }
 
 .down
-{ 
-  background: #DB704F; 
+{
+  background: #DB704F;
 }
 
 #menubackground {
diff --git a/windows/src/engine/kmcomapi/com/keyboardlanguages/keymankeyboardlanguageinstalled.pas b/windows/src/engine/kmcomapi/com/keyboardlanguages/keymankeyboardlanguageinstalled.pas
index c04cf8bc4c..a195176f73 100644
--- a/windows/src/engine/kmcomapi/com/keyboardlanguages/keymankeyboardlanguageinstalled.pas
+++ b/windows/src/engine/kmcomapi/com/keyboardlanguages/keymankeyboardlanguageinstalled.pas
@@ -134,6 +134,8 @@ begin
     try
       UninstallTip(FOwner.ID, Get_LangID, Get_ProfileGUID, False);
       if IsTransientLanguageID(Get_LangID) then
+        // TODO: this breaks re-enabling the keyboard because the reg entry is
+        // still referring to the old langid.
         SetLangID(0);
     finally
       Free;