diff --git a/legacy/t/thai-uni/DEPRECATED.md b/legacy/t/thai-uni/DEPRECATED.md
new file mode 100644
index 0000000000..e53bd1ca78
--- /dev/null
+++ b/legacy/t/thai-uni/DEPRECATED.md
@@ -0,0 +1 @@
+This keyboard has been deprecated and replaced by release/t/thai_kedmanee_mattix
\ No newline at end of file
diff --git a/legacy/t/thai-uni/source/help/Thai-Uni.php b/legacy/t/thai-uni/source/help/Thai-Uni.php
index 2101fc67fb..98ab6218d3 100644
--- a/legacy/t/thai-uni/source/help/Thai-Uni.php
+++ b/legacy/t/thai-uni/source/help/Thai-Uni.php
@@ -15,8 +15,8 @@
   Notes:            
   History:          May 2012 - mcdurdin - Generate documentation from Keyman Desktop documentation
 */
-  $pagename = 'Thai Unicode Keyboard Help';
-  $pagetitle = 'Thai Unicode Keyboard Help';
+  $pagename = 'Thai Unicode (deprecated) Keyboard Help';
+  $pagetitle = 'Thai Unicode (deprecated) Keyboard Help';
   $style = <<<END
 /* 
 ===========
diff --git a/release/t/thai_kedmanee_mattix/HISTORY.md b/release/t/thai_kedmanee_mattix/HISTORY.md
new file mode 100644
index 0000000000..e41d96464d
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/HISTORY.md
@@ -0,0 +1,18 @@
+Thai Kedmanee (Mattix) Change History
+====================
+
+2.0 (2026-03-13)
+----------------
+* Created by importing legacy thai-uni keyboard, and moved from freeware license to MIT license by permission of the author Samuel A. Mattix
+* Moved from legacy to release by [Meng-Heng](https://github.com/Meng-Heng)
+
+1.2 (2012-05-24)
+----------------
+* Released for Keyman Desktop 8.0: 
+    * Minor Revisions to On Screen Keyboard
+    * Revised help.
+
+1.1 (2008-01-30)
+----------------
+* Released for Keyman Desktop 7.0: Public Domain.
+* Created by Lao & Thai Language Services
diff --git a/release/t/thai_kedmanee_mattix/LICENSE.md b/release/t/thai_kedmanee_mattix/LICENSE.md
new file mode 100644
index 0000000000..50d64aecd5
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/LICENSE.md
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright © 2008 - 2026 Samuel A. Mattix
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/release/t/thai_kedmanee_mattix/README.md b/release/t/thai_kedmanee_mattix/README.md
new file mode 100644
index 0000000000..62457a7338
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/README.md
@@ -0,0 +1,29 @@
+Thai Kedmanee (Mattix) keyboard
+==============
+
+Description
+-----------
+Thai Kedmanee (Mattix) is a Thai script Unicode keyboard based on the standard Thai Kedmanee layout. This keyboard is fully compliant with the [Unicode Standard](https://unicode.org/standard/standard.html).
+
+Links
+-----
+Keyboard Homepage: https://keyman.com/keyboards/thai_kedmanee_mattix
+
+Copyright
+---------
+See [LICENSE.md](LICENSE.md)
+
+Supported Platforms
+-------------------
+ * Windows
+ * macOS
+ * Linux
+ * Web
+ * iPhone
+ * iPad
+ * Android phone
+ * Android tablet
+ * Mobile devices
+ * Desktop devices
+ * Tablet devices
+
diff --git a/release/t/thai_kedmanee_mattix/source/help/longpress.gif b/release/t/thai_kedmanee_mattix/source/help/longpress.gif
new file mode 100644
index 0000000000..1366311185
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/help/longpress.gif differ
diff --git a/release/t/thai_kedmanee_mattix/source/help/thai_kedmanee_mattix.php b/release/t/thai_kedmanee_mattix/source/help/thai_kedmanee_mattix.php
new file mode 100644
index 0000000000..357270773c
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/source/help/thai_kedmanee_mattix.php
@@ -0,0 +1,125 @@
+<?php
+    $pagename = 'Thai Kedmanee (Mattix) Keyboard Help';
+    $pagetitle = 'Thai Kedmanee (Mattix) Keyboard Help';
+    require_once('header.php');
+
+    $pagestyle = <<<END
+        .keyman-table {
+            border-collapse: collapse;
+            margin-top: 15px;
+        }
+
+        .keyman-table th,
+        .keyman-table td {
+            border: 1px solid #ccc;
+            padding: 8px;
+            text-align: center;       
+            vertical-align: middle; 
+        }
+
+        .keyman-table th {
+            background: #f3f3f3;
+        }
+
+        
+    END;
+?>
+
+<p>
+    Thai Kedmanee (Mattix) is a Thai script Unicode keyboard based on the standard Thai Kedmanee layout. This keyboard is fully compliant with the <a href="https://unicode.org/standard/standard.html">Unicode Standard</a>.
+</p>
+
+<div class="overview">
+    <h2>Overview</h2>
+
+    <h3>Basic Function</h3>
+    <p>
+        This keyboard follows the standard Thai Kedmanee layout. It also allows efficient input of uncommon Thai symbols. Characters are reordered while you type to ensure a consistent underlying sequence of diacritic vowels and tones, making tasks like search and replace much easier. Additional rules prevent you from typing many illegal vowel and tone sequences. This keyboard has also been optimised to take advantage of context-sensitive multiple keyboard switching capabilities in Toolbox (a flat database program) available from <a href="https://software.sil.org/fieldworks/download/">SIL</a>.
+    </p>
+
+    <h3>Fonts</h3>
+    <p>
+        This is a Unicode keyboard and works with any Unicode font which has support for Thai. The standard Windows fonts <b>Tahoma</b> and <b>Arial Unicode MS</b> include support for this keyboard. To see which fonts on your computer support this keyboard, use the <a href="https://help.keyman.com/products/windows/current-version/basic/toolbox/font-helper">Keyman Font Helper</a>.
+    </p>
+
+    <h3>Keyboard Hotkey</h3>
+    <p>
+        This keyboard comes preassigned with a hotkey. You can use the hotkey <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd> to start the keyboard at any time. To remove or change the hotkey, visit the Hotkeys tab of Keyman Configuration, available from the Keyman menu.
+    </p>
+</div>
+
+<div id='osk-container'>
+    <p>
+        This keyboard includes an On Screen Keyboard view for easy reference. The On Screen Keyboard works best when associated with a QWERTY US layout.
+    </p>
+
+    <h2>Desktop Keyboard Layout</h2>
+
+    <div id='osk' data-states='default shift'></div>
+
+    <h2>Thai Special Character Shortcuts</h2>
+
+    <table class="keyman-table">
+        <tr>
+            <th>Description</th>
+            <th>Output</th>
+            <th>Keys</th>
+        </tr>
+
+        <tr>
+            <td>Paiyanyai</td>
+            <td>ฯลฯ</td>
+            <td><kbd>น</kbd><kbd>น</kbd></td>
+        </tr>
+
+        <tr>
+            <td>Yamakkan</td>
+            <td> ๎</td>
+            <td><kbd>`</kbd><kbd>3</kbd></td>
+        </tr>
+
+        <tr>
+            <td>Fongman</td>
+            <td>๏</td>
+            <td><kbd>`</kbd><kbd>"</kbd></td>
+        </tr>
+
+        <tr>
+            <td>Angkhankhu</td>
+            <td>๚</td>
+            <td><kbd>`</kbd><kbd>ฯ</kbd></td>
+        </tr>
+
+        <tr>
+            <td>Khomut</td>
+            <td>๛</td>
+            <td><kbd>`</kbd><kbd>ฯ</kbd><kbd>ฯ</kbd></td>
+        </tr>
+
+        <tr>
+            <td>Bullet</td>
+            <td>•</td>
+            <td><kbd>`</kbd><kbd>๑</kbd></td>
+        </tr>
+
+        <tr>
+            <td>Zero Width Space</td>
+            <td>(invisible)</td>
+            <td><kbd>`</kbd><kbd>Space</kbd></td>
+        </tr>
+    </table>
+</div>
+
+<div id='osk-tablet-container'>
+  <h2>Mobile/Tablet Keyboard Layout</h2>
+    <p>
+        The touch layout for mobile devices (Android and iOS) has a slightly different key arrangement that fits all characters across
+        three layers (Default, Shift, and Numeric) and includes a long-press gestures, maintaining user-friendly interactions and clean layout designs.
+    </p>
+
+  <div id='osk-tablet' data-states='default shift numeric'></div>
+
+  <h3>Long press</h3>
+  
+  <img src="longpress.gif" alt="Longpress Gesture">
+</div>
diff --git a/release/t/thai_kedmanee_mattix/source/readme.htm b/release/t/thai_kedmanee_mattix/source/readme.htm
new file mode 100644
index 0000000000..ccc20189be
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/source/readme.htm
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Thai Kedmanee (Mattix)</title>
+  <style type="text/css">
+    p { font: 10pt Tahoma; }
+    h1 { font: bold 16pt Tahoma; color: #4444cc; margin-bottom: 2px }
+    h2 { font: bold 12pt Tahoma; color: #4444cc; }
+  </style>
+</head>
+<body>
+
+<h1>Thai Kedmanee (Mattix)</h1>
+
+<p>
+  Thai Kedmanee (Mattix) is a Thai script Unicode keyboard based on the standard Thai Kedmanee layout. This keyboard is fully compliant with the <a href="https://unicode.org/standard/standard.html">Unicode Standard</a>.
+</p>
+
+</body>
+</html>
diff --git a/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.ico b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.ico
new file mode 100644
index 0000000000..52f7e55fe8
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.ico differ
diff --git a/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.keyman-touch-layout b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.keyman-touch-layout
new file mode 100644
index 0000000000..9f65b2b8cc
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.keyman-touch-layout
@@ -0,0 +1,635 @@
+{
+  "tablet": {
+    "displayUnderlying": false,
+    "layer": [
+      {
+        "id": "default",
+        "row": [
+          {
+            "id": 1,
+            "key": [
+              {
+                "id": "U_0E20",
+                "text": "ภ"
+              },
+              {
+                "id": "U_0E46",
+                "text": "ๆ"
+              },
+              {
+                "id": "U_0E44",
+                "text": "ไ"
+              },
+              {
+                "id": "U_0E1E",
+                "text": "พ"
+              },
+              {
+                "id": "U_0E38",
+                "text": "ุ"
+              },
+              {
+                "id": "U_0E31",
+                "text": "ั",
+                "hint": "้ะ",
+                "sk": [
+                  {
+                    "text": "้",
+                    "id": "U_0E49"
+                  },
+                  {
+                    "text": "ะ",
+                    "id": "U_0E30"
+                  }
+                ]
+              },
+              {
+                "id": "U_0E23",
+                "text": "ร"
+              },
+              {
+                "id": "U_0E19",
+                "text": "น"
+              },
+              {
+                "id": "U_0E22",
+                "text": "ย"
+              },
+              {
+                "id": "U_0E1A",
+                "text": "บ"
+              },
+              {
+                "id": "U_0E25",
+                "text": "ล"
+              },
+              {
+                "id": "U_0E03",
+                "text": "ฃ"
+              },
+              {
+                "id": "U_0E15",
+                "text": "ต"
+              }
+            ]
+          },
+          {
+            "id": 2,
+            "key": [
+              {
+                "id": "U_0E16",
+                "text": "ถ"
+              },
+              {
+                "id": "U_0E1F",
+                "text": "ฟ"
+              },
+              {
+                "id": "U_0E2B",
+                "text": "ห"
+              },
+              {
+                "id": "U_0E01",
+                "text": "ก"
+              },
+              {
+                "id": "U_0E14",
+                "text": "ด"
+              },
+              {
+                "id": "U_0E40",
+                "text": "เ"
+              },
+              {
+                "id": "U_0E48",
+                "text": "่"
+              },
+              {
+                "id": "U_0E32",
+                "text": "า",
+                "hint": "ๅ ำ ว",
+                "sk": [
+                  {
+                    "text": "ๅ",
+                    "id": "U_0E45"
+                  },
+                  {
+                    "text": "ำ",
+                    "id": "U_0E33"
+                  },
+                  {
+                    "text": "ว",
+                    "id": "U_0E27"
+                  }
+                ]
+              },
+              {
+                "id": "U_0E2A",
+                "text": "ส"
+              },
+              {
+                "id": "U_0E07",
+                "text": "ง"
+              },
+              {
+                "id": "U_0E02",
+                "text": "ข"
+              },
+              {
+                "id": "U_0E0A",
+                "text": "ช"
+              },
+              {
+                "id": "U_0E08",
+                "text": "จ"
+              }
+            ]
+          },
+          {
+            "id": 3,
+            "key": [
+              {
+                "id": "K_SHIFT",
+                "text": "*Shift*",
+                "width": 130,
+                "sp": 1,
+                "nextlayer": "shift"
+              },
+              {
+                "id": "T_new_7301",
+                "width": 10,
+                "sp": 10
+              },
+              {
+                "id": "U_0E04",
+                "text": "ค"
+              },
+              {
+                "id": "U_0E1C",
+                "text": "ผ"
+              },
+              {
+                "id": "U_0E1B",
+                "text": "ป"
+              },
+              {
+                "id": "U_0E41",
+                "text": "แ"
+              },
+              {
+                "id": "U_0E2D",
+                "text": "อ"
+              },
+              {
+                "id": "U_0E35",
+                "text": "ี",
+                "hint": "ึ ‌ ิ ‌ ื",
+                "sk": [
+                  {
+                    "text": "ึ",
+                    "id": "U_0E36"
+                  },
+                  {
+                    "text": "ิ",
+                    "id": "U_0E34"
+                  },
+                  {
+                    "text": "ื",
+                    "id": "U_0E37"
+                  }
+                ]
+              },
+              {
+                "id": "U_0E17",
+                "text": "ท"
+              },
+              {
+                "id": "U_0E21",
+                "text": "ม"
+              },
+              {
+                "id": "U_0E43",
+                "text": "ใ"
+              },
+              {
+                "id": "U_0E1D",
+                "text": "ฝ"
+              },
+              {
+                "id": "T_new_7478",
+                "width": 10,
+                "sp": 10
+              },
+              {
+                "id": "K_BKSP",
+                "text": "*BkSp*",
+                "width": 130,
+                "sp": 1
+              }
+            ]
+          },
+          {
+            "id": 4,
+            "key": [
+              {
+                "id": "K_NUMLOCK",
+                "text": "*123*",
+                "sp": 1,
+                "nextlayer": "numeric"
+              },
+              {
+                "id": "K_LOPT",
+                "text": "*Menu*",
+                "width": 140,
+                "sp": 1
+              },
+              {
+                "id": "K_SPACE",
+                "width": 930
+              },
+              {
+                "id": "U_0E2F",
+                "text": "ฯ"
+              },
+              {
+                "id": "K_ENTER",
+                "text": "*Enter*",
+                "width": 140,
+                "sp": 1
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "id": "shift",
+        "row": [
+          {
+            "id": 1,
+            "key": [
+              {
+                "id": "U_0E0E",
+                "text": "ฎ"
+              },
+              {
+                "id": "U_0E11",
+                "text": "ฑ"
+              },
+              {
+                "id": "U_0E18",
+                "text": "ธ"
+              },
+              {
+                "id": "U_0E39",
+                "text": "ู"
+              },
+              {
+                "id": "U_0E4D",
+                "text": "ํ"
+              },
+              {
+                "id": "U_0E4A",
+                "text": "๊"
+              },
+              {
+                "id": "U_0E13",
+                "text": "ณ"
+              },
+              {
+                "id": "U_0E0D",
+                "text": "ญ"
+              },
+              {
+                "id": "U_0E10",
+                "text": "ฐ"
+              },
+              {
+                "id": "U_0E05",
+                "text": "ฅ"
+              }
+            ]
+          },
+          {
+            "id": 2,
+            "key": [
+              {
+                "id": "U_0E24",
+                "text": "ฤ"
+              },
+              {
+                "id": "U_0E06",
+                "text": "ฆ"
+              },
+              {
+                "id": "U_0E0F",
+                "text": "ฏ"
+              },
+              {
+                "id": "U_0E42",
+                "text": "โ"
+              },
+              {
+                "id": "U_0E0C",
+                "text": "ฌ"
+              },
+              {
+                "id": "U_0E47",
+                "text": "็"
+              },
+              {
+                "id": "U_0E4B",
+                "text": "๋"
+              },
+              {
+                "id": "U_0E29",
+                "text": "ษ"
+              },
+              {
+                "id": "U_0E28",
+                "text": "ศ"
+              },
+              {
+                "id": "U_0E0B",
+                "text": "ซ"
+              }
+            ]
+          },
+          {
+            "id": 3,
+            "key": [
+              {
+                "id": "K_SHIFT",
+                "text": "*Shifted*",
+                "width": 130,
+                "sp": 1,
+                "nextlayer": "default"
+              },
+              {
+                "id": "T_new_2514",
+                "width": 12,
+                "sp": 10
+              },
+              {
+                "id": "U_0E09",
+                "text": "ฉ"
+              },
+              {
+                "id": "U_0E2E",
+                "text": "ฮ"
+              },
+              {
+                "id": "U_0E3A",
+                "text": "ฺ"
+              },
+              {
+                "id": "U_0E4C",
+                "text": "์"
+              },
+              {
+                "id": "U_0E12",
+                "text": "ฒ"
+              },
+              {
+                "id": "U_0E2C",
+                "text": "ฬ"
+              },
+              {
+                "id": "U_0E26",
+                "text": "ฦ"
+              },
+              {
+                "id": "K_RBRKT",
+                "text": "",
+                "width": 12,
+                "sp": 10
+              },
+              {
+                "id": "K_BKSP",
+                "text": "*BkSp*",
+                "width": 130,
+                "sp": 1
+              }
+            ]
+          },
+          {
+            "id": 4,
+            "key": [
+              {
+                "id": "K_LOPT",
+                "text": "*Menu*",
+                "width": 125,
+                "sp": 1
+              },
+              {
+                "id": "K_SPACE",
+                "width": 750
+              },
+              {
+                "id": "U_003F",
+                "text": "?"
+              },
+              {
+                "id": "K_ENTER",
+                "text": "*Enter*",
+                "width": 115,
+                "sp": 1
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "id": "numeric",
+        "row": [
+          {
+            "id": 1,
+            "key": [
+              {
+                "id": "U_0E51",
+                "text": "๑"
+              },
+              {
+                "id": "U_0E52",
+                "text": "๒"
+              },
+              {
+                "id": "U_0E53",
+                "text": "๓"
+              },
+              {
+                "id": "U_0E54",
+                "text": "๔"
+              },
+              {
+                "id": "U_0E55",
+                "text": "๕"
+              },
+              {
+                "id": "U_0E56",
+                "text": "๖"
+              },
+              {
+                "id": "U_0E57",
+                "text": "๗"
+              },
+              {
+                "id": "U_0E58",
+                "text": "๘"
+              },
+              {
+                "id": "U_0E59",
+                "text": "๙"
+              },
+              {
+                "id": "U_0E50",
+                "text": "๐"
+              }
+            ]
+          },
+          {
+            "id": 2,
+            "key": [
+              {
+                "id": "U_0025",
+                "text": "%"
+              },
+              {
+                "id": "U_002B",
+                "text": "+",
+                "hint": "- _",
+                "sk": [
+                  {
+                    "text": "-",
+                    "id": "U_002D"
+                  },
+                  {
+                    "text": "_",
+                    "id": "U_005F"
+                  }
+                ]
+              },
+              {
+                "id": "U_0022",
+                "text": "\""
+              },
+              {
+                "id": "U_0E3F",
+                "text": "฿"
+              },
+              {
+                "id": "U_0040",
+                "text": "@"
+              },
+              {
+                "id": "U_0023",
+                "text": "#"
+              },
+              {
+                "id": "U_0024",
+                "text": "$"
+              },
+              {
+                "id": "U_003B",
+                "text": ";"
+              },
+              {
+                "id": "U_002E",
+                "text": ".",
+                "hint": ",",
+                "sk": [
+                  {
+                    "text": ",",
+                    "id": "U_002C"
+                  }
+                ]
+              },
+              {
+                "id": "U_005C",
+                "text": "\\"
+              }
+            ]
+          },
+          {
+            "id": 3,
+            "key": [
+              {
+                "id": "K_NUMLOCK",
+                "text": "*abc*",
+                "width": 130,
+                "sp": 1,
+                "nextlayer": "default"
+              },
+              {
+                "id": "T_new_6780",
+                "width": 12,
+                "sp": 10
+              },
+              {
+                "id": "U_0028",
+                "text": "("
+              },
+              {
+                "id": "U_0029",
+                "text": ")"
+              },
+              {
+                "id": "U_005B",
+                "text": "["
+              },
+              {
+                "id": "U_005D",
+                "text": "]"
+              },
+              {
+                "id": "U_007B",
+                "text": "{"
+              },
+              {
+                "id": "U_007D",
+                "text": "}"
+              },
+              {
+                "id": "U_003E",
+                "text": ">"
+              },
+              {
+                "id": "T_new_7121",
+                "width": 12,
+                "sp": 10
+              },
+              {
+                "id": "K_BKSP",
+                "text": "*BkSp*",
+                "width": 130,
+                "sp": 1
+              }
+            ]
+          },
+          {
+            "id": 4,
+            "key": [
+              {
+                "id": "K_LOPT",
+                "text": "*Menu*",
+                "width": 140,
+                "sp": 1
+              },
+              {
+                "id": "K_SPACE",
+                "width": 820
+              },
+              {
+                "id": "K_ENTER",
+                "text": "*Enter*",
+                "width": 140,
+                "sp": 1
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "font": "",
+    "fontsize": ""
+  }
+}
\ No newline at end of file
diff --git a/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kmn b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kmn
new file mode 100644
index 0000000000..9c17851aaf
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kmn
@@ -0,0 +1,141 @@
+c thai_kedmanee_mattix generated from template at 2026-03-13 16:10:36
+c with name "Thai Kedmanee"
+store(&VERSION) '17.0'
+store(&NAME) 'Thai Kedmanee (Mattix)'
+store(&COPYRIGHT) 'Copyright © Samuel A. Mattix'
+store(&KEYBOARDVERSION) '2.0'
+store(&TARGETS) 'any'
+store(&BITMAP) 'thai_kedmanee_mattix.ico'
+store(&VISUALKEYBOARD) 'thai_kedmanee_mattix.kvks'
+store(&LAYOUTFILE) 'thai_kedmanee_mattix.keyman-touch-layout'
+store(&HOTKEY) [CTRL SHIFT K_T]
+
+begin Unicode > use(main)
+
+group(main) using keys
+
++ '`' > '_'
++ '1' > 'ๅ'
++ '2' > '/'
++ '3' > '-'
++ '4' > 'ภ'
++ '5' > 'ถ'
++ '6' > 'ุ'
++ '7' > 'ึ'
++ '8' > 'ค'
++ '9' > 'ต'
++ '0' > 'จ'
++ '-' > 'ข'
++ '=' > 'ช'
+
++ 'q' > 'ๆ'
++ 'w' > 'ไ'
++ 'e' > 'ำ'
++ 'r' > 'พ'
++ 't' > 'ะ'
++ 'y' > 'ั'
++ 'u' > 'ี'
++ 'i' > 'ร'
++ 'o' > 'น'
++ 'p' > 'ย'
++ '[' > 'บ'
++ ']' > 'ล'
++ '\' > 'ฃ'
+
++ 'a' > 'ฟ'
++ 's' > 'ห'
++ 'd' > 'ก'
++ 'f' > 'ด'
++ 'g' > 'เ'
++ 'h' > '้'
++ 'j' > '่'
++ 'k' > 'า'
++ 'l' > 'ส'
++ ';' > 'ว'
++ "'" > 'ง'
+
++ 'z' > 'ผ'
++ 'x' > 'ป'
++ 'c' > 'แ'
++ 'v' > 'อ'
++ 'b' > 'ิ'
++ 'n' > 'ื'
++ 'm' > 'ท'
++ ',' > 'ม'
++ '.' > 'ใ'
++ '/' > 'ฝ'
+
++ '~' > '%'
++ '!' > '+'
++ '@' > '๑'
++ '#' > '๒'
++ '$' > '๓'
++ '%' > '๔'
++ '^' > 'ู'
++ '&' > '฿'
++ '*' > '๕'
++ '(' > '๖'
++ ')' > '๗'
++ '_' > '๘'
++ '+' > '๙'
+
++ 'Q' > '๐'
++ 'W' > '"'
++ 'E' > 'ฎ'
++ 'R' > 'ฑ'
++ 'T' > 'ธ'
++ 'Y' > 'ํ'
++ 'U' > '๊'
++ 'I' > 'ณ'
++ 'O' > 'ฯ'
++ 'P' > 'ญ'
++ '{' > 'ฐ'
++ '}' > ','
++ '|' > 'ฅ'
+
++ 'A' > 'ฤ'
++ 'S' > 'ฆ'
++ 'D' > 'ฏ'
++ 'F' > 'โ'
++ 'G' > 'ฌ'
++ 'H' > '็'
++ 'J' > '๋'
++ 'K' > 'ษ'
++ 'L' > 'ศ'
++ ':' > 'ซ'
++ '"' > '.'
+
++ 'Z' > '('
++ 'X' > ')'
++ 'C' > 'ฉ'
++ 'V' > 'ฮ'
++ 'B' > 'ฺ'
++ 'N' > '์'
++ 'M' > '?'
++ '<' > 'ฒ'
++ '>' > 'ฬ'
++ '?' > 'ฦ'
+
+c =========================================================
+c Thai special character shortcuts
+c =========================================================
+c Paiyanyai — OO → ฯลฯ
+'ฯ' + [SHIFT K_O] > 'ฯลฯ'
+
+c Yamakkan — `3 → ๎
+'_' + [K_3] > U+0E4E
+
+c Fongman — `" → ๏
+'_' + [SHIFT K_QUOTE] > U+0E4F
+
+c Angkhankhu — `ฯ → ๚
+'_' + [SHIFT K_O] > U+0E5A dk(compose)
+
+c Khomut — `ฯฯ → ๛
+U+0E5A dk(compose) + [SHIFT K_O] > U+0E5B
+
+c Bullet — `๑ → •
+'_' + [SHIFT K_2] > U+2022
+
+c Zero width space — `Space → ZWSP
+'_' + [K_SPACE] > U+200B
diff --git a/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kps b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kps
new file mode 100644
index 0000000000..5b01bb7ce8
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kps
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package>
+  <System>
+    <KeymanDeveloperVersion>19.0.212.0</KeymanDeveloperVersion>
+    <FileVersion>7.0</FileVersion>
+  </System>
+  <Options>
+    <ExecuteProgram/>
+    <ReadMeFile>readme.htm</ReadMeFile>
+    <LicenseFile>../LICENSE.md</LicenseFile>
+    <WelcomeFile>welcome/welcome.htm</WelcomeFile>
+    <MSIFileName/>
+    <MSIOptions/>
+    <FollowKeyboardVersion/>
+  </Options>
+  <StartMenu>
+    <Folder/>
+    <Items/>
+  </StartMenu>
+  <Info>
+    <Name URL="">Thai Kedmanee (Mattix)</Name>
+    <Copyright URL="">Copyright © Samuel A. Mattix</Copyright>
+    <Author URL="">Samuel A. Mattix</Author>
+    <Description URL="">Thai Kedmanee (Mattix) is a Thai script Unicode keyboard based on the standard Thai Kedmanee layout. This keyboard is fully compliant with the Unicode Standard.</Description>
+    <Version URL=""/>
+  </Info>
+  <Files>
+    <File>
+      <Name>../build/thai_kedmanee_mattix.kmx</Name>
+      <Description/>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.kmx</FileType>
+    </File>
+    <File>
+      <Name>../build/thai_kedmanee_mattix.js</Name>
+      <Description/>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.js</FileType>
+    </File>
+    <File>
+      <Name>../build/thai_kedmanee_mattix.kvk</Name>
+      <Description/>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.kvk</FileType>
+    </File>
+    <File>
+      <Name>readme.htm</Name>
+      <Description/>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.htm</FileType>
+    </File>
+    <File>
+      <Name>../LICENSE.md</Name>
+      <Description/>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.md</FileType>
+    </File>
+    <File>
+      <Name>welcome/welcome.htm</Name>
+      <Description>File welcome.htm</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.htm</FileType>
+    </File>
+    <File>
+      <Name>welcome/LayoutU_.png</Name>
+      <Description>File LayoutU_.png</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.png</FileType>
+    </File>
+    <File>
+      <Name>welcome/LayoutU_S.png</Name>
+      <Description>File LayoutU_S.png</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.png</FileType>
+    </File>
+    <File>
+      <Name>welcome/longpress.gif</Name>
+      <Description>File longpress.gif</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.gif</FileType>
+    </File>
+    <File>
+      <Name>welcome/TouchLayoutU_.jpg</Name>
+      <Description>File TouchLayoutU_.jpg</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.jpg</FileType>
+    </File>
+    <File>
+      <Name>welcome/TouchLayoutU_N.jpg</Name>
+      <Description>File TouchLayoutU_N.jpg</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.jpg</FileType>
+    </File>
+    <File>
+      <Name>welcome/TouchLayoutU_S.jpg</Name>
+      <Description>File TouchLayoutU_S.jpg</Description>
+      <CopyLocation>0</CopyLocation>
+      <FileType>.jpg</FileType>
+    </File>
+  </Files>
+  <Keyboards>
+    <Keyboard>
+      <ID>thai_kedmanee_mattix</ID>
+      <Languages>
+        <Language ID="th">Thai</Language>
+      </Languages>
+    </Keyboard>
+  </Keyboards>
+  <RelatedPackages>
+    <RelatedPackage ID="thai-uni" Relationship="deprecates"/>
+  </RelatedPackages>
+  <Strings/>
+</Package>
diff --git a/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kvks b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kvks
new file mode 100644
index 0000000000..c80c9e2d6d
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/source/thai_kedmanee_mattix.kvks
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<visualkeyboard>
+  <header>
+    <version>10.0</version>
+    <kbdname>thai_kedmanee_mattix</kbdname>
+    <flags>
+      <displayunderlying/>
+    </flags>
+  </header>
+  <encoding name="unicode" fontname="Arial" fontsize="12">
+    <layer shift="S">
+      <key vkey="K_1">+</key>
+      <key vkey="K_QUOTE">.</key>
+      <key vkey="K_3">๒</key>
+      <key vkey="K_4">๓</key>
+      <key vkey="K_5">๔</key>
+      <key vkey="K_7">฿</key>
+      <key vkey="K_9">๖</key>
+      <key vkey="K_0">๗</key>
+      <key vkey="K_8">๕</key>
+      <key vkey="K_EQUAL">๙</key>
+      <key vkey="K_COLON">ซ</key>
+      <key vkey="K_COMMA">ฒ</key>
+      <key vkey="K_PERIOD">ฬ</key>
+      <key vkey="K_SLASH">ฦ</key>
+      <key vkey="K_2">๑</key>
+      <key vkey="K_A">ฤ</key>
+      <key vkey="K_B">ฺ</key>
+      <key vkey="K_C">ฉ</key>
+      <key vkey="K_D">ฏ</key>
+      <key vkey="K_E">ฎ</key>
+      <key vkey="K_F">โ</key>
+      <key vkey="K_G">ฌ</key>
+      <key vkey="K_H">็</key>
+      <key vkey="K_I">ณ</key>
+      <key vkey="K_J">๋</key>
+      <key vkey="K_K">ษ</key>
+      <key vkey="K_L">ศ</key>
+      <key vkey="K_M">?</key>
+      <key vkey="K_N">์</key>
+      <key vkey="K_O">ฯ</key>
+      <key vkey="K_P">ญ</key>
+      <key vkey="K_Q">๐</key>
+      <key vkey="K_R">ฑ</key>
+      <key vkey="K_S">ฆ</key>
+      <key vkey="K_T">ธ</key>
+      <key vkey="K_U">๊</key>
+      <key vkey="K_V">ฮ</key>
+      <key vkey="K_W">"</key>
+      <key vkey="K_X">)</key>
+      <key vkey="K_Y">ํ</key>
+      <key vkey="K_Z">(</key>
+      <key vkey="K_6">ู</key>
+      <key vkey="K_HYPHEN">๘</key>
+      <key vkey="K_LBRKT">ฐ</key>
+      <key vkey="K_BKSLASH">ฅ</key>
+      <key vkey="K_RBRKT">,</key>
+      <key vkey="K_BKQUOTE">%</key>
+    </layer>
+    <layer shift="">
+      <key vkey="K_QUOTE">ง</key>
+      <key vkey="K_COMMA">ม</key>
+      <key vkey="K_HYPHEN">ข</key>
+      <key vkey="K_PERIOD">ใ</key>
+      <key vkey="K_SLASH">ฝ</key>
+      <key vkey="K_0">จ</key>
+      <key vkey="K_1">ๅ</key>
+      <key vkey="K_2">/</key>
+      <key vkey="K_3">-</key>
+      <key vkey="K_4">ภ</key>
+      <key vkey="K_5">ถ</key>
+      <key vkey="K_6">ุ</key>
+      <key vkey="K_7">ึ</key>
+      <key vkey="K_8">ค</key>
+      <key vkey="K_9">ต</key>
+      <key vkey="K_COLON">ว</key>
+      <key vkey="K_EQUAL">ช</key>
+      <key vkey="K_LBRKT">บ</key>
+      <key vkey="K_BKSLASH">ฃ</key>
+      <key vkey="K_RBRKT">ล</key>
+      <key vkey="K_BKQUOTE">_</key>
+      <key vkey="K_A">ฟ</key>
+      <key vkey="K_B">ิ</key>
+      <key vkey="K_C">แ</key>
+      <key vkey="K_D">ก</key>
+      <key vkey="K_E">ำ</key>
+      <key vkey="K_F">ด</key>
+      <key vkey="K_G">เ</key>
+      <key vkey="K_H">้</key>
+      <key vkey="K_I">ร</key>
+      <key vkey="K_J">่</key>
+      <key vkey="K_K">า</key>
+      <key vkey="K_L">ส</key>
+      <key vkey="K_M">ท</key>
+      <key vkey="K_N">ื</key>
+      <key vkey="K_O">น</key>
+      <key vkey="K_P">ย</key>
+      <key vkey="K_Q">ๆ</key>
+      <key vkey="K_R">พ</key>
+      <key vkey="K_S">ห</key>
+      <key vkey="K_T">ะ</key>
+      <key vkey="K_U">ี</key>
+      <key vkey="K_V">อ</key>
+      <key vkey="K_W">ไ</key>
+      <key vkey="K_X">ป</key>
+      <key vkey="K_Y">ั</key>
+      <key vkey="K_Z">ผ</key>
+    </layer>
+  </encoding>
+</visualkeyboard>
diff --git a/release/t/thai_kedmanee_mattix/source/welcome/LayoutU_.png b/release/t/thai_kedmanee_mattix/source/welcome/LayoutU_.png
new file mode 100644
index 0000000000..f4ecf7e5f3
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/welcome/LayoutU_.png differ
diff --git a/release/t/thai_kedmanee_mattix/source/welcome/LayoutU_S.png b/release/t/thai_kedmanee_mattix/source/welcome/LayoutU_S.png
new file mode 100644
index 0000000000..c8218ab3f4
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/welcome/LayoutU_S.png differ
diff --git a/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_.jpg b/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_.jpg
new file mode 100644
index 0000000000..9b3f4c5a17
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_.jpg differ
diff --git a/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_N.jpg b/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_N.jpg
new file mode 100644
index 0000000000..1054fc4eb2
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_N.jpg differ
diff --git a/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_S.jpg b/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_S.jpg
new file mode 100644
index 0000000000..612d018673
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/welcome/TouchLayoutU_S.jpg differ
diff --git a/release/t/thai_kedmanee_mattix/source/welcome/longpress.gif b/release/t/thai_kedmanee_mattix/source/welcome/longpress.gif
new file mode 100644
index 0000000000..1366311185
Binary files /dev/null and b/release/t/thai_kedmanee_mattix/source/welcome/longpress.gif differ
diff --git a/release/t/thai_kedmanee_mattix/source/welcome/welcome.htm b/release/t/thai_kedmanee_mattix/source/welcome/welcome.htm
new file mode 100644
index 0000000000..f13f3b8267
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/source/welcome/welcome.htm
@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Start Using Thai Kedmanee (Mattix)</title>
+  <style type="text/css">
+    p { font: 10pt Tahoma; }
+    h1 { font: bold 16pt Tahoma; color: #4444cc; margin-bottom: 2px }
+    h2 { font: bold 12pt Tahoma; color: #4444cc; }
+    .keyman-table {
+      border-collapse: collapse;
+      margin-top: 15px;
+    }
+
+    .keyman-table th,
+    .keyman-table td {
+      border: 1px solid #ccc;
+      padding: 8px;
+      text-align: center;       
+      vertical-align: middle; 
+    }
+
+    .keyman-table th {
+      background: #f3f3f3;
+    }
+
+    kbd {
+      background: #f7f7f7;
+      border: 1px solid #ccc;
+      border-bottom-width: 2px;
+      border-radius: 4px;
+      padding: 2px 6px;
+      font-family: monospace;
+      margin-right: 2px;
+    }
+
+    .touch-layout, .on-screen {
+      display: flex;
+      flex-direction: column;
+    }
+
+    .touch-layout img, .on-screen img {
+      width: 100%;
+      margin-bottom: 10px;
+    }
+  </style>
+</head>
+<body>
+
+<h1>Start Using Thai Kedmanee (Mattix)</h1>
+
+<p>
+  Thai Kedmanee (Mattix) is a Thai script Unicode keyboard based on the standard Thai Kedmanee layout. This keyboard is fully compliant with the <a href="https://unicode.org/standard/standard.html">Unicode Standard</a>.
+</p>
+
+<p>Keyboard Home Page: <a href="https://keyman.com/keyboards/thai_kedmanee_mattix">https://keyman.com/keyboards/thai_kedmanee_mattix</a></p>
+
+<div class="overview">
+    <h2>Overview</h2>
+
+    <h3>Basic Function</h3>
+    <p>
+        This keyboard follows the standard Thai Kedmanee layout. It also allows efficient input of uncommon Thai symbols. Characters are reordered while you type to ensure a consistent underlying sequence of diacritic vowels and tones, making tasks like search and replace much easier. Additional rules prevent you from typing many illegal vowel and tone sequences. This keyboard has also been optimised to take advantage of context-sensitive multiple keyboard switching capabilities in Toolbox (a flat database program) available from <a href="https://software.sil.org/fieldworks/download/">SIL</a>.
+    </p>
+
+    <h3>Fonts</h3>
+    <p>
+        This is a Unicode keyboard and works with any Unicode font which has support for Thai. The standard Windows fonts <b>Tahoma</b> and <b>Arial Unicode MS</b> include support for this keyboard. To see which fonts on your computer support this keyboard, use the <a href="https://help.keyman.com/products/windows/current-version/basic/toolbox/font-helper">Keyman Font Helper</a>.
+    </p>
+
+    <h3>Keyboard Hotkey</h3>
+    <p>
+        This keyboard comes preassigned with a hotkey. You can use the hotkey <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>T</kbd> to start the keyboard at any time. To remove or change the hotkey, visit the Hotkeys tab of Keyman Configuration, available from the Keyman menu.
+    </p>
+</div>
+
+<h1>Keyboard Layouts</h1>
+
+<h2>Desktop Keyboard Layout</h2>
+<p>
+    This keyboard includes an On Screen Keyboard view for easy reference. The On Screen Keyboard works best when associated with a QWERTY US layout.
+</p>
+
+<div class="on-screen">
+  <h3>Default layer</h3>
+
+  <img src="LayoutU_.png" alt="Desktop Default layer">
+
+  <h3>Shift layer</h3>
+
+  <img src="LayoutU_S.png" alt="Desktop Shift layer">
+
+</div>
+
+<h2>Thai Special Character Shortcuts</h2>
+
+<table class="keyman-table">
+  <tr>
+    <th>Description</th>
+    <th>Output</th>
+    <th>Keys</th>
+  </tr>
+
+  <tr>
+    <td>Paiyanyai</td>
+    <td>ฯลฯ</td>
+    <td><kbd>น</kbd><kbd>น</kbd></td>
+  </tr>
+
+  <tr>
+    <td>Yamakkan</td>
+    <td> ๎</td>
+    <td><kbd>`</kbd><kbd>3</kbd></td>
+  </tr>
+
+  <tr>
+    <td>Fongman</td>
+    <td>๏</td>
+    <td><kbd>`</kbd><kbd>"</kbd></td>
+  </tr>
+
+  <tr>
+    <td>Angkhankhu</td>
+    <td>๚</td>
+    <td><kbd>`</kbd><kbd>ฯ</kbd></td>
+  </tr>
+
+  <tr>
+    <td>Khomut</td>
+    <td>๛</td>
+    <td><kbd>`</kbd><kbd>ฯ</kbd><kbd>ฯ</kbd></td>
+  </tr>
+
+  <tr>
+    <td>Bullet</td>
+    <td>•</td>
+    <td><kbd>`</kbd><kbd>๑</kbd></td>
+  </tr>
+
+  <tr>
+    <td>Zero Width Space</td>
+    <td>(invisible)</td>
+    <td><kbd>`</kbd><kbd>Space</kbd></td>
+  </tr>
+
+</table>
+
+<h2>Mobile/Tablet Keyboard Layout</h2>
+<p>
+    The touch layout for mobile devices (Android and iOS) has a slightly different key arrangement that fits all characters across
+    three layers (Default, Shift, and Numeric) and includes a long-press gestures, maintaining user-friendly interactions and clean layout designs.
+</p>
+
+<div class="touch-layout">
+
+  <h3>Default layer</h3>
+
+  <img src="TouchLayoutU_.jpg" alt="Touch Default layer">
+
+  <h3>Shift layer</h3>
+
+  <img src="TouchLayoutU_S.jpg" alt="Touch Shift layer">
+
+  <h3>Numeric layer</h3>
+
+  <img src="TouchLayoutU_N.jpg" alt="Touch Numeric layer">
+
+  <h3>Long press</h3>
+  <img src="longpress.gif" alt="Longpress Gesture">
+
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/release/t/thai_kedmanee_mattix/thai_kedmanee_mattix.kpj b/release/t/thai_kedmanee_mattix/thai_kedmanee_mattix.kpj
new file mode 100644
index 0000000000..a5b2f330b7
--- /dev/null
+++ b/release/t/thai_kedmanee_mattix/thai_kedmanee_mattix.kpj
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<KeymanDeveloperProject>
+  <Options>
+    <Version>2.0</Version>
+  </Options>
+</KeymanDeveloperProject>