diff --git a/keyboards/stello65/beta/beta.c b/keyboards/stello65/beta/beta.c
index 015f53b920..fa19135814 100644
--- a/keyboards/stello65/beta/beta.c
+++ b/keyboards/stello65/beta/beta.c
@@ -2,15 +2,17 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "quantum.h"
-#include "encoder_actions.h"
-
-void matrix_scan_kb(void) {
-    encoder_action_unregister();
-    matrix_scan_user();
-}
 
+#if defined(ENCODER_ENABLE)
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
-    encoder_action_register(index, clockwise);
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
     return true;
-};
+}
+#endif
diff --git a/keyboards/stello65/beta/config.h b/keyboards/stello65/beta/config.h
index 61ebee945d..a1ac3b7b2a 100644
--- a/keyboards/stello65/beta/config.h
+++ b/keyboards/stello65/beta/config.h
@@ -3,9 +3,6 @@
 
 #pragma once
 
-#define ENCODERS_CW_KEY  { { 4, 7 } }
-#define ENCODERS_CCW_KEY { { 4, 6 } }
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/stello65/beta/encoder_actions.c b/keyboards/stello65/beta/encoder_actions.c
deleted file mode 100644
index 87a53676e6..0000000000
--- a/keyboards/stello65/beta/encoder_actions.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- * Copyright 2021 drashna jael're (@drashna)
- * Copyright 2021 uybv
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "encoder_actions.h"
-
-#ifdef ENCODER_ENABLE
-static uint8_t  encoder_state[NUM_ENCODERS] = {0};
-static keypos_t encoder_cw[NUM_ENCODERS]    = ENCODERS_CW_KEY;
-static keypos_t encoder_ccw[NUM_ENCODERS]   = ENCODERS_CCW_KEY;
-
-void encoder_action_unregister(void) {
-    for (int index = 0; index < NUM_ENCODERS; ++index) {
-        if (encoder_state[index]) {
-            keyevent_t encoder_event = (keyevent_t) {
-                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
-                .pressed = false,
-                .time = timer_read(),
-                .type = KEY_EVENT
-            };
-            encoder_state[index] = 0;
-            action_exec(encoder_event);
-        }
-    }
-}
-
-void encoder_action_register(uint8_t index, bool clockwise) {
-    keyevent_t encoder_event = (keyevent_t) {
-        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
-        .pressed = true,
-        .time = timer_read(),
-        .type = KEY_EVENT
-    };
-    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
-    action_exec(encoder_event);
-}
-
-#endif
diff --git a/keyboards/stello65/beta/encoder_actions.h b/keyboards/stello65/beta/encoder_actions.h
deleted file mode 100644
index 1a7fb72014..0000000000
--- a/keyboards/stello65/beta/encoder_actions.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-void encoder_action_unregister(void);
-
-void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/stello65/beta/info.json b/keyboards/stello65/beta/info.json
index 396e0f91d8..0eee3caad3 100644
--- a/keyboards/stello65/beta/info.json
+++ b/keyboards/stello65/beta/info.json
@@ -23,86 +23,697 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "community_layouts": [
+        "65_ansi_blocker",
+        "65_ansi_blocker_split_bs",
+        "65_ansi_blocker_tsangan",
+        "65_ansi_blocker_tsangan_split_bs",
+        "65_iso_blocker",
+        "65_iso_blocker_split_bs",
+        "65_iso_blocker_tsangan",
+        "65_iso_blocker_tsangan_split_bs"
+    ],
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-                {"matrix": [0, 1], "x": 2, "y": 0},
-                {"matrix": [1, 1], "x": 3, "y": 0},
-                {"matrix": [0, 2], "x": 4, "y": 0},
-                {"matrix": [1, 2], "x": 5, "y": 0},
-                {"matrix": [0, 3], "x": 6, "y": 0},
-                {"matrix": [1, 3], "x": 7, "y": 0},
-                {"matrix": [0, 4], "x": 8, "y": 0},
-                {"matrix": [1, 4], "x": 9, "y": 0},
-                {"matrix": [0, 5], "x": 10, "y": 0},
-                {"matrix": [1, 5], "x": 11, "y": 0},
-                {"matrix": [0, 6], "x": 12, "y": 0},
-                {"matrix": [1, 6], "x": 13, "y": 0},
-                {"matrix": [0, 7], "x": 14, "y": 0},
-                {"matrix": [1, 7], "x": 15, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 7], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
 
