diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 671531914..b8c0f6afa 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,87 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
 version: 2
 updates:
-  - package-ecosystem: npm
-    directory: '/'
+  - package-ecosystem: "github-actions"
+    directory: "/"
     schedule:
-      interval: weekly
-      day: saturday
-      time: '07:07'
-      timezone: America/Los_Angeles
-    open-pull-requests-limit: 10
-    versioning-strategy: increase
-    ignore:
-      - dependency-name: husky
-        versions:
-          - '>= 6.a, < 7'
-      - dependency-name: postcss
-        versions:
-          - 8.2.10
-          - 8.2.12
-          - 8.2.6
-          - 8.2.7
-          - 8.2.8
-          - 8.2.9
-      - dependency-name: '@types/jest'
-        versions:
-          - 26.0.21
-          - 26.0.22
-      - dependency-name: eslint
-        versions:
-          - 7.22.0
-          - 7.23.0
-          - 7.24.0
-      - dependency-name: '@typescript-eslint/eslint-plugin'
-        versions:
-          - 4.14.1
-          - 4.15.0
-          - 4.15.1
-          - 4.15.2
-          - 4.16.1
-          - 4.17.0
-          - 4.18.0
-          - 4.19.0
-          - 4.20.0
-          - 4.21.0
-          - 4.22.0
-      - dependency-name: husky
-        versions:
-          - 5.0.9
-          - 5.1.1
-          - 5.1.3
-          - 5.2.0
-      - dependency-name: typescript
-        versions:
-          - 4.1.5
-          - 4.2.2
-          - 4.2.3
-      - dependency-name: ts-jest
-        versions:
-          - 26.5.0
-          - 26.5.1
-          - 26.5.2
-          - 26.5.3
-      - dependency-name: check-node-version
-        versions:
-          - 4.1.0
-      - dependency-name: lint-staged
-        versions:
-          - 10.5.4
-      - dependency-name: '@types/node'
-        versions:
-          - 14.14.22
-          - 14.14.27
-      - dependency-name: autoprefixer
-        versions:
-          - 10.2.3
-          - 10.2.4
-      - dependency-name: '@typescript-eslint/parser'
-        versions:
-          - 4.14.1
-          - 4.18.0
-          - 4.19.0
-          - 4.20.0
-          - 4.21.0
-          - 4.22.0
-      - dependency-name: '@typescript-eslint/typescript-estree'
-        versions:
-          - 4.14.1
+      interval: "daily"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index b5ea07427..c8eea8846 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -9,8 +9,8 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22
       - name: Install dependencies
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 000000000..61609e250
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,29 @@
+name: Publish package to GitHub Packages
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      # Setup .npmrc file to publish to GitHub Packages
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22.x'
+          registry-url: 'https://npm.pkg.github.com'
+          # Defaults to the user or organization that owns the workflow file
+          scope: '@kedyou'
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5c38e5747..222a22e92 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,8 +9,8 @@ jobs:
     timeout-minutes: 20
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 22
       - name: Install dependencies
diff --git a/.npmrc b/.npmrc
index 7394de28d..fbe344986 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,4 @@
-loglevel="warn"
\ No newline at end of file
+//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}
+@kedyou:registry=https://npm.pkg.github.com
+always-auth=true
+loglevel="warn"
diff --git a/README.md b/README.md
index 3d3abbef3..5672b0c22 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
     <img alt="math live" src="assets/mathlive-1.png?raw=true">
 </div>
 
