diff --git a/config/corne.conf b/config/corne.conf
index c10e7a9..a1bcaec 100644
--- a/config/corne.conf
+++ b/config/corne.conf
@@ -126,6 +126,14 @@ CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=5
 # ref: https://zmk.dev/docs/config/system#hid
 CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y
 
+### JAVELIN STENO ENGINE
+CONFIG_ZMK_JAVELIN_STENO=y
+CONFIG_ZMK_JAVELIN_STENO_DICT_PLOVER=y
+CONFIG_ZMK_JAVELIN_STENO_DICT_LAPWING=y
+CONFIG_CPLUSPLUS=y
+CONFIG_LIB_CPLUSPLUS=y
+CONFIG_HEAP_MEM_POOL_SIZE=32768
+
 ### DEBUG OPTIONS
 # CONFIG_ZMK_USB_LOGGING=y
 # CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000
diff --git a/config/corne.keymap b/config/corne.keymap
index 973f0c2..0ec9836 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -13,6 +13,8 @@
 #include <dt-bindings/zmk/backlight.h>
 #include <dt-bindings/zmk/rgb.h>
 #include <dt-bindings/zmk/reset.h>
+#include <dt-bindings/zmk/javelin_steno.h>
+#include <behaviors/javelin_steno.dtsi>
 
 &led_strip {
     chain-length = <27>;
@@ -93,10 +95,10 @@
         steno_layer {
             display-name = "STEN";
             bindings = <
-&none      &kp N1  &kp N2  &kp N3  &kp N4  &kp N5       &kp N6  &kp N7  &kp N8  &kp N9    &kp N0    &to 4
-&mo 4      &kp Q   &kp W   &kp E   &kp R   &kp T        &kp Y   &kp U   &kp I   &kp O     &kp P     &kp LBKT
-&none      &kp A   &kp S   &kp D   &kp F   &kp G        &kp H   &kp J   &kp K   &kp L     &kp SEMI  &kp SQT
-                            &td_rgb &kp C &kp V  &kp N   &kp M   &ht_mute_pp C_PLAY_PAUSE C_MUTE
+&none                    &javsteno STENO_NUM1  &javsteno STENO_NUM2  &javsteno STENO_NUM3  &javsteno STENO_NUM4  &javsteno STENO_NUM5       &javsteno STENO_NUM6  &javsteno STENO_NUM7  &javsteno STENO_NUM8  &javsteno STENO_NUM9   &javsteno STENO_NUM10  &to 4
+&mo 4                    &javsteno STENO_S1    &javsteno STENO_TL    &javsteno STENO_PL    &javsteno STENO_HL    &javsteno STENO_STAR1      &javsteno STENO_STAR3 &javsteno STENO_FR    &javsteno STENO_PR    &javsteno STENO_LR     &javsteno STENO_TR     &javsteno STENO_DR
+&none                    &javsteno STENO_S2    &javsteno STENO_KL    &javsteno STENO_WL    &javsteno STENO_RL    &javsteno STENO_STAR2      &javsteno STENO_STAR4 &javsteno STENO_RR    &javsteno STENO_BR    &javsteno STENO_GR     &javsteno STENO_SR     &javsteno STENO_ZR
+                                                                     &none  &javsteno STENO_A  &javsteno STENO_O      &javsteno STENO_E     &javsteno STENO_U     &none
             >;
         };
 
diff --git a/config/west.yml b/config/west.yml
index 1c4f319..8a02c72 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -11,6 +11,12 @@ manifest:
     # fork of zmk-nice-oled with custom KM medal animation
     - name: KeebMaker
       url-base: https://github.com/KeebMaker
+    # javelin steno engine module
+    - name: afiqzudinhadi
+      url-base: https://github.com/afiqzudinhadi
+    # javelin steno engine source
+    - name: jthlim
+      url-base: https://github.com/jthlim
   projects:
     # Pinned to v0.3.0 instead of `main`: ZMK main tracks Zephyr 4.1, whose
     # board-model rewrite renamed `nice_nano_v2` (now `nice_nano//zmk`) and
@@ -36,5 +42,14 @@ manifest:
     - name: zmk-oled-adapter
       remote: mctechnology17
       revision: main
+    # javelin steno engine module
+    - name: zmk-javelin-steno
+      remote: afiqzudinhadi
+      revision: main
+    # javelin steno engine source (fetched into module's javelin/ dir)
+    - name: javelin-steno
+      remote: jthlim
+      revision: main
+      path: zmk-javelin-steno/javelin
   self:
     path: config
diff --git a/keymap-drawer/corne.svg b/keymap-drawer/corne.svg
index c5fcf24..82e3be7 100644
--- a/keymap-drawer/corne.svg
+++ b/keymap-drawer/corne.svg
@@ -15,6 +15,68 @@
 <svg id="mdi:backspace-outline">
 <svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-outline" viewBox="0 0 24 24"><path d="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5H7L2.28,12L7,19H22V5Z" /></svg>
 </svg>
+<svg id="mdi:eyedropper">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-eyedropper" viewBox="0 0 24 24"><path d="M19.35,11.72L17.22,13.85L15.81,12.43L8.1,20.14L3.5,22L2,20.5L3.86,15.9L11.57,8.19L10.15,6.78L12.28,4.65L19.35,11.72M16.76,3C17.93,1.83 19.83,1.83 21,3C22.17,4.17 22.17,6.07 21,7.24L19.08,9.16L14.84,4.92L16.76,3M5.56,17.03L4.5,19.5L6.97,18.44L14.4,11L13,9.6L5.56,17.03Z" /></svg>
+</svg>
+<svg id="mdi:led-on">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-led-on" viewBox="0 0 24 24"><path d="M11,0V4H13V0H11M18.3,2.29L15.24,5.29L16.64,6.71L19.7,3.71L18.3,2.29M5.71,2.29L4.29,3.71L7.29,6.71L8.71,5.29L5.71,2.29M12,6A4,4 0 0,0 8,10V16H6V18H9V23H11V18H13V23H15V18H18V16H16V10A4,4 0 0,0 12,6M2,9V11H6V9H2M18,9V11H22V9H18Z" /></svg>
+</svg>
+<svg id="mdi:led-outline">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-led-outline" viewBox="0 0 24 24"><path d="M12,6A4,4 0 0,0 8,10V16H6V18H9V23H11V18H13V23H15V18H18V16H16V10A4,4 0 0,0 12,6M12,8A2,2 0 0,1 14,10V15H10V10A2,2 0 0,1 12,8Z" /></svg>
+</svg>
+<svg id="mdi:palette">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-palette" viewBox="0 0 24 24"><path d="M17.5,12A1.5,1.5 0 0,1 16,10.5A1.5,1.5 0 0,1 17.5,9A1.5,1.5 0 0,1 19,10.5A1.5,1.5 0 0,1 17.5,12M14.5,8A1.5,1.5 0 0,1 13,6.5A1.5,1.5 0 0,1 14.5,5A1.5,1.5 0 0,1 16,6.5A1.5,1.5 0 0,1 14.5,8M9.5,8A1.5,1.5 0 0,1 8,6.5A1.5,1.5 0 0,1 9.5,5A1.5,1.5 0 0,1 11,6.5A1.5,1.5 0 0,1 9.5,8M6.5,12A1.5,1.5 0 0,1 5,10.5A1.5,1.5 0 0,1 6.5,9A1.5,1.5 0 0,1 8,10.5A1.5,1.5 0 0,1 6.5,12M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A1.5,1.5 0 0,0 13.5,19.5C13.5,19.11 13.35,18.76 13.11,18.5C12.88,18.23 12.73,17.88 12.73,17.5A1.5,1.5 0 0,1 14.23,16H16A5,5 0 0,0 21,11C21,6.58 16.97,3 12,3Z" /></svg>
+</svg>
+<svg id="tabler:brightness-down">
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+ 
+ 
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+  class="icon icon-tabler icons-tabler-outline icon-tabler-brightness-down"
+>
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M9 12a3 3 0 1 0 6 0a3 3 0 1 0 -6 0" />
+  <path d="M12 5l0 .01" />
+  <path d="M17 7l0 .01" />
+  <path d="M19 12l0 .01" />
+  <path d="M17 17l0 .01" />
+  <path d="M12 19l0 .01" />
+  <path d="M7 17l0 .01" />
+  <path d="M5 12l0 .01" />
+  <path d="M7 7l0 .01" />
+</svg>
+</svg>
+<svg id="tabler:brightness-up">
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+ 
+ 
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+  class="icon icon-tabler icons-tabler-outline icon-tabler-brightness-up"
+>
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M9 12a3 3 0 1 0 6 0a3 3 0 1 0 -6 0" />
+  <path d="M12 5l0 -2" />
+  <path d="M17 7l1.4 -1.4" />
+  <path d="M19 12l2 0" />
+  <path d="M17 17l1.4 1.4" />
+  <path d="M12 19l0 2" />
+  <path d="M7 17l-1.4 1.4" />
+  <path d="M6 12l-2 0" />
+  <path d="M7 7l-1.4 -1.4" />
+</svg>
+</svg>
 </defs>/* end glyphs */
 <style>/* inherit to force styles through use tags */
 svg path {
@@ -384,6 +446,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(224, 205)" class="key keypos-36">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 86%">&amp;td_rgb</tspan></text>
 </g>
 <g transform="translate(286, 213) rotate(15.0)" class="key keypos-37">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -403,6 +466,8 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(616, 205)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">MUTE</text>
+<text x="0" y="24" class="key hold"><tspan style="font-size: 60%">PLAY PAUSE</tspan></text>
 </g>
 <g class="combo combopos-0">
 <rect rx="6" ry="6" x="70" y="64" width="28" height="26" class="combo"/>
@@ -606,6 +671,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(224, 205)" class="key keypos-36">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 86%">&amp;td_rgb</tspan></text>
 </g>
 <g transform="translate(286, 213) rotate(15.0)" class="key keypos-37">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -625,6 +691,8 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(616, 205)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">MUTE</text>
+<text x="0" y="24" class="key hold"><tspan style="font-size: 60%">PLAY PAUSE</tspan></text>
 </g>
 <g class="combo combopos-0">
 <rect rx="6" ry="6" x="70" y="64" width="28" height="26" class="combo"/>
@@ -684,43 +752,63 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(84, 49)" class="key keypos-1">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">1</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM1</tspan>
+</text>
 </g>
 <g transform="translate(140, 35)" class="key keypos-2">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">2</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM2</tspan>
+</text>
 </g>
 <g transform="translate(196, 28)" class="key keypos-3">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">3</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM3</tspan>
+</text>
 </g>
 <g transform="translate(252, 35)" class="key keypos-4">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">4</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM4</tspan>
+</text>
 </g>
 <g transform="translate(308, 42)" class="key keypos-5">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">5</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM5</tspan>
+</text>
 </g>
 <g transform="translate(532, 42)" class="key keypos-6">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">6</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM6</tspan>
+</text>
 </g>
 <g transform="translate(588, 35)" class="key keypos-7">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">7</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM7</tspan>
+</text>
 </g>
 <g transform="translate(644, 28)" class="key keypos-8">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">8</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM8</tspan>
+</text>
 </g>
 <g transform="translate(700, 35)" class="key keypos-9">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">9</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM9</tspan>
+</text>
 </g>
 <g transform="translate(756, 49)" class="key keypos-10">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">0</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_NUM…</tspan>
+</text>
 </g>
 <g transform="translate(812, 49)" class="key keypos-11">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -735,113 +823,165 @@ rect.held, rect.combo.held {
 </a></g>
 <g transform="translate(84, 105)" class="key keypos-13">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Q</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_S1</tspan>
+</text>
 </g>
 <g transform="translate(140, 91)" class="key keypos-14">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">W</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_TL</tspan>
+</text>
 </g>
 <g transform="translate(196, 84)" class="key keypos-15">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">E</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_PL</tspan>
+</text>
 </g>
 <g transform="translate(252, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">R</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_HL</tspan>
+</text>
 </g>
 <g transform="translate(308, 98)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">T</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_STA…</tspan>
+</text>
 </g>
 <g transform="translate(532, 98)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Y</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_STA…</tspan>
+</text>
 </g>
 <g transform="translate(588, 91)" class="key keypos-19">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">U</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_FR</tspan>
+</text>
 </g>
 <g transform="translate(644, 84)" class="key keypos-20">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">I</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_PR</tspan>
+</text>
 </g>
 <g transform="translate(700, 91)" class="key keypos-21">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">O</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_LR</tspan>
+</text>
 </g>
 <g transform="translate(756, 105)" class="key keypos-22">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">P</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_TR</tspan>
+</text>
 </g>
 <g transform="translate(812, 105)" class="key keypos-23">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">[</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_DR</tspan>
+</text>
 </g>
 <g transform="translate(28, 161)" class="key keypos-24">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 </g>
 <g transform="translate(84, 161)" class="key keypos-25">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">A</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_S2</tspan>
+</text>
 </g>
 <g transform="translate(140, 147)" class="key keypos-26">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">S</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_KL</tspan>
+</text>
 </g>
 <g transform="translate(196, 140)" class="key keypos-27">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">D</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_WL</tspan>
+</text>
 </g>
 <g transform="translate(252, 147)" class="key keypos-28">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">F</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_RL</tspan>
+</text>
 </g>
 <g transform="translate(308, 154)" class="key keypos-29">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">G</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_STA…</tspan>
+</text>
 </g>
 <g transform="translate(532, 154)" class="key keypos-30">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">H</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 60%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 60%">STENO_STA…</tspan>
+</text>
 </g>
 <g transform="translate(588, 147)" class="key keypos-31">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">J</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_RR</tspan>
+</text>
 </g>
 <g transform="translate(644, 140)" class="key keypos-32">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">K</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_BR</tspan>
+</text>
 </g>
 <g transform="translate(700, 147)" class="key keypos-33">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">L</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_GR</tspan>
+</text>
 </g>
 <g transform="translate(756, 161)" class="key keypos-34">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">;</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_SR</tspan>
+</text>
 </g>
 <g transform="translate(812, 161)" class="key keypos-35">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">&#x27;</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_ZR</tspan>
+</text>
 </g>
 <g transform="translate(224, 205)" class="key keypos-36">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 </g>
 <g transform="translate(286, 213) rotate(15.0)" class="key keypos-37">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">C</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_A</tspan>
+</text>
 </g>
 <g transform="translate(351, 224) rotate(30.0)" class="key keypos-38">
 <rect rx="6" ry="6" x="-26" y="-40" width="52" height="80" class="key"/>
-<text x="0" y="0" class="key tap">V</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_O</tspan>
+</text>
 </g>
 <g transform="translate(489, 224) rotate(-30.0)" class="key keypos-39">
 <rect rx="6" ry="6" x="-26" y="-40" width="52" height="80" class="key"/>
-<text x="0" y="0" class="key tap">N</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_E</tspan>
+</text>
 </g>
 <g transform="translate(554, 213) rotate(-15.0)" class="key keypos-40">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">M</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em" style="font-size: 67%">&amp;javsteno</tspan><tspan x="0" dy="1.2em" style="font-size: 67%">STENO_U</tspan>
+</text>
 </g>
 <g transform="translate(616, 205)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1077,21 +1217,36 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(28, 105)" class="key held keypos-12">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key held"/>
+<text x="0" y="0" class="key held tap">
+<tspan x="0" dy="-0.6em">OUT</tspan><tspan x="0" dy="1.2em">TOG</tspan>
+</text>
 </g>
-<g transform="translate(84, 105)" class="key keypos-13">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<g transform="translate(84, 105)" class="key sym_by_sym keypos-13">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key sym_by_sym"/>
+<use href="#mdi:led-on" xlink:href="#mdi:led-on" x="-9" y="-9" height="18" width="18.0" class="key sym_by_sym tap glyph mdi:led-on"/>
+<use href="#mdi:palette" xlink:href="#mdi:palette" x="-8" y="-24" height="15" width="15.0" class="key sym_by_sym shifted glyph mdi:palette"/>
 </g>
-<g transform="translate(140, 91)" class="key keypos-14">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<g transform="translate(140, 91)" class="key sym_by_sym keypos-14">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key sym_by_sym"/>
+<use href="#mdi:led-outline" xlink:href="#mdi:led-outline" x="-9" y="-9" height="18" width="18.0" class="key sym_by_sym tap glyph mdi:led-outline"/>
+<use href="#mdi:eyedropper" xlink:href="#mdi:eyedropper" x="-8" y="-24" height="15" width="15.0" class="key sym_by_sym shifted glyph mdi:eyedropper"/>
 </g>
-<g transform="translate(196, 84)" class="key keypos-15">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<g transform="translate(196, 84)" class="key sym_by_sym keypos-15">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key sym_by_sym"/>
+<use href="#mdi:led-outline" xlink:href="#mdi:led-outline" x="-9" y="-9" height="18" width="18.0" class="key sym_by_sym tap glyph mdi:led-outline"/>
+<use href="#tabler:brightness-down" xlink:href="#tabler:brightness-down" x="-8" y="-24" height="15" width="15.0" class="key sym_by_sym shifted glyph tabler:brightness-down"/>
 </g>
 <g transform="translate(252, 91)" class="key keypos-16">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">BRI</tspan><tspan x="0" dy="1.2em">UP</tspan>
+</text>
 </g>
 <g transform="translate(308, 98)" class="key keypos-17">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">Vol</tspan><tspan x="0" dy="1.2em">Up</tspan>
+</text>
 </g>
 <g transform="translate(532, 98)" class="key keypos-18">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1121,24 +1276,32 @@ rect.held, rect.combo.held {
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <use href="#mdi:apple-keyboard-shift" xlink:href="#mdi:apple-keyboard-shift" x="-9" y="-9" height="18" width="18.0" class="key tap glyph mdi:apple-keyboard-shift"/>
 </g>
-<g transform="translate(84, 161)" class="key keypos-25">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Z</text>
+<g transform="translate(84, 161)" class="key sym_by_sym keypos-25">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key sym_by_sym"/>
+<use href="#mdi:led-outline" xlink:href="#mdi:led-outline" x="-9" y="-9" height="18" width="18.0" class="key sym_by_sym tap glyph mdi:led-outline"/>
+<use href="#mdi:palette" xlink:href="#mdi:palette" x="-8" y="-24" height="15" width="15.0" class="key sym_by_sym shifted glyph mdi:palette"/>
 </g>
-<g transform="translate(140, 147)" class="key keypos-26">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">X</text>
+<g transform="translate(140, 147)" class="key sym_by_sym keypos-26">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key sym_by_sym"/>
+<use href="#mdi:led-on" xlink:href="#mdi:led-on" x="-9" y="-9" height="18" width="18.0" class="key sym_by_sym tap glyph mdi:led-on"/>
+<use href="#mdi:eyedropper" xlink:href="#mdi:eyedropper" x="-8" y="-24" height="15" width="15.0" class="key sym_by_sym shifted glyph mdi:eyedropper"/>
 </g>
-<g transform="translate(196, 140)" class="key keypos-27">
-<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">C</text>
+<g transform="translate(196, 140)" class="key sym_by_sym keypos-27">
+<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key sym_by_sym"/>
+<use href="#mdi:led-on" xlink:href="#mdi:led-on" x="-9" y="-9" height="18" width="18.0" class="key sym_by_sym tap glyph mdi:led-on"/>
+<use href="#tabler:brightness-up" xlink:href="#tabler:brightness-up" x="-8" y="-24" height="15" width="15.0" class="key sym_by_sym shifted glyph tabler:brightness-up"/>
 </g>
 <g transform="translate(252, 147)" class="key keypos-28">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">V</text>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">BRI</tspan><tspan x="0" dy="1.2em">DN</tspan>
+</text>
 </g>
 <g transform="translate(308, 154)" class="key keypos-29">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">
+<tspan x="0" dy="-0.6em">Vol</tspan><tspan x="0" dy="1.2em">Down</tspan>
+</text>
 </g>
 <g transform="translate(532, 154)" class="key keypos-30">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1166,6 +1329,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(756, 161)" class="key keypos-34">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 60%">&amp;td_colors</tspan></text>
 </g>
 <g transform="translate(812, 161)" class="key keypos-35">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1173,7 +1337,7 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(224, 205)" class="key keypos-36">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Esc</text>
+<text x="0" y="0" class="key tap"><tspan style="font-size: 86%">&amp;td_rgb</tspan></text>
 </g>
 <g transform="translate(286, 213) rotate(15.0)" class="key keypos-37">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -1193,6 +1357,8 @@ rect.held, rect.combo.held {
 </g>
 <g transform="translate(616, 205)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<text x="0" y="0" class="key tap">MUTE</text>
+<text x="0" y="24" class="key hold"><tspan style="font-size: 60%">PLAY PAUSE</tspan></text>
 </g>
 </g>
 </g>
diff --git a/keymap-drawer/corne.yaml b/keymap-drawer/corne.yaml
index 8f63e70..6340a96 100644
--- a/keymap-drawer/corne.yaml
+++ b/keymap-drawer/corne.yaml
@@ -37,12 +37,12 @@ layers:
   - .
   - /
   - $$mdi:apple-keyboard-shift$$
-  - ''
+  - '&td_rgb'
   - $$mdi:apple-keyboard-control$$
   - $$mdi:apple-keyboard-command$$
   - ␣
   - $$mdi:apple-keyboard-option$$
-  - ''
+  - {t: MUTE, h: PLAY PAUSE}
   QWRT:
   - '`'
   - Q
@@ -80,54 +80,54 @@ layers:
   - .
   - /
   - $$mdi:apple-keyboard-shift$$
-  - ''
+  - '&td_rgb'
   - $$mdi:apple-keyboard-control$$
   - $$mdi:apple-keyboard-command$$
   - ␣
   - $$mdi:apple-keyboard-option$$
-  - ''
+  - {t: MUTE, h: PLAY PAUSE}
   STEN:
   - ''
-  - '1'
-  - '2'
-  - '3'
-  - '4'
-  - '5'
-  - '6'
-  - '7'
-  - '8'
-  - '9'
-  - '0'
+  - '&javsteno STENO_NUM1'
+  - '&javsteno STENO_NUM2'
+  - '&javsteno STENO_NUM3'
+  - '&javsteno STENO_NUM4'
+  - '&javsteno STENO_NUM5'
+  - '&javsteno STENO_NUM6'
+  - '&javsteno STENO_NUM7'
+  - '&javsteno STENO_NUM8'
+  - '&javsteno STENO_NUM9'
+  - '&javsteno STENO_NUM10'
   - {t: HUB, h: toggle}
   - HUB
-  - Q
-  - W
-  - E
-  - R
-  - T
-  - Y
-  - U
-  - I
-  - O
-  - P
-  - '['
+  - '&javsteno STENO_S1'
+  - '&javsteno STENO_TL'
+  - '&javsteno STENO_PL'
+  - '&javsteno STENO_HL'
+  - '&javsteno STENO_STAR1'
+  - '&javsteno STENO_STAR3'
+  - '&javsteno STENO_FR'
+  - '&javsteno STENO_PR'
+  - '&javsteno STENO_LR'
+  - '&javsteno STENO_TR'
+  - '&javsteno STENO_DR'
   - ''
-  - A
-  - S
-  - D
-  - F
-  - G
-  - H
-  - J
-  - K
-  - L
-  - ;
-  - ''''
+  - '&javsteno STENO_S2'
+  - '&javsteno STENO_KL'
+  - '&javsteno STENO_WL'
+  - '&javsteno STENO_RL'
+  - '&javsteno STENO_STAR2'
+  - '&javsteno STENO_STAR4'
+  - '&javsteno STENO_RR'
+  - '&javsteno STENO_BR'
+  - '&javsteno STENO_GR'
+  - '&javsteno STENO_SR'
+  - '&javsteno STENO_ZR'
   - ''
-  - C
-  - V
-  - N
-  - M
+  - '&javsteno STENO_A'
+  - '&javsteno STENO_O'
+  - '&javsteno STENO_E'
+  - '&javsteno STENO_U'
   - ''
   FPS:
   - {t: '1', h: Esc}
@@ -185,12 +185,12 @@ layers:
   - ']'
   - '*'
   - '='
-  - {type: held}
-  - ''
-  - ''
-  - ''
-  - ''
-  - ''
+  - {t: OUT TOG, type: held}
+  - {t: '$$mdi:led-on$$', s: '$$mdi:palette$$', type: sym_by_sym}
+  - {t: '$$mdi:led-outline$$', s: '$$mdi:eyedropper$$', type: sym_by_sym}
+  - {t: '$$mdi:led-outline$$', s: '$$tabler:brightness-down$$', type: sym_by_sym}
+  - BRI UP
+  - Vol Up
   - '-'
   - ←
   - ↓
@@ -198,23 +198,23 @@ layers:
   - /
   - \
   - $$mdi:apple-keyboard-shift$$
-  - Z
-  - X
-  - C
-  - V
-  - ''
+  - {t: '$$mdi:led-outline$$', s: '$$mdi:palette$$', type: sym_by_sym}
+  - {t: '$$mdi:led-on$$', s: '$$mdi:eyedropper$$', type: sym_by_sym}
+  - {t: '$$mdi:led-on$$', s: '$$tabler:brightness-up$$', type: sym_by_sym}
+  - BRI DN
+  - Vol Down
   - {t: CARP, h: toggle}
   - {t: QWRT, h: toggle}
   - {t: STEN, h: toggle}
   - {t: FPS, h: toggle}
-  - ''
+  - '&td_colors'
   - $$mdi:apple-keyboard-shift$$
-  - Esc
+  - '&td_rgb'
   - $$mdi:apple-keyboard-control$$
   - $$mdi:apple-keyboard-command$$
   - ␣
   - $$mdi:apple-keyboard-option$$
-  - ''
+  - {t: MUTE, h: PLAY PAUSE}
 combos:
 - p: [1, 13]
   k: '1'