-                {"matrix": [4, 6], "x": 16.25, "y": 0},
-                {"matrix": [4, 7], "x": 17.25, "y": 0},
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
 
-                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
-                {"matrix": [3, 0], "x": 1.5, "y": 1},
-                {"matrix": [2, 1], "x": 2.5, "y": 1},
-                {"matrix": [3, 1], "x": 3.5, "y": 1},
-                {"matrix": [2, 2], "x": 4.5, "y": 1},
-                {"matrix": [3, 2], "x": 5.5, "y": 1},
-                {"matrix": [2, 3], "x": 6.5, "y": 1},
-                {"matrix": [3, 3], "x": 7.5, "y": 1},
-                {"matrix": [2, 4], "x": 8.5, "y": 1},
-                {"matrix": [3, 4], "x": 9.5, "y": 1},
-                {"matrix": [2, 5], "x": 10.5, "y": 1},
-                {"matrix": [3, 5], "x": 11.5, "y": 1},
-                {"matrix": [2, 6], "x": 12.5, "y": 1},
-                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
-                {"matrix": [3, 7], "x": 15, "y": 1},
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
 
-                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
-                {"matrix": [5, 0], "x": 1.75, "y": 2},
-                {"matrix": [4, 1], "x": 2.75, "y": 2},
-                {"matrix": [5, 1], "x": 3.75, "y": 2},
-                {"matrix": [4, 2], "x": 4.75, "y": 2},
-                {"matrix": [5, 2], "x": 5.75, "y": 2},
-                {"matrix": [4, 3], "x": 6.75, "y": 2},
-                {"matrix": [5, 3], "x": 7.75, "y": 2},
-                {"matrix": [4, 4], "x": 8.75, "y": 2},
-                {"matrix": [5, 4], "x": 9.75, "y": 2},
-                {"matrix": [4, 5], "x": 10.75, "y": 2},
-                {"matrix": [5, 5], "x": 11.75, "y": 2},
-                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
-                {"matrix": [5, 7], "x": 15, "y": 2},
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
 