-<h3>The <strong>MathLive</strong> mathfield</h3>
+<h3><strong>Kedyou's fork of MathLive</strong></h3>
 <h1>A Web Component for Math Input</h1>
 
 [![Maintenance](https://img.shields.io/maintenance/yes/2025.svg)]()
@@ -124,3 +124,43 @@ contribution.
 ## 📃 License
 
 This project is licensed under the [MIT License](LICENSE.txt).
+
+## Kedyou
+
+The Kedyou modification of MathLive allows users to type multi-lined math
+quickly and easily, simplifying the inputs to create and modify aligned
+environments.
+
+Update with the latest changes from arnog:
+
+```sh
+# Add the remote, call it "upstream":
+git remote add upstream https://github.com/arnog/mathlive/
+# Fetch all the branches of that remote into remote-tracking branches
+git fetch upstream
+# Make sure that you're on your master branch:
+git checkout master
+# Rewrite your master branch so that any commits of yours that
+# aren't already in upstream/master are replayed on top of that
+# other branch:
+git rebase upstream/master
+# After finishing rebase/merging changes, force push
+git push --force
+```
+
+### Local testing
+
+To test the MathLive in Kedyou before publishing, use `pnpm link --global`:
+
+```sh
+# In mathlive repo
+pnpm link --global
+# In the kedyou-frontend repo
+pnpm link --global @kedyou/mathlive
+```
+
+#### **`sites/frontend/package.json`**
+```diff
+-"@kedyou/mathlive": "^0.98.6"
++"@kedyou/mathlive": "link:^0.98.6"
+```
diff --git a/css/mathfield.less b/css/mathfield.less
index ddb724637..15e1484a0 100644
--- a/css/mathfield.less
+++ b/css/mathfield.less
@@ -47,7 +47,7 @@
   /* This attribute is necessary to work around a Firefox issue where 
   where clicking multiple times on the border leads to a focused mathfield that cannot be edited until focus is lost and regained (also fixes the multiple cursor issue on firefox that can occur with the same sequence of events).
   */
-  pointer-events: auto;
+  pointer-events: var(--pointer-events, auto);
 
   /* Prevent the browser from trying to interpret touch gestures in the field */
   /* "Disabling double-tap to zoom removes the need for browsers to
diff --git a/css/suggestion-popover.less b/css/suggestion-popover.less
index 96435c8e3..a041628f3 100644
--- a/css/suggestion-popover.less
+++ b/css/suggestion-popover.less
@@ -13,7 +13,7 @@
   text-align: center;
   border-radius: 8px;
   position: fixed;
-  z-index: var(--_suggestion-zindex);
+  z-index: var(--_suggestion-zindex, 99);
 
   display: none;
   flex-direction: column;
diff --git a/css/virtual-keyboard.less b/css/virtual-keyboard.less
index 747b0db39..722f79ad5 100644
--- a/css/virtual-keyboard.less
+++ b/css/virtual-keyboard.less
@@ -122,7 +122,6 @@
   --_keycap-max-width: var(--keycap-max-width, 100px);
   --_keycap-gap: var(--keycap-gap, 8px);
 
-  --_keycap-font-size: var(--keycap-font-size, ~'clamp(16px, 4cqw, 24px)');
   --_keycap-small-font-size: var(
     --keycap-small-font-size,
     calc(var(--keycap-font-size) * 0.8)
@@ -426,7 +425,8 @@ body > .ML__keyboard.is-visible.animate > .MLK__backdrop {
   }
 
   .big-op {
-    font-size: calc(1.25 * var(--_keycap-font-size));
+    font-size: calc(1.25 * var(--keycap-font-size, ~"clamp(16px, 4vw, 24px)"));
+    font-size: calc(1.25 * var(--keycap-font-size, ~"clamp(16px, 4cqw, 24px)"));
   }
 
   .small {
@@ -563,7 +563,8 @@ body > .ML__keyboard.is-visible.animate > .MLK__backdrop {
 
   color: var(--_keycap-text);
   fill: currentColor;
-  font-size: var(--_keycap-font-size);
+  font-size: var(--keycap-font-size, ~"clamp(16px, 4vw, 24px)");
+  font-size: var(--keycap-font-size, ~"clamp(16px, 4cqw, 24px)");
   background: var(--_keycap-background);
   border: 1px solid var(--_keycap-border);
   border-bottom-color: var(--_keycap-border-bottom);
diff --git a/package-lock.json b/package-lock.json
index 9de70e8e7..f749fdf12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "mathlive",
+  "name": "@kedyou/mathlive",
   "version": "0.106.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "mathlive",
+      "name": "@kedyou/mathlive",
       "version": "0.106.0",
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 0560e6c76..b6f5c6867 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "mathlive",
+  "name": "@kedyou/mathlive",
   "version": "0.106.0",
   "description": "A web component for math input",
   "license": "MIT",
@@ -31,10 +31,6 @@
           "require": "./mathlive.js"
         }
       },
-      "node": {
-        "types": "./types/mathlive-ssr.d.ts",
-        "import": "./mathlive-ssr.min.mjs"
-      },
       "default": {
         "types": "./types/mathlive.d.ts",
         "import": "./mathlive.min.mjs",
@@ -48,9 +44,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/arnog/mathlive.git"
+    "url": "git+https://github.com/kedyou/mathlive.git"
   },
-  "bugs": "https://github.com/arnog/mathlive/issues/",
   "scripts": {
     "doc": "bash ./scripts/update-docs.sh",
     "build": "bash ./scripts/build.sh",
@@ -171,5 +166,6 @@
     "mathjax",
     "katex",
     "mathquill"
-  ]
+  ],
+  "homepage": "https://github.com/kedyou/mathlive#readme"
 }
diff --git a/scripts/start.js b/scripts/start.js
index e5b603b9e..fc6c7ff61 100644
--- a/scripts/start.js
+++ b/scripts/start.js
@@ -9,6 +9,7 @@ context({
   entryPoints: [
     './test/style.css',
     './test/smoke/index.html',
+    './test/printing/index.html',
     './test/virtual-keyboard/index.html',
     './test/mathfield-states/index.html',
     './test/prompts/index.html',
diff --git a/src/api.md b/src/api.md
index 9bd909225..49a011891 100644
--- a/src/api.md
+++ b/src/api.md
@@ -3756,6 +3756,16 @@ addRowBefore: (model) => boolean;
 
 <MemberCard>
 
+##### Commands.createAlignedEnvironment()
+
+```ts
+createAlignedEnvironment: (model) => boolean;
+```
+
+</MemberCard>
+
+<MemberCard>
+
 ##### Commands.removeColumn()
 
 ```ts
@@ -5045,6 +5055,22 @@ hide(options?): void
 
 <MemberCard>
 
+##### VirtualKeyboardInterface.manualClose()
+
+```ts
+manualClose(options?): void
+```
+
+###### options?
+
+###### animate
+
+`boolean`
+
+</MemberCard>
+
+<MemberCard>
+
 ##### VirtualKeyboardInterface.setKeycap()
 
 ```ts
@@ -5759,6 +5785,7 @@ type VirtualKeyboardMessageAction =
   | "execute-command"
   | "show"
   | "hide"
+  | "manual-close"
   | "update-setting"
   | "update-toolbar"
   | "synchronize-proxy"
@@ -6463,6 +6490,26 @@ LaTeX global registers override.
 
 <MemberCard>
 
+### DEFAULT\_KEYBOARD\_TOGGLE\_GLYPH
+
+```ts
+const DEFAULT_KEYBOARD_TOGGLE_GLYPH: string;
+```
+
+</MemberCard>
+
+<MemberCard>
+
+### MENU\_GLYPH
+
+```ts
+const MENU_GLYPH: string;
+```
+
+</MemberCard>
+
+<MemberCard>
+
 ### version
 
 ```ts
diff --git a/src/atoms/array.ts b/src/atoms/array.ts
index e2d1a8e66..e382099b9 100644
--- a/src/atoms/array.ts
+++ b/src/atoms/array.ts
@@ -737,25 +737,29 @@ export class ArrayAtom extends Atom {
     this.isDirty = true;
   }
 
-  addRowBefore(row: number): void {
+  addRowBefore(row: number, placeholders = !this.isMultiline): void {
     console.assert(this.type === 'array' && Array.isArray(this._rows));
 
     this._rows.splice(
       row,
       0,
-      new Array(this.colCount).fill(makeEmptyCell(this, !this.isMultiline))
+      Array.from({ length: this.colCount }, () =>
+        makeEmptyCell(this, placeholders)
+      )
     );
     adjustBranches(this);
     this.isDirty = true;
   }
 
-  addRowAfter(row: number): void {
+  addRowAfter(row: number, placeholders = !this.isMultiline): void {
     console.assert(this.type === 'array' && Array.isArray(this._rows));
 
     this._rows.splice(
       row + 1,
       0,
-      new Array(this.colCount).fill(makeEmptyCell(this, !this.isMultiline))
+      Array.from({ length: this.colCount }, () =>
+        makeEmptyCell(this, placeholders)
+      )
     );
 
     adjustBranches(this);
diff --git a/src/common/stylesheet.ts b/src/common/stylesheet.ts
index f95d5de9d..dba53d6d8 100644
--- a/src/common/stylesheet.ts
+++ b/src/common/stylesheet.ts
@@ -36,7 +36,7 @@ export function getStylesheetContent(id: StylesheetId): string {
     //
     case 'mathfield-element':
       content = `
-    :host { display: inline-block; background-color: field; color: fieldtext; border-width: 1px; border-style: solid; border-color: #acacac; border-radius: 2px;}
+    :host { display: inline-block; color: fieldtext; padding:4px; }
     :host([hidden]) { display: none; }
     :host([disabled]), :host([disabled]:focus), :host([disabled]:focus-within) { outline: none; opacity:  .5; }
     :host(:focus), :host(:focus-within) {
diff --git a/src/editor-mathfield/autocomplete.ts b/src/editor-mathfield/autocomplete.ts
index 449eafcd9..e3b5c6509 100644
--- a/src/editor-mathfield/autocomplete.ts
+++ b/src/editor-mathfield/autocomplete.ts
@@ -127,7 +127,7 @@ export function complete(
     | 'accept'
     | 'accept-suggestion'
     | 'accept-all' = 'accept',
-  options?: { mode?: ParseMode; selectItem?: boolean }
+  options?: { mode?: ParseMode }
 ): boolean {
   hideSuggestionPopover(mathfield);
   const latexGroup = getLatexGroup(mathfield.model);
@@ -147,9 +147,7 @@ export function complete(
     if (completion === 'accept-suggestion') return suggestions.length !== 0;
   }
 
-  const body = getLatexGroupBody(mathfield.model).filter(
-    (x) => !x.isSuggestion
-  );
+  const body = getLatexGroupBody(mathfield.model);
 
   const latex = body.map((x) => x.value).join('');
 
@@ -168,7 +166,7 @@ export function complete(
   }
 
   ModeEditor.insert(mathfield.model, latex, {
-    selectionMode: options?.selectItem ?? false ? 'item' : 'placeholder',
+    selectionMode: 'placeholder',
     format: 'latex',
     mode: 'math',
     style,
diff --git a/src/editor-mathfield/commands.ts b/src/editor-mathfield/commands.ts
index 8dc5a9dbc..072f04270 100644
--- a/src/editor-mathfield/commands.ts
+++ b/src/editor-mathfield/commands.ts
@@ -77,9 +77,10 @@ registerCommand({
       mathfield.host?.dispatchEvent(
         new Event('change', { bubbles: true, composed: true })
       );
+      // Kedyou: prefer our alined environment code
       // If we're in a multiline environment, insert a newline
-      if (model.parentEnvironment?.isMultiline)
-        mathfield.executeCommand('addRowAfter');
+      // if (model.parentEnvironment?.isMultiline)
+      //   mathfield.executeCommand('addRowAfter');
 
       model.contentDidChange({ inputType: 'insertLineBreak' });
     }
diff --git a/src/editor-mathfield/keyboard-input.ts b/src/editor-mathfield/keyboard-input.ts
index 87fda16f6..922387df0 100644
--- a/src/editor-mathfield/keyboard-input.ts
+++ b/src/editor-mathfield/keyboard-input.ts
@@ -213,9 +213,10 @@ export function onKeystroke(
           evt.preventDefault();
           evt.stopPropagation();
         } else {
+          // Kedyou: prefer our alined environment code
           // If we're in a multiline environment, insert a newline
-          if (model.parentEnvironment?.isMultiline)
-            mathfield.executeCommand('addRowAfter');
+          // if (model.parentEnvironment?.isMultiline)
+          //   mathfield.executeCommand('addRowAfter');
 
           // Dispatch an 'input' event matching the behavior of `<textarea>`
           model.contentDidChange({ inputType: 'insertLineBreak' });
diff --git a/src/editor-mathfield/mathfield-private.ts b/src/editor-mathfield/mathfield-private.ts
index e3db3dcc2..28ef71225 100644
--- a/src/editor-mathfield/mathfield-private.ts
+++ b/src/editor-mathfield/mathfield-private.ts
@@ -137,11 +137,11 @@ import { TextAtom } from 'atoms/text';
 import { getLatexGroup } from './mode-editor-latex';
 import { MenuItem } from 'public/ui-menu-types';
 
-const DEFAULT_KEYBOARD_TOGGLE_GLYPH = `<svg xmlns="http://www.w3.org/2000/svg" style="width: 21px;"  viewBox="0 0 576 512" role="img" aria-label="${localize(
+export const DEFAULT_KEYBOARD_TOGGLE_GLYPH = `<svg xmlns="http://www.w3.org/2000/svg" style="width: 21px;"  viewBox="0 0 576 512" role="img" aria-label="${localize(
   'tooltip.toggle virtual keyboard'
 )}"><path d="M528 64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h480c26.51 0 48-21.49 48-48V112c0-26.51-21.49-48-48-48zm16 336c0 8.823-7.177 16-16 16H48c-8.823 0-16-7.177-16-16V112c0-8.823 7.177-16 16-16h480c8.823 0 16 7.177 16 16v288zM168 268v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm96 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm96 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm96 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm-336 80v-24c0-6.627-5.373-12-12-12H84c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm384 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zM120 188v-24c0-6.627-5.373-12-12-12H84c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm96 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm96 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm96 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm96 0v-24c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v24c0 6.627 5.373 12 12 12h24c6.627 0 12-5.373 12-12zm-96 152v-8c0-6.627-5.373-12-12-12H180c-6.627 0-12 5.373-12 12v8c0 6.627 5.373 12 12 12h216c6.627 0 12-5.373 12-12z"/></svg>`;
 
-const MENU_GLYPH = `<svg xmlns="http://www.w3.org/2000/svg" style="height: 18px;" viewBox="0 0 448 512" role="img" aria-label="${localize(
+export const MENU_GLYPH = `<svg xmlns="http://www.w3.org/2000/svg" style="height: 18px;" viewBox="0 0 448 512" role="img" aria-label="${localize(
   'tooltip.menu'
 )}"><path d="M0 96C0 78.3 14.3 64 32 64H416c17.7 0 32 14.3 32 32s-14.3 32-32 32H32C14.3 128 0 113.7 0 96zM0 256c0-17.7 14.3-32 32-32H416c17.7 0 32 14.3 32 32s-14.3 32-32 32H32c-17.7 0-32-14.3-32-32zM448 416c0 17.7-14.3 32-32 32H32c-17.7 0-32-14.3-32-32s14.3-32 32-32H416c17.7 0 32 14.3 32 32z"/></svg>`;
 
@@ -807,7 +807,9 @@ If you are using Vue, this may be because you are using the runtime-only build o
         break;
 
       case 'pointerdown':
-        if (!evt.defaultPrevented && this.userSelect !== 'none') {
+        // Kedyou: comment out this.userSelect !== none because it breaks on Chrome
+        // https://github.com/kedyou/kedyou-frontend/issues/1150
+        if (!evt.defaultPrevented /** && this.userSelect !== 'none'  */) {
           onPointerDown(this, evt as PointerEvent);
           // Firefox convention: holding the shift key disables custom context menu
           if ((evt as PointerEvent).shiftKey === false) {
@@ -841,13 +843,6 @@ If you are using Vue, this may be because you are using the runtime-only build o
 
       case 'virtual-keyboard-toggle':
         if (this.hasFocus()) updateEnvironmentPopover(this);
-        // Workaround a Chromium 133+ issue where the keyboard sink loses focus
-        // when the virtual keyboard is shown
-        // https://github.com/arnog/mathlive/issues/2588
-        if (this.hasFocus()) {
-          this.keyboardDelegate.blur();
-          this.keyboardDelegate.focus();
-        }
         break;
 
       case 'resize':
@@ -1004,6 +999,8 @@ If you are using Vue, this may be because you are using the runtime-only build o
    */
   scrollIntoView(): void {
     if (!this.element) return;
+
+    /* Kedyou: stub scrollIntoView
     //
     // 1/ If using a mathfield element, make sure that the element is visible.
     //
@@ -1030,6 +1027,7 @@ If you are using Vue, this may be because you are using the runtime-only build o
         }
       }
     }
+    */
 
     //
     // 2/ If a render is pending, do it now to make sure we have correct layout
@@ -1037,6 +1035,7 @@ If you are using Vue, this may be because you are using the runtime-only build o
     //
     if (this.dirty) render(this, { interactive: true });
 
+    /* Kedyou: we need the mathfield to render, but not the rest
     //
     // 3/ Get the position of the caret
     //
@@ -1096,6 +1095,7 @@ If you are using Vue, this may be because you are using the runtime-only build o
         left,
       });
     }
+    */
   }
 
   insert(s: string, options?: InsertOptions): boolean {
@@ -1669,32 +1669,9 @@ If you are using Vue, this may be because you are using the runtime-only build o
 
     render(this, { interactive: true });
 
-    setTimeout(() => {
-      if (!isValidMathfield(this)) return;
-
-      //
-      // Capture the focus/blur events to avoid double-dispatching
-      //
-      const abortController = new AbortController();
-      const signal = abortController.signal;
-      for (const event of ['focus', 'blur', 'focusin', 'focusout']) {
-        this.host?.addEventListener(
-          event,
-          (evt) => {
-            evt.preventDefault();
-            evt.stopPropagation();
-          },
-          { once: true, capture: true, signal }
-        );
-      }
-
-      this.keyboardDelegate.blur();
-      this.keyboardDelegate.focus();
-      this.connectToVirtualKeyboard();
-      this.focusBlurInProgress = false;
-
-      abortController.abort();
-    }, 60);
+    this.keyboardDelegate.focus();
+    this.connectToVirtualKeyboard();
+    this.focusBlurInProgress = false;
   }
 
   onBlur(): void {
diff --git a/src/editor-mathfield/mode-editor-math.ts b/src/editor-mathfield/mode-editor-math.ts
index bbd3049b1..b6ca94dc5 100644
--- a/src/editor-mathfield/mode-editor-math.ts
+++ b/src/editor-mathfield/mode-editor-math.ts
@@ -12,10 +12,12 @@ import { fromJson } from '../core/atom';
 import { Atom } from '../core/atom-class';
 import { ArrayAtom } from '../atoms/array';
 import { LeftRightAtom } from '../atoms/leftright';
+import { isAlignEnvironment } from '../latex-commands/environment-types';
 
 import { range } from '../editor-model/selection-utils';
 import { _Model } from '../editor-model/model-private';
 import { applyStyleToUnstyledAtoms } from '../editor-model/styling';
+import { alignedDelimiters } from '../editor-model/array';
 import {
   parseMathString,
   trimModeShiftCommand,
@@ -98,6 +100,16 @@ export class MathModeEditor extends ModeEditor {
                 cursor.parent.addRowAfter(currentRow);
                 currentRow++;
               }
+              // Kedyou: move to second column if pasted cell starts with an aligned delimiter
+              if (
+                currentColumn === 0 &&
+                isAlignEnvironment(cursor.parent.environmentName) &&
+                columns[i][1] &&
+                alignedDelimiters.has(columns[i][1].command)
+              ) {
+                currentColumn++;
+              }
+
               cursor.parent.setCell(currentRow, currentColumn, columns[i]);
             }
           } else {
@@ -325,7 +337,44 @@ export class MathModeEditor extends ModeEditor {
       }
 
       const cursor = model.at(model.position);
-      cursor.parent!.addChildrenAfter(newAtoms, cursor);
+
+      // Kedyou: insert aligned delimiter into the second aligned column if typing in the first
+      let insertDefault = true;
+      if (
+        cursor.parent instanceof ArrayAtom &&
+        isAlignEnvironment(cursor.parent.environmentName) && // in aligned
+        cursor.parentBranch![1] === 0 // in the first column
+      ) {
+        // make sure the second column doesn't already have a delimiter
+        const secondColumn = cursor.parent.rows[cursor.parentBranch![0]][1];
+        if (
+          !secondColumn[1] ||
+          !alignedDelimiters.has(secondColumn[1].command)
+        ) {
+          // check if newAtoms is inserting an aligned delimiter
+          let i = 0;
+          for (; i < newAtoms.length; i++) {
+            if (alignedDelimiters.has(newAtoms[i].command)) break;
+          }
+          if (i < newAtoms.length) {
+            // insert the delimiter to the second column, move cursor
+            insertDefault = false;
+            if (i > 0) {
+              cursor.parent.addChildrenAfter(newAtoms.slice(0, i - 1), cursor);
+              cursor.parent.addChildrenAfter(
+                newAtoms.slice(i),
+                secondColumn[0]
+              );
+            } else {
+              cursor.parent.addChildrenAfter(newAtoms, secondColumn[0]);
+            }
+          }
+        }
+      }
+
+      if (insertDefault) {
+        cursor.parent!.addChildrenAfter(newAtoms, cursor);
+      }
 
       if (format === 'latex' && typeof input === 'string') {
         // If we are given a latex string with no arguments, store it as
diff --git a/src/editor-mathfield/pointer-input.ts b/src/editor-mathfield/pointer-input.ts
index 4ab56cf01..7e370bd74 100644
--- a/src/editor-mathfield/pointer-input.ts
+++ b/src/editor-mathfield/pointer-input.ts
@@ -5,6 +5,7 @@ import { Atom } from '../core/atom-class';
 import { acceptCommandSuggestion } from './autocomplete';
 import { selectGroup } from '../editor-model/commands-select';
 import type { Offset, Range } from 'public/core-types';
+import { isAlignEnvironment } from 'latex-commands/environment-types';
 import { ArrayAtom } from 'atoms/array';
 
 let gLastTap: { x: number; y: number; time: number } | null = null;
@@ -421,9 +422,7 @@ export function offsetFromPoint(
     }
   }
 
-  let result = mathfield.model.offsetOf(atom);
-
-  if (result < 0) return -1;
+  if (mathfield.model.offsetOf(atom) < 0) return -1;
 
   //
   // 4/ Account for the desired bias
@@ -435,10 +434,23 @@ export function offsetFromPoint(
       // preceding atom)
       const bounds = getAtomBounds(mathfield, atom);
       if (bounds && x < (bounds.left + bounds.right) / 2)
-        result = mathfield.model.offsetOf(atom.leftSibling);
-    } else if (options.bias < 0)
-      result = mathfield.model.offsetOf(atom.leftSibling);
+        atom = atom.leftSibling;
+    } else if (options.bias < 0) atom = atom.leftSibling;
   }
 
-  return result;
+  //
+  // Kedyou: don't click into the first atom
+  // of the second column of an aligned environment
+  //
+  if (
+    atom.type === 'first' &&
+    atom.parent instanceof ArrayAtom &&
+    isAlignEnvironment(atom.parent.environmentName) &&
+    atom.col === 1
+  ) {
+    const firstColumn = atom.parent.rows[atom.row][0]!;
+    atom = firstColumn[firstColumn.length - 1];
+  }
+
+  return mathfield.model.offsetOf(atom) || -1;
 }
diff --git a/src/editor-model/array.ts b/src/editor-model/array.ts
index e408d9181..568bec6bc 100644
--- a/src/editor-model/array.ts
+++ b/src/editor-model/array.ts
@@ -6,6 +6,7 @@ import type { _Model } from './model-private';
 import { ArrayAtom } from '../atoms/array';
 import { Environment, TabularEnvironment } from '../public/core-types';
 import { makeEnvironment } from '../latex-commands/environments';
+import { isAlignEnvironment } from '../latex-commands/environment-types';
 import { PlaceholderAtom } from '../atoms/placeholder';
 import { LeftRightAtom } from '../atoms/leftright';
 import { range } from './selection-utils';
@@ -28,7 +29,7 @@ function cellSiblings(model: _Model): [Atom, Atom] {
  *
  * Otherwise, consider creating an array based on the context (sibling atoms).
  *
- * If at root, create a `lines` environment.
+ * If at root, create a `align` environment.
  * If left sibling is `(` (or `\left( with matching \right))`) create a `pmatrix`
  * If left sibling is `[` create a `bmatrix`
  * If left sibling is { create a `cases`
@@ -40,11 +41,17 @@ function cellSiblings(model: _Model): [Atom, Atom] {
  */
 function parentArray(
   model: _Model,
-  where: 'after row' | 'before row' | 'after column' | 'before column'
+  where: 'after row' | 'before row' | 'after column' | 'before column',
+  aligned = false
 ): [ArrayAtom | undefined, [row: number, col: number]] {
   let atom: Atom | undefined = model.at(model.position);
 
-  while (atom && !(atom.parent instanceof ArrayAtom)) atom = atom.parent;
+  while (
+    atom &&
+    (!(atom.parent instanceof ArrayAtom) ||
+      (aligned && !isAlignEnvironment(atom.parent.environmentName)))
+  )
+    atom = atom.parent;
 
   //
   // Conversion:
@@ -71,29 +78,24 @@ function parentArray(
     // 1/ Handle insertion at the root (when the root is not already an array)
     //
     if (!atom.parent!.parent) {
-      let secondCell = model.extractAtoms([model.position, model.lastOffset]);
-      let firstCell = model.extractAtoms([0, model.position]);
-
-      let array: ArrayAtom;
-      if (where.endsWith('column')) {
-        if (firstCell.length === 0) firstCell = placeholderCell();
-        if (secondCell.length === 0) secondCell = placeholderCell();
-        array = makeEnvironment('split', [[firstCell, secondCell]]);
-        model.root = array;
-        if (isPlaceholderCell(array, 0, 0)) selectCell(model, array, 0, 0);
-        else if (isPlaceholderCell(array, 0, 1)) selectCell(model, array, 0, 1);
-        else model.position = model.offsetOf(cursor);
-      } else {
-        // if (firstCell.length === 0) firstCell = emptyCell();
-        // if (secondCell.length === 0) secondCell = emptyCell();
-        array = makeEnvironment('lines', [[firstCell], [secondCell]]);
-        model.root = array;
-        // if (isPlaceholderCell(array, 0, 0)) selectCell(model, array, 0, 0);
-        // else if (isPlaceholderCell(array, 1, 0)) selectCell(model, array, 1, 0);
-        // else
-        // Select the second line
-        selectCell(model, array, 1, 0);
+      // Kedyou: split cells into aligned environment
+      let firstCell = model.extractAtoms([0, model.lastOffset]);
+      let secondCell: Atom[] = [];
+      // search for aligned delimiters
+      for (let i = 0; i < firstCell.length; i++) {
+        if (alignedDelimiters.has(firstCell[i].command)) {
+          secondCell = firstCell.slice(i);
+          firstCell = firstCell.slice(0, i);
+        }
       }
+      if (firstCell.length === 0) firstCell = emptyCell();
+      if (secondCell.length === 0) secondCell = emptyCell();
+      const array = makeEnvironment('align', [
+        [firstCell, secondCell],
+        [emptyCell(), emptyCell()],
+      ]);
+      model.root.body = [array];
+      selectCell(model, array, 1, 0);
 
       // We've created the environment and the cells, no need to add a row/column, so return undefined
       return [undefined, [0, 0]];
@@ -440,6 +442,42 @@ export function removeColumn(model: _Model): boolean {
   return true;
 }
 
+/**
+ * Kedyou: pressing enter creates aligned environment
+ */
+export function createAlignedEnvironment(model: _Model): boolean {
+  if (!model.contentWillChange({ inputType: 'insertLineBreak' })) return false;
+  // creates aligned environment if not already present
+  const [arrayAtom, [row, column]] = parentArray(model, 'after row', true);
+
+  // if the aligned environment already exists
+  if (arrayAtom) {
+    // add row
+    arrayAtom.addRowAfter(row, false);
+    const pos = model.offsetOf(arrayAtom.getCell(row + 1, 0)![0]);
+    model.setPositionHandlingPlaceholder(pos);
+  }
+
+  model.contentDidChange({ inputType: 'insertLineBreak' });
+  return true;
+}
+
+export const alignedDelimiters = new Set([
+  '=',
+  '<',
+  '>',
+  '\\gt',
+  '\\lt',
+  '\\le',
+  '\\ge',
+  '\\geq',
+  '\\leq',
+  '\\ll',
+  '\\gg',
+  '\\geqslant',
+  '\\leqslant',
+]);
+
 registerCommand(
   {
     addRowAfter,
@@ -449,6 +487,7 @@ registerCommand(
     removeRow,
     removeColumn,
     setEnvironment,
+    createAlignedEnvironment,
   },
   {
     target: 'model',
diff --git a/src/editor-model/commands-move.ts b/src/editor-model/commands-move.ts
index bb0b91de8..5c7563abb 100644
--- a/src/editor-model/commands-move.ts
+++ b/src/editor-model/commands-move.ts
@@ -1,6 +1,7 @@
 import { isBrowser } from '../ui/utils/capabilities';
 
 import { Atom } from '../core/atom';
+import { ArrayAtom } from '../atoms/array';
 import { SubsupAtom } from '../atoms/subsup';
 import { register } from '../editor/commands';
 
@@ -8,12 +9,19 @@ import { move, skip } from './commands';
 import type { _Model } from './model-private';
 import type { BranchName } from 'core/types';
 import { isArray } from '../common/types';
+import { isAlignEnvironment } from '../latex-commands/environment-types';
 
 export function moveAfterParent(model: _Model): boolean {
   const previousPosition = model.position;
   const parent = model.at(previousPosition).parent;
   // Do nothing if at the root.
-  if (!parent?.parent) {
+  if (
+    !parent ||
+    parent.type === 'root' ||
+    (parent instanceof ArrayAtom &&
+      isAlignEnvironment(parent.environmentName) &&
+      parent.parent?.type === 'root')
+  ) {
     model.announce('plonk');
     return false;
   }
@@ -466,7 +474,13 @@ register(
     },
     moveBeforeParent: (model: _Model): boolean => {
       const { parent } = model.at(model.position);
-      if (!parent) {
+      if (
+        !parent ||
+        parent.type === 'root' ||
+        (parent instanceof ArrayAtom &&
+          isAlignEnvironment(parent.environmentName) &&
+          parent.parent?.type === 'root')
+      ) {
         model.announce('plonk');
         return false;
       }
@@ -717,22 +731,24 @@ register(
       return false;
     },
     moveToMathfieldStart: (model: _Model): boolean => {
-      if (model.selectionIsCollapsed && model.position === 0) {
+      const offset = model.firstOffsetOfAligned;
+      if (model.selectionIsCollapsed && offset === 0) {
         model.announce('plonk');
         return false;
       }
 
-      model.position = 0;
+      model.position = offset;
       model.mathfield.stopCoalescingUndo();
       return true;
     },
     moveToMathfieldEnd: (model: _Model): boolean => {
-      if (model.selectionIsCollapsed && model.position === model.lastOffset) {
+      const offset = model.lastOffsetOfAligned;
+      if (model.selectionIsCollapsed && offset === model.lastOffset) {
         model.announce('plonk');
         return false;
       }
 
-      model.position = model.lastOffset;
+      model.position = offset;
       model.mathfield.stopCoalescingUndo();
       return true;
     },
diff --git a/src/editor-model/commands.ts b/src/editor-model/commands.ts
index 8100d2899..bdcaa9aec 100644
--- a/src/editor-model/commands.ts
+++ b/src/editor-model/commands.ts
@@ -5,10 +5,12 @@ import { LatexAtom } from '../atoms/latex';
 import { TextAtom } from '../atoms/text';
 import { LETTER_AND_DIGITS } from '../latex-commands/definitions-utils';
 import type { Offset, Selection } from '../public/core-types';
+import { isAlignEnvironment } from '../latex-commands/environment-types';
 import { getCommandSuggestionRange } from '../editor-mathfield/mode-editor-latex';
 import { PromptAtom } from '../atoms/prompt';
 import { getLocalDOMRect } from 'editor-mathfield/utils';
 import { _Mathfield } from 'editor-mathfield/mathfield-private';
+import { alignedDelimiters } from './array';
 import { deleteRange } from './delete';
 
 /*
@@ -342,7 +344,55 @@ export function move(
     pos = model.position;
     if (!isValidPosition(model, pos))
       pos = nextValidPosition(model, pos, direction);
-  } else pos = nextValidPosition(model, pos, direction);
+  } else {
+    //
+    // Kedyou: Customize cursor movement in aligned environment
+    //
+    const atom = model.at(pos);
+
+    if (
+      atom.parent instanceof ArrayAtom &&
+      isAlignEnvironment(atom.parent.environmentName)
+    ) {
+      const aligned = atom.parent;
+
+      if (direction === 'forward') {
+        // if you are in the first column
+        if (atom.parentBranch![1] === 0) {
+          const leftCell = aligned.rows[atom.parentBranch![0]][0];
+          const rightCellFirstAtom =
+            aligned.rows[atom.parentBranch![0]][1]?.[1];
+          if (
+            leftCell[leftCell.length - 1] === atom && // if you are at the last atom of the first column
+            rightCellFirstAtom && // the right cell has a first atom
+            alignedDelimiters.has(rightCellFirstAtom.command) // that atom is an aligned delimiter
+          ) {
+            // skip past the 'aligning delimiter' in the second column
+            pos++;
+          }
+        } else if (model.lastOffset === pos + 1) {
+          // prevent moving outside of aligned environment
+          model.announce('plonk');
+          return true;
+        }
+      } else if (direction === 'backward') {
+        if (pos === 1) {
+          // prevent moving outside of aligned environment
+          model.announce('plonk');
+          return true;
+        } else if (
+          atom.parentBranch![1] === 1 && // if you are in the second column
+          aligned.rows[atom.parentBranch![0]][1][1] === atom && // if you are positioned at the first element
+          alignedDelimiters.has(atom.command) // if the first element is an aligned delimiter
+        ) {
+          // skip past the 'aligning delimiter' in the second column and into the first column
+          pos--;
+        }
+      }
+    }
+
+    pos = nextValidPosition(model, pos, direction);
+  }
 
   if (pos < 0 || pos > model.lastOffset) {
     // We're going out of bounds
diff --git a/src/editor-model/delete.ts b/src/editor-model/delete.ts
index aab9233b0..896b1775c 100644
--- a/src/editor-model/delete.ts
+++ b/src/editor-model/delete.ts
@@ -5,6 +5,8 @@ import { Atom, isCellBranch } from '../core/atom';
 import { _Model } from './model-private';
 import { range } from './selection-utils';
 import { MathfieldElement } from 'public/mathfield-element';
+import { isAlignEnvironment } from '../latex-commands/environment-types';
+import { alignedDelimiters } from './array';
 import type { Branch } from 'core/types';
 import type { Range } from 'public/core-types';
 import { ArrayAtom } from 'atoms/array';
@@ -331,6 +333,55 @@ function onDelete(
     return true;
   }
 
+  // Kedyou: custom aligned environment backspace features
+  if (
+    parent instanceof ArrayAtom &&
+    isAlignEnvironment(parent.environmentName)
+  ) {
+    console.assert(atom.parentBranch !== undefined);
+    const row = Number(atom.parentBranch![0]);
+    const column = Number(atom.parentBranch![1]);
+    const cell = parent.rows[row][column];
+    // delete aligned delimiters and place cursor into first column
+    if (
+      column === 1 && // in second column
+      direction === 'backward'
+    ) {
+      // deleting the first atom
+      if (cell?.[1] === atom && alignedDelimiters.has(atom.command)) {
+        atom.parent!.removeChild(atom);
+        // move cursor to first column
+        const leftCol = parent.rows[row][0]!;
+        model.position = model.offsetOf(leftCol[leftCol.length - 1]);
+        return true;
+      } else if (cell?.[0] === atom) {
+        // start of second column, just move to first column
+        const leftCol = parent.rows[row][0]!;
+        model.position = model.offsetOf(leftCol[leftCol.length - 1]);
+        return true;
+      }
+    }
+    // delete row if row is entirely empty and backspace at the start
+    if (
+      row !== 0 &&
+      ((parent.rows[row][0]!.length < 2 &&
+        parent.rows[row][0]![1] === undefined) ||
+        parent.rows[row][0]![1].type === 'placeholder') &&
+      ((parent.rows[row][1]!.length < 2 &&
+        parent.rows[row][1]![1] === undefined) ||
+        parent.rows[row][1]![1].type === 'placeholder')
+    ) {
+      parent.removeRow(row);
+      let above = parent.rows[row - 1][1]!;
+      // go to first column if second is empty
+      if (above.length <= 1) {
+        above = parent.rows[row - 1][0]!;
+      }
+      model.position = model.offsetOf(above[above.length - 1]);
+      return true;
+    }
+  }
+
   if (parent?.type === 'genfrac' && !branch && atom.type !== 'first') {
     let pos = model.offsetOf(atom.leftSibling);
     parent.removeChild(atom);
diff --git a/src/editor-model/model-private.ts b/src/editor-model/model-private.ts
index 3db3a3218..c37f9826e 100644
--- a/src/editor-model/model-private.ts
+++ b/src/editor-model/model-private.ts
@@ -32,6 +32,7 @@ import {
 } from './selection-utils';
 import { ArrayAtom } from '../atoms/array';
 import { LatexAtom } from '../atoms/latex';
+import { isAlignEnvironment } from '../latex-commands/environment-types';
 import { makeProxy } from 'virtual-keyboard/mathfield-proxy';
 import '../virtual-keyboard/global';
 import type { ModelState, GetAtomOptions, AnnounceVerb } from './types';
@@ -272,6 +273,24 @@ export class _Model implements Model {
     return this.atoms.length - 1;
   }
 
+  get lastOffsetOfAligned(): Offset {
+    let offset = this.lastOffset;
+    const atom = this.atoms[offset];
+    if (atom instanceof ArrayAtom && isAlignEnvironment(atom.environmentName))
+      offset--;
+
+    return offset;
+  }
+
+  get firstOffsetOfAligned(): Offset {
+    let offset = 0;
+    const atom = this.atoms[this.lastOffset];
+    if (atom instanceof ArrayAtom && isAlignEnvironment(atom.environmentName))
+      offset++;
+
+    return offset;
+  }
+
   at(index: number): Atom {
     return this.atoms[index];
   }
@@ -715,8 +734,11 @@ export class _Model implements Model {
   }
 
   normalizeOffset(value: Offset): Offset {
-    if (value > 0) value = Math.min(value, this.lastOffset);
-    else if (value < 0) value = this.lastOffset + value + 1;
+    // Kedyou: clamp carat to inside aligned environment
+    if (value > this.firstOffsetOfAligned)
+      value = Math.min(value, this.lastOffsetOfAligned);
+    else if (value < this.firstOffsetOfAligned)
+      value = this.firstOffsetOfAligned;
 
     return value;
   }
diff --git a/src/editor/a11y.ts b/src/editor/a11y.ts
index cc311cf88..5d5d73fbf 100644
--- a/src/editor/a11y.ts
+++ b/src/editor/a11y.ts
@@ -81,8 +81,6 @@ function relationName(atom: Atom): string {
   } else if (atom.parentBranch === 'superscript') result = 'superscript';
   else if (atom.parentBranch === 'subscript') result = 'subscript';
 
-  if (!result) console.log('unknown relationship');
-
   return result ?? 'parent';
 }
 
diff --git a/src/editor/keybindings-definitions.ts b/src/editor/keybindings-definitions.ts
index a4b2947fc..e5488b8e2 100644
--- a/src/editor/keybindings-definitions.ts
+++ b/src/editor/keybindings-definitions.ts
@@ -60,8 +60,8 @@ export const DEFAULT_KEYBINDINGS: Keybinding[] = [
   {
     key: '[Escape]',
     ifMode: 'latex',
-    command: ['complete', 'complete', { selectItem: 'true' }],
-  }, // Accept the entry (without the suggestion) and select
+    command: ['complete', 'reject'],
+  }, // Cancel LaTeX mode
 
   {
     key: '\\',
@@ -190,6 +190,7 @@ export const DEFAULT_KEYBINDINGS: Keybinding[] = [
   { key: 'ctrl+[Enter]', ifMode: 'math', command: 'addRowAfter' },
   { key: 'cmd+[Return]', ifMode: 'math', command: 'addRowAfter' },
   { key: 'cmd+[Enter]', ifMode: 'math', command: 'addRowAfter' },
+  { key: '[Enter]', ifMode: 'math', command: 'createAlignedEnvironment' },
 
   // Excel keybindings:
   // shift+space: select entire row, ctrl+space: select an entire column
diff --git a/src/editor/l10n-strings.ts b/src/editor/l10n-strings.ts
index e853313f3..b1047d748 100644
--- a/src/editor/l10n-strings.ts
+++ b/src/editor/l10n-strings.ts
@@ -28,6 +28,7 @@ export const STRINGS = {
     'tooltip.cut to clipboard': 'Cut to Clipboard',
     'tooltip.paste from clipboard': 'Paste from Clipboard',
     'tooltip.redo': 'Redo',
+    'tooltip.close': 'Close',
     'tooltip.toggle virtual keyboard': 'Toggle Virtual Keyboard',
     'tooltip.menu': 'Menu',
     'tooltip.undo': 'Undo',
diff --git a/src/mathlive.ts b/src/mathlive.ts
index 0f0801c9e..d1852f4fc 100644
--- a/src/mathlive.ts
+++ b/src/mathlive.ts
@@ -16,6 +16,10 @@ import {
   convertLatexToSpeakableText,
   convertMathJsonToLatex,
 } from './public/mathlive-ssr';
+export {
+  DEFAULT_KEYBOARD_TOGGLE_GLYPH,
+  MENU_GLYPH,
+} from 'editor-mathfield/mathfield-private';
 
 export {
   MenuItemType,
diff --git a/src/public/commands.ts b/src/public/commands.ts
index 3dcee29e6..969cfa728 100644
--- a/src/public/commands.ts
+++ b/src/public/commands.ts
@@ -173,6 +173,10 @@ export interface Commands {
     options?: InsertOptions
   ) => boolean;
 
+  /**
+   * @category Array
+   */
+  createAlignedEnvironment: (model: Model) => boolean;
   /**
    * @category Array
    */
diff --git a/src/public/mathlive.ts b/src/public/mathlive.ts
index cf6dd3c57..03e60e61c 100644
--- a/src/public/mathlive.ts
+++ b/src/public/mathlive.ts
@@ -55,6 +55,9 @@ export declare const version: {
   mathlive: string;
 };
 
+export declare const DEFAULT_KEYBOARD_TOGGLE_GLYPH: string;
+export declare const MENU_GLYPH: string;
+
 declare global {
   interface Window {
     mathVirtualKeyboard: VirtualKeyboardInterface & EventTarget;
diff --git a/src/public/virtual-keyboard.ts b/src/public/virtual-keyboard.ts
index 826d849cb..f1029f7fa 100644
--- a/src/public/virtual-keyboard.ts
+++ b/src/public/virtual-keyboard.ts
@@ -297,6 +297,7 @@ export interface MathfieldProxy {
 export interface VirtualKeyboardInterface extends VirtualKeyboardOptions {
   show(options?: { animate: boolean }): void;
   hide(options?: { animate: boolean }): void;
+  manualClose(options?: { animate: boolean }): void;
   visible: boolean;
   readonly isShifted: boolean;
   readonly boundingRect: DOMRect;
@@ -335,6 +336,7 @@ export type VirtualKeyboardMessageAction =
   | 'execute-command' // From proxy to VK
   | 'show' // From proxy to VK
   | 'hide' // From proxy to VK
+  | 'manual-close' // From proxy to VK
   | 'update-setting' // From proxy to VK
   | 'update-toolbar' // From proxy to VK
   | 'synchronize-proxy' // From VK to proxy
diff --git a/src/virtual-keyboard/commands.ts b/src/virtual-keyboard/commands.ts
index a4f5d490e..e3b326894 100644
--- a/src/virtual-keyboard/commands.ts
+++ b/src/virtual-keyboard/commands.ts
@@ -42,6 +42,10 @@ register(
       window.mathVirtualKeyboard.show({ animate: true });
       return false;
     },
+    closeVirtualKeyboard: () => {
+      window.mathVirtualKeyboard.manualClose();
+      return false;
+    },
   },
   { target: 'virtual-keyboard' }
 );
diff --git a/src/virtual-keyboard/proxy.ts b/src/virtual-keyboard/proxy.ts
index 3ce4310ce..92d253fd2 100644
--- a/src/virtual-keyboard/proxy.ts
+++ b/src/virtual-keyboard/proxy.ts
@@ -118,6 +118,10 @@ export class VirtualKeyboardProxy
     }
   }
 
+  manualClose(options?: { animate: boolean } | undefined): void {
+    this.sendMessage('manual-close', options);
+  }
+
   get isShifted(): boolean {
     return this._isShifted;
   }
diff --git a/src/virtual-keyboard/utils.ts b/src/virtual-keyboard/utils.ts
index ab63870ae..dbac19142 100644
--- a/src/virtual-keyboard/utils.ts
+++ b/src/virtual-keyboard/utils.ts
@@ -323,15 +323,10 @@ export function makeEditToolbar(
 
   const availableActions: string[] = [];
 
-  if (mathfield.selectionIsCollapsed)
-    availableActions.push('undo', 'redo', 'pasteFromClipboard');
-  else {
-    availableActions.push(
-      'cutToClipboard',
-      'copyToClipboard',
-      'pasteFromClipboard'
-    );
-  }
+  if (mathfield.selectionIsCollapsed) availableActions.push('undo', 'redo');
+  else availableActions.push('cutToClipboard', 'copyToClipboard');
+
+  availableActions.push('pasteFromClipboard', 'closeVirtualKeyboard');
 
   const actionsMarkup = {
     undo: `<div class='action ${mathfield.canUndo === false ? 'disabled' : ''}'
@@ -365,6 +360,13 @@ export function makeEditToolbar(
             <svg><use xlink:href='#svg-paste' /></svg>
         </div>
     `,
+    closeVirtualKeyboard: `
+				<div class='action'
+						data-command='"closeVirtualKeyboard"'
+						data-tooltip='${l10n('tooltip.close')}'
+						style="font-size:200%;line-height:0"
+				>&times;</div>
+		`,
   };
 
   // The right hand side of the toolbar, with the copy/undo/redo commands
@@ -765,7 +767,7 @@ export const KEYCAP_SHORTCUTS: Record<
   },
   '[action]': {
     class: 'action hide-shift',
-    command: 'performWithFeedback(commit)',
+    command: 'performWithFeedback(createAlignedEnvironment)',
     shift: {
       label: '<svg class=svg-glyph><use xlink:href=#circle-plus /></svg>',
       command: 'performWithFeedback(addRowAfter)',
diff --git a/src/virtual-keyboard/virtual-keyboard.ts b/src/virtual-keyboard/virtual-keyboard.ts
index d004639b0..09d9a4675 100644
--- a/src/virtual-keyboard/virtual-keyboard.ts
+++ b/src/virtual-keyboard/virtual-keyboard.ts
@@ -266,6 +266,8 @@ export class VirtualKeyboard implements VirtualKeyboardInterface, EventTarget {
       window.addEventListener('message', this);
     }
 
+    /* Kedyou: remove focus event listeners to allow our client to choose
+    /* whether the virtual keyboard is shown when focused
     // Listen for when a mathfield gets focused, and show
     // the virtual keyboard if needed
     document.addEventListener('focusin', (event: FocusEvent) => {
@@ -294,6 +296,7 @@ export class VirtualKeyboard implements VirtualKeyboardInterface, EventTarget {
         }, 300);
       }
     });
+    */
   }
 
   addEventListener(
@@ -315,6 +318,20 @@ export class VirtualKeyboard implements VirtualKeyboardInterface, EventTarget {
     return !event.defaultPrevented;
   }
 
+  /**
+   * Fire a specific event for when the close button is clicked on the virtual keyboard
+   */
+  manualClose({ animate = false } = {}): void {
+    this.hide({ animate });
+    this.dispatchEvent(
+      new Event('manual-close', {
+        bubbles: true,
+        cancelable: false,
+        composed: true,
+      })
+    );
+  }
+
   removeEventListener(
     type: string,
     callback: EventListenerOrEventListenerObject | null,
diff --git a/test/mathfield-states/index.html b/test/mathfield-states/index.html
index 0c028d880..75a62b44e 100644
--- a/test/mathfield-states/index.html
+++ b/test/mathfield-states/index.html
@@ -209,6 +209,7 @@
       <h1>Mathfield States</h1>
       <ul>
         <li><a href="../smoke/">Smoke</a></li>
+				<li><a href="../printing/">Printing</a></li>
         <li>
           <a href="../virtual-keyboard/">Virtual Keyboard</a>
         </li>
diff --git a/test/printing/index.html b/test/printing/index.html
new file mode 100644
index 000000000..4abb2c6ef
--- /dev/null
+++ b/test/printing/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8" />
+    <title>Print Test</title>
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1"
+    />
+    <link rel="stylesheet" href="../style.css" />
+    <link rel="icon" href="data:," />
+    <style>
+      math-field {
+        border: 1px solid var(--editable-border);
+        padding: 5px;
+        margin: 10px 0 10px 0;
+        border-radius: 5px;
+        background: var(--editable);
+        color: var(--on-editable);
+        max-width: 640px;
+        width: 100%;
+      }
+    </style>
+  </head>
+  <body>
+    <header>
+      <h1>Print Test</h1>
+      <ul>
+        <li><a href="../smoke/">Smoke</a></li>
+        <li class="current"><a href="../printing/">Printing</a></li>
+        <li>
+          <a href="../virtual-keyboard/">Virtual Keyboard</a>
+        </li>
+        <li>
+          <a href="../mathfield-states/">States</a>
+        </li>
+        <li>
+          <a href="../prompts/">Prompts</a>
+        </li>
+      </ul>
+    </header>
+    <main>
+      <math-field id="mf">x^2+1</math-field>
+
+      <button id="print">
+        Print with iframe
+      </button>
+    </main>
+
+    <script type="module">
+      import {
+        convertLatexToMarkup,
+      } from '/dist/mathlive.mjs';
+
+      const mf = document.getElementById('mf');
+      const btn = document.getElementById('print');
+
+      btn.addEventListener('click', printIframe);
+
+      function printIframe() {
+        const iframe = document.createElement('iframe');
+        document.body.appendChild(iframe);
+        const printDocument = iframe.contentWindow.document;
+        printDocument.open();
+        printDocument.write(`
+<html>
+  <head>
+    <link rel="stylesheet" href="/dist/mathlive-static.css">
+  </head>
+  <body>
+  </body>
+</html>
+				`);
+        printDocument.close();
+
+        iframe.onload = async () => {
+          const markup = convertLatexToMarkup(mf.getValue('latex'));
+          const el = printDocument.createElement('div');
+          el.innerHTML = markup;
+          printDocument.body.appendChild(el);
+          iframe.contentWindow.print();
+          iframe.remove();
+        }
+      }
+    </script>
+  </body>
+</html>
diff --git a/test/prompts/index.html b/test/prompts/index.html
index beb08cd45..8cdb81610 100644
--- a/test/prompts/index.html
+++ b/test/prompts/index.html
@@ -28,6 +28,7 @@
       <h1>Prompts Test</h1>
       <ul>
         <li><a href="../smoke/">Smoke</a></li>
+				<li><a href="../printing/">Printing</a></li>
         <li>
           <a href="../virtual-keyboard/">Virtual Keyboard</a>
         </li>
diff --git a/test/smoke/index.html b/test/smoke/index.html
index 6f675606a..64f06dc47 100644
--- a/test/smoke/index.html
+++ b/test/smoke/index.html
@@ -30,6 +30,7 @@
     <h1>Smoke Test</h1>
     <ul>
       <li class="current"><a href="../smoke/">Smoke</a></li>
+      <li><a href="../printing/">Printing</a></li>
       <li>
         <a href="../virtual-keyboard/">Virtual Keyboard</a>
       </li>
diff --git a/test/virtual-keyboard/index.html b/test/virtual-keyboard/index.html
index 477f0699f..838e47025 100644
--- a/test/virtual-keyboard/index.html
+++ b/test/virtual-keyboard/index.html
@@ -45,6 +45,7 @@
     <h1>Virtual Keyboard Test</h1>
     <ul>
       <li><a href="../smoke/">Smoke</a></li>
+      <li><a href="../printing/">Printing</a></li>
       <li class="current">
         <a href="../virtual-keyboard/">Virtual Keyboard</a>
       </li>