-                {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
-                {"matrix": [7, 0], "x": 1.25, "y": 3},
-                {"matrix": [6, 1], "x": 2.25, "y": 3},
-                {"matrix": [7, 1], "x": 3.25, "y": 3},
-                {"matrix": [6, 2], "x": 4.25, "y": 3},
-                {"matrix": [7, 2], "x": 5.25, "y": 3},
-                {"matrix": [6, 3], "x": 6.25, "y": 3},
-                {"matrix": [7, 3], "x": 7.25, "y": 3},
-                {"matrix": [6, 4], "x": 8.25, "y": 3},
-                {"matrix": [7, 4], "x": 9.25, "y": 3},
-                {"matrix": [6, 5], "x": 10.25, "y": 3},
-                {"matrix": [7, 5], "x": 11.25, "y": 3},
-                {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
-                {"matrix": [7, 6], "x": 14, "y": 3},
-                {"matrix": [7, 7], "x": 15, "y": 3},
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
 
-                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
-                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
-                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
-                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
-                {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
-                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
 
-                {"matrix": [8, 6], "x": 13, "y": 4},
-                {"matrix": [9, 6], "x": 14, "y": 4},
-                {"matrix": [9, 7], "x": 15, "y": 4}
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 7], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 7], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "\\", "matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "\\", "matrix": [3, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 7], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "\\", "matrix": [3, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [9, 4], "x": 10, "y": 4, "w": 1.25},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "\\", "matrix": [3, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "1", "matrix": [1, 0], "x": 1, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 2, "y": 0},
+                {"label": "3", "matrix": [1, 1], "x": 3, "y": 0},
+                {"label": "4", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "5", "matrix": [1, 2], "x": 5, "y": 0},
+                {"label": "6", "matrix": [0, 3], "x": 6, "y": 0},
+                {"label": "7", "matrix": [1, 3], "x": 7, "y": 0},
+                {"label": "8", "matrix": [0, 4], "x": 8, "y": 0},
+                {"label": "9", "matrix": [1, 4], "x": 9, "y": 0},
+                {"label": "0", "matrix": [0, 5], "x": 10, "y": 0},
+                {"label": "-", "matrix": [1, 5], "x": 11, "y": 0},
+                {"label": "=", "matrix": [0, 6], "x": 12, "y": 0},
+                {"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 0},
+                {"label": "Delete", "matrix": [0, 7], "x": 14, "y": 0},
+                {"label": "Home", "matrix": [1, 7], "x": 15, "y": 0},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 0], "x": 1.5, "y": 1},
+                {"label": "W", "matrix": [2, 1], "x": 2.5, "y": 1},
+                {"label": "E", "matrix": [3, 1], "x": 3.5, "y": 1},
+                {"label": "R", "matrix": [2, 2], "x": 4.5, "y": 1},
+                {"label": "T", "matrix": [3, 2], "x": 5.5, "y": 1},
+                {"label": "Y", "matrix": [2, 3], "x": 6.5, "y": 1},
+                {"label": "U", "matrix": [3, 3], "x": 7.5, "y": 1},
+                {"label": "I", "matrix": [2, 4], "x": 8.5, "y": 1},
+                {"label": "O", "matrix": [3, 4], "x": 9.5, "y": 1},
+                {"label": "P", "matrix": [2, 5], "x": 10.5, "y": 1},
+                {"label": "[", "matrix": [3, 5], "x": 11.5, "y": 1},
+                {"label": "]", "matrix": [2, 6], "x": 12.5, "y": 1},
+                {"label": "End", "matrix": [3, 7], "x": 15, "y": 1},
+
+                {"label": "Caps Lock", "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 0], "x": 1.75, "y": 2},
+                {"label": "S", "matrix": [4, 1], "x": 2.75, "y": 2},
+                {"label": "D", "matrix": [5, 1], "x": 3.75, "y": 2},
+                {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 2},
+                {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 2},
+                {"label": "H", "matrix": [4, 3], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [5, 3], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [4, 4], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [4, 5], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [5, 5], "x": 11.75, "y": 2},
+                {"label": "\\", "matrix": [3, 6], "x": 12.75, "y": 2},
+                {"label": "Enter", "matrix": [5, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+                {"label": "Page Up", "matrix": [5, 7], "x": 15, "y": 2},
+
+                {"label": "Shift", "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 0], "x": 1.25, "y": 3},
+                {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+                {"label": "X", "matrix": [7, 1], "x": 3.25, "y": 3},
+                {"label": "C", "matrix": [6, 2], "x": 4.25, "y": 3},
+                {"label": "V", "matrix": [7, 2], "x": 5.25, "y": 3},
+                {"label": "B", "matrix": [6, 3], "x": 6.25, "y": 3},
+                {"label": "N", "matrix": [7, 3], "x": 7.25, "y": 3},
+                {"label": "M", "matrix": [6, 4], "x": 8.25, "y": 3},
+                {"label": ",", "matrix": [7, 4], "x": 9.25, "y": 3},
+                {"label": ".", "matrix": [6, 5], "x": 10.25, "y": 3},
+                {"label": "/", "matrix": [7, 5], "x": 11.25, "y": 3},
+                {"label": "Shift", "matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [7, 6], "x": 14, "y": 3},
+                {"label": "Page Down", "matrix": [7, 7], "x": 15, "y": 3},
+
+                {"label": "Ctrl", "matrix": [8, 0], "x": 0, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [9, 0], "x": 1.5, "y": 4},
+                {"label": "Alt", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [8, 3], "x": 4, "y": 4, "w": 7},
+                {"label": "Ctrl", "matrix": [9, 5], "x": 11, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [8, 6], "x": 13, "y": 4},
+                {"label": "\u2193", "matrix": [9, 6], "x": 14, "y": 4},
+                {"label": "\u2192", "matrix": [9, 7], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/stello65/beta/keymaps/default/keymap.c b/keyboards/stello65/beta/keymaps/default/keymap.c
index 305d97243c..7b5c54f098 100644
--- a/keyboards/stello65/beta/keymaps/default/keymap.c
+++ b/keyboards/stello65/beta/keymaps/default/keymap.c
@@ -10,20 +10,27 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_BASE] = LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_VOLD, KC_VOLU,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_END,  
-		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP, 
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT 
+    [_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_END,
+        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
+        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_FN] = LAYOUT_all(
-		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, 
-		_______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______, _______, 
-		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, _______, 
-		_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END 
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______, _______,
+        _______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
     )
 
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN] =   { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/stello65/beta/keymaps/default/rules.mk b/keyboards/stello65/beta/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/stello65/beta/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/stello65/beta/keymaps/via/keymap.c b/keyboards/stello65/beta/keymaps/via/keymap.c
index 1a5c202947..a4a76353aa 100644
--- a/keyboards/stello65/beta/keymaps/via/keymap.c
+++ b/keyboards/stello65/beta/keymaps/via/keymap.c
@@ -12,36 +12,45 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[_BASE] = LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_VOLD, KC_VOLU,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_END,  
-		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP, 
-		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT 
-	),
+    [_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_END,
+        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
+        KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-	[_FN1] = LAYOUT_all(
-		QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, 
-		_______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______, _______, 
-		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, _______, 
-		_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END 
-	),
+    [_FN1] = LAYOUT_all(
+        QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______, _______,
+        _______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END
+    ),
 
-	[_FN2] = LAYOUT_all(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, 
-		_______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______  
-	),
+    [_FN2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
 
-	[_FN3] = LAYOUT_all(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, 
-		_______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______  
-	),
+    [_FN3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
 
 };
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [_FN1] =  { ENCODER_CCW_CW(_______, _______) },
+    [_FN2] =  { ENCODER_CCW_CW(_______, _______) },
+    [_FN3] =  { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/stello65/beta/keymaps/via/rules.mk b/keyboards/stello65/beta/keymaps/via/rules.mk
index 16d33cd89f..f1adcab005 100644
--- a/keyboards/stello65/beta/keymaps/via/rules.mk
+++ b/keyboards/stello65/beta/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/stello65/beta/matrix_diagram.md b/keyboards/stello65/beta/matrix_diagram.md
new file mode 100644
index 0000000000..58e022b019
--- /dev/null
+++ b/keyboards/stello65/beta/matrix_diagram.md
@@ -0,0 +1,24 @@
+# Matrix Diagram for Stello65 Beta
+
+```
+                                                    ┌───────┐
+                                       2u Backspace │16     │
+                                                    └───────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │07 │17 │ ─ Switch or Encoder
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      ┌─────┐
+│20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36   │37 │      │     │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐56  │
+│40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │56      │57 │   │36 │    │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+│60  │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66    │76 │77 │    ISO Enter
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│80  │90  │81  │83                      │94  │95  │ │86 │96 │97 │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+┌────────┐
+│60      │ 2.25u LShift
+└────────┘
+┌─────┬───┬─────┬───────────────────────────┬─────┐
+│80   │90 │81   │83                         │65   │ Blocker Tsangan
+└─────┴───┴─────┴───────────────────────────┴─────┘
+```
diff --git a/keyboards/stello65/beta/rules.mk b/keyboards/stello65/beta/rules.mk
index 689c1e977e..0e8233e5da 100644
--- a/keyboards/stello65/beta/rules.mk
+++ b/keyboards/stello65/beta/rules.mk
@@ -12,5 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 DEBOUNCE_TYPE	  = sym_defer_pk
-
-SRC += encoder_actions.c