Merge remote-tracking branch 'origin/master' into develop

13 files changed, 623 insertions, 0 deletions

diff --git a/keyboards/adpenrose/mine/config.h b/keyboards/adpenrose/mine/config.h
new file mode 100644
index 0000000000..cc05ddf8f1
--- /dev/null
+++ b/keyboards/adpenrose/mine/config.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Arturo Avila (@Arturo Avila)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Solenoid pin */
+#define SOLENOID_PIN A7
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/adpenrose/mine/info.json b/keyboards/adpenrose/mine/info.json
new file mode 100644
index 0000000000..5010485602
--- /dev/null
+++ b/keyboards/adpenrose/mine/info.json
@@ -0,0 +1,357 @@
+{
+    "manufacturer": "ADPenrose",
+    "keyboard_name": "Mine",
+    "maintainer": "Arturo Avila",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0006",
+        "vid": "0x4450"
+    },
+    "features": {
+        "encoder": true,
+        "bootmagic": true,
+        "extrakey": true
+    },
+    "build": {
+        "lto": true
+    },
+    "encoder": {
+        "rotary": [{ "pin_a": "C4", "pin_b": "C3" }]
+    },
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "rows": ["A0", "A1", "A4", "A3", "C7", "B4", "B5", "B6", "A6", "A2", "A5"],
+        "cols": ["B0", "B1", "B2", "B3", "D0", "D1", "D5", "D6", "C6", "C5"]
+    },
+    "processor": "atmega32a",
+    "bootloader": "usbasploader",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 },
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [0, 2], "x": 3.5, "y": 0 },
+                { "label": "F4", "matrix": [1, 2], "x": 4.5, "y": 0 },
+                { "label": "F5", "matrix": [0, 3], "x": 5.75, "y": 0 },
+                { "label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0 },
+                { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 0 },
+                { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 0 },
+                { "label": "F9", "matrix": [0, 4], "x": 11.5, "y": 0 },
+                { "label": "F10", "matrix": [0, 5], "x": 12.5, "y": 0 },
+                { "label": "F11", "matrix": [0, 6], "x": 13.75, "y": 0 },
+                { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 },
+                { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 },
+                { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 },
+                { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 },
+                { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 },
+                { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 },
+                { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 },
+
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [2, 1], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [10, 1], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [2, 2], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [10, 2], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [2, 3], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 1.25 },
+                { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 1.25 },
+                { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 1.25 },
+                { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 1.25 },
+                { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 },
+                { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 },
+                { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 },
+                { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 },
+                { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 },
+                { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 },
+                { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 },
+
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 2.25 },
+                { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 2.25 },
+                { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 2.25 },
+                { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 2.25 },
+                { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 2.25 },
+                { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 },
+                { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 },
+                { "label": "|", "matrix": [7, 7], "w": 1.5, "x": 15.75, "y": 2.25 },
+                { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 },
+                { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 },
+                { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 },
+
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [6, 3], "x": 9, "y": 3.25 },
+                { "label": "J", "matrix": [3, 4], "x": 10, "y": 3.25 },
+                { "label": "K", "matrix": [8, 4], "x": 11, "y": 3.25 },
+                { "label": "L", "matrix": [3, 5], "x": 12, "y": 3.25 },
+                { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 },
+                { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 },
+                { "label": "#", "matrix": [6, 6], "x": 15, "y": 3.25 },
+                { "label": "Enter", "matrix": [7, 6], "w": 2.25, "x": 15, "y": 3.25 },
+                { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 },
+                { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 },
+                { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 },
+                { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 },
+
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
+                { "label": "~", "matrix": [7, 0], "x": 1.25, "y": 4.25 },
+                { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 4.25 },
+                { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 4.25 },
+                { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 4.25 },
+                { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 4.25 },
+                { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 4.25 },
+                { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 },
+                { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 },
+                { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 },
+                { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 },
+                { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 },
+                { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 },
+
+                { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
+                { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 5.25 },
+                { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 5.25 },
+                { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 5.25 },
+                { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 },
+                { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 },
+                { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 },
+                { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 },
+                { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 },
+                { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 }
+            ]
+        },
+        "LAYOUT_1800_alice_ansi": {
+            "layout": [
+                { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 },
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [0, 2], "x": 3.5, "y": 0 },
+                { "label": "F4", "matrix": [1, 2], "x": 4.5, "y": 0 },
+                { "label": "F5", "matrix": [0, 3], "x": 5.75, "y": 0 },
+                { "label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0 },
+                { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 0 },
+                { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 0 },
+                { "label": "F9", "matrix": [0, 4], "x": 11.5, "y": 0 },
+                { "label": "F10", "matrix": [0, 5], "x": 12.5, "y": 0 },
+                { "label": "F11", "matrix": [0, 6], "x": 13.75, "y": 0 },
+                { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 },
+                { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 },
+                { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 },
+                { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 },
+                { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 },
+                { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 },
+                { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 },
+
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [2, 1], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [10, 1], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [2, 2], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [10, 2], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [2, 3], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 1.25 },
+                { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 1.25 },
+                { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 1.25 },
+                { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 1.25 },
+                { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 },
+                { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 },
+                { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 },
+                { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 },
+                { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 },
+                { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 },
+                { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 },
+
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 2.25 },
+                { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 2.25 },
+                { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 2.25 },
+                { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 2.25 },
+                { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 2.25 },
+                { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 },
+                { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 },
+                { "label": "|", "matrix": [7, 7], "w": 1.5, "x": 15.75, "y": 2.25 },
+                { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 },
+                { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 },
+                { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 },
+            
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [6, 3], "x": 9, "y": 3.25 },
+                { "label": "J", "matrix": [3, 4], "x": 10, "y": 3.25 },
+                { "label": "K", "matrix": [8, 4], "x": 11, "y": 3.25 },
+                { "label": "L", "matrix": [3, 5], "x": 12, "y": 3.25 },
+                { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 },
+                { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 },
+                { "label": "Enter", "matrix": [7, 6], "w": 2.25, "x": 15, "y": 3.25 },
+                { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 },
+                { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 },
+                { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 },
+                { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 },
+                
+                { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 },
+                { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 4.25 },
+                { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 4.25 },
+                { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 4.25 },
+                { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 4.25 },
+                { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 4.25 },
+                { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 },
+                { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 },
+                { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 },
+                { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 },
+                { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 },
+                { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 },
+                
+                { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
+                { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 5.25 },
+                { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 5.25 },
+                { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 5.25 },
+                { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 },
+                { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 },
+                { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 },
+                { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 },
+                { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 },
+                { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 }
+            ]
+        },
+        "LAYOUT_1800_alice_iso": {
+            "layout": [
+                { "label": "Enc", "matrix": [0, 9], "x": 20.75, "y": 0 },
+                { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+                { "label": "F2", "matrix": [1, 1], "x": 2.25, "y": 0 },
+                { "label": "F3", "matrix": [0, 2], "x": 3.5, "y": 0 },
+                { "label": "F4", "matrix": [1, 2], "x": 4.5, "y": 0 },
+                { "label": "F5", "matrix": [0, 3], "x": 5.75, "y": 0 },
+                { "label": "F6", "matrix": [1, 3], "x": 6.75, "y": 0 },
+                { "label": "F7", "matrix": [9, 3], "x": 9.25, "y": 0 },
+                { "label": "F8", "matrix": [10, 3], "x": 10.25, "y": 0 },
+                { "label": "F9", "matrix": [0, 4], "x": 11.5, "y": 0 },
+                { "label": "F10", "matrix": [0, 5], "x": 12.5, "y": 0 },
+                { "label": "F11", "matrix": [0, 6], "x": 13.75, "y": 0 },
+                { "label": "F12", "matrix": [1, 6], "x": 14.75, "y": 0 },
+                { "label": "M1", "matrix": [10, 6], "x": 16, "y": 0 },
+                { "label": "M2", "matrix": [0, 7], "x": 17, "y": 0 },
+                { "label": "Num Lock", "matrix": [1, 7], "x": 17.75, "y": 1.25 },
+                { "label": "/", "matrix": [0, 8], "x": 18.75, "y": 1.25 },
+                { "label": "*", "matrix": [10, 8], "x": 19.75, "y": 1.25 },
+                { "label": "-", "matrix": [1, 9], "x": 20.75, "y": 1.25 },
+
+                { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "label": "!", "matrix": [10, 0], "x": 1, "y": 1.25 },
+                { "label": "@", "matrix": [2, 1], "x": 2, "y": 1.25 },
+                { "label": "#", "matrix": [10, 1], "x": 3, "y": 1.25 },
+                { "label": "$", "matrix": [2, 2], "x": 4, "y": 1.25 },
+                { "label": "%", "matrix": [10, 2], "x": 5, "y": 1.25 },
+                { "label": "^", "matrix": [2, 3], "x": 6, "y": 1.25 },
+                { "label": "&", "matrix": [8, 3], "x": 9.25, "y": 1.25 },
+                { "label": "*", "matrix": [1, 4], "x": 10.25, "y": 1.25 },
+                { "label": "(", "matrix": [10, 4], "x": 11.25, "y": 1.25 },
+                { "label": ")", "matrix": [1, 5], "x": 12.25, "y": 1.25 },
+                { "label": "_", "matrix": [10, 5], "x": 13.25, "y": 1.25 },
+                { "label": "+", "matrix": [2, 6], "x": 14.25, "y": 1.25 },
+                { "label": "Backspace", "matrix": [9, 6], "w": 2, "x": 15.25, "y": 1.25 },
+                { "label": "7", "matrix": [2, 7], "x": 17.75, "y": 2.25 },
+                { "label": "8", "matrix": [1, 8], "x": 18.75, "y": 2.25 },
+                { "label": "9", "matrix": [9, 8], "x": 19.75, "y": 2.25 },
+                { "h": 2, "label": "+", "matrix": [8, 8], "x": 20.75, "y": 2.25 },
+                
+                { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
+                { "label": "Q", "matrix": [9, 0], "x": 1.5, "y": 2.25 },
+                { "label": "W", "matrix": [3, 1], "x": 2.5, "y": 2.25 },
+                { "label": "E", "matrix": [9, 1], "x": 3.5, "y": 2.25 },
+                { "label": "R", "matrix": [3, 2], "x": 4.5, "y": 2.25 },
+                { "label": "T", "matrix": [9, 2], "x": 5.5, "y": 2.25 },
+                { "label": "Y", "matrix": [7, 3], "x": 8.75, "y": 2.25 },
+                { "label": "U", "matrix": [2, 4], "x": 9.75, "y": 2.25 },
+                { "label": "I", "matrix": [9, 4], "x": 10.75, "y": 2.25 },
+                { "label": "O", "matrix": [2, 5], "x": 11.75, "y": 2.25 },
+                { "label": "P", "matrix": [9, 5], "x": 12.75, "y": 2.25 },
+                { "label": "{", "matrix": [3, 6], "x": 13.75, "y": 2.25 },
+                { "label": "}", "matrix": [8, 6], "x": 14.75, "y": 2.25 },
+                { "label": "4", "matrix": [3, 7], "x": 17.75, "y": 3.25 },
+                { "label": "5", "matrix": [2, 8], "x": 18.75, "y": 3.25 },
+                { "label": "6", "matrix": [7, 8], "x": 19.75, "y": 3.25 },
+
+                { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
+                { "label": "A", "matrix": [8, 0], "x": 1.75, "y": 3.25 },
+                { "label": "S", "matrix": [4, 1], "x": 2.75, "y": 3.25 },
+                { "label": "D", "matrix": [8, 1], "x": 3.75, "y": 3.25 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25 },
+                { "label": "G", "matrix": [8, 2], "x": 5.75, "y": 3.25 },
+                { "label": "H", "matrix": [6, 3], "x": 9, "y": 3.25 },
+                { "label": "J", "matrix": [3, 4], "x": 10, "y": 3.25 },
+                { "label": "K", "matrix": [8, 4], "x": 11, "y": 3.25 },
+                { "label": "L", "matrix": [3, 5], "x": 12, "y": 3.25 },
+                { "label": ":", "matrix": [8, 5], "x": 13, "y": 3.25 },
+                { "label": "\\", "matrix": [4, 6], "x": 14, "y": 3.25 },
+                { "label": "#", "matrix": [6, 6], "x": 15, "y": 3.25 },
+                { "h": 2, "label": "Enter", "matrix": [7, 6], "w": 1.25, "x": 16, "y": 2.25 },
+                { "label": "1", "matrix": [4, 7], "x": 17.75, "y": 4.25 },
+                { "label": "2", "matrix": [3, 8], "x": 18.75, "y": 4.25 },
+                { "label": "3", "matrix": [6, 8], "x": 19.75, "y": 4.25 },
+                { "h": 2, "label": "Enter", "matrix": [5, 8], "x": 20.75, "y": 4.25 },
+
+                { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
+                { "label": "~", "matrix": [7, 0], "x": 1.25, "y": 4.25 },
+                { "label": "Z", "matrix": [5, 1], "x": 2.25, "y": 4.25 },
+                { "label": "X", "matrix": [7, 1], "x": 3.25, "y": 4.25 },
+                { "label": "C", "matrix": [5, 2], "x": 4.25, "y": 4.25 },
+                { "label": "V", "matrix": [7, 2], "x": 5.25, "y": 4.25 },
+                { "label": "B", "matrix": [3, 3], "x": 6.25, "y": 4.25 },
+                { "label": "B", "matrix": [5, 3], "x": 8.5, "y": 4.25 },
+                { "label": "N", "matrix": [4, 4], "x": 9.5, "y": 4.25 },
+                { "label": "M", "matrix": [5, 4], "x": 10.5, "y": 4.25 },
+                { "label": "<", "matrix": [7, 4], "x": 11.5, "y": 4.25 },
+                { "label": ">", "matrix": [4, 5], "x": 12.5, "y": 4.25 },
+                { "label": "?", "matrix": [7, 5], "x": 13.5, "y": 4.25 },
+                { "label": "Shift", "matrix": [5, 6], "w": 2.75, "x": 14.5, "y": 4.25 },
+                { "label": "Up", "matrix": [5, 7], "x": 17.5, "y": 5.5 },
+                { "label": "0", "matrix": [10, 7], "x": 18.75, "y": 5.25 },
+                { "label": ".", "matrix": [4, 8], "x": 19.75, "y": 5.25 },
+
+                { "label": "LCtrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
+                { "label": "LWin", "matrix": [6, 0], "w": 1.25, "x": 1.25, "y": 5.25 },
+                { "label": "LAlt", "matrix": [6, 1], "w": 1.25, "x": 3.25, "y": 5.25 },
+                { "label": "LSpacebar", "matrix": [6, 2], "w": 2.75, "x": 4.5, "y": 5.25 },
+                { "label": "RSpacebar", "matrix": [4, 3], "w": 2.25, "x": 8.5, "y": 5.25 },
+                { "label": "RAlt", "matrix": [6, 4], "w": 1.25, "x": 10.75, "y": 5.25 },
+                { "label": "RWin", "matrix": [5, 5], "w": 1.25, "x": 14.75, "y": 5.25 },
+                { "label": "RCtrl", "matrix": [6, 5], "w": 1.25, "x": 16, "y": 5.25 },
+                { "label": "Left", "matrix": [6, 7], "x": 16.5, "y": 6.5 },
+                { "label": "Down", "matrix": [8, 7], "x": 17.5, "y": 6.5 },
+                { "label": "Right", "matrix": [9, 7], "x": 18.5, "y": 6.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/adpenrose/mine/keymaps/default/keymap.c b/keyboards/adpenrose/mine/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3d6cf31bd8
--- /dev/null
+++ b/keyboards/adpenrose/mine/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2022 Arturo Avila (@Arturo Avila)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_1800_alice_ansi(
+                                                                                                                                                                                              KC_MUTE,
+        KC_ESC,    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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_GRV,    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_P7,  KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,  KC_P5,   KC_P6,
+        KC_CAPS,   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_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   KC_Z,    KC_X,     KC_C,     KC_V,    KC_B,                 KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,          KC_P0,   KC_PDOT, 
+        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT  
+    ),
+
+    [1] = LAYOUT_1800_alice_ansi(
+                                                                                                                                                                                                                             KC_TRNS,
+        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, 
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,             KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,  KC_TRNS, 
+        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS 
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/adpenrose/mine/keymaps/default/rules.mk b/keyboards/adpenrose/mine/keymaps/default/rules.mk
new file mode 100644
index 0000000000..4769500eb0
--- /dev/null
+++ b/keyboards/adpenrose/mine/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes	# Encoder mapping functionality
\ No newline at end of file
diff --git a/keyboards/adpenrose/mine/keymaps/iso/keymap.c b/keyboards/adpenrose/mine/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..988330c979
--- /dev/null
+++ b/keyboards/adpenrose/mine/keymaps/iso/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2022 Arturo Avila (@Arturo Avila)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_1800_alice_iso(
+                                                                                                                                                                                              KC_MUTE,
+        KC_ESC,    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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_GRV,    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_P7,  KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,  KC_P5,   KC_P6,
+        KC_CAPS,   KC_A,    KC_S,     KC_D,     KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,           KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   MO(1), KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,         KC_P0,   KC_PDOT, 
+        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT  
+    ),
+
+    [1] = LAYOUT_1800_alice_iso(
+                                                                                                                                                                                                                             KC_TRNS,
+        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_PSCR,  KC_DEL,               KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, 
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,  KC_TRNS, 
+        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS 
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/adpenrose/mine/keymaps/iso/rules.mk b/keyboards/adpenrose/mine/keymaps/iso/rules.mk
new file mode 100644
index 0000000000..4769500eb0
--- /dev/null
+++ b/keyboards/adpenrose/mine/keymaps/iso/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes	# Encoder mapping functionality
\ No newline at end of file
diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c
new file mode 100644
index 0000000000..cd9e1768eb
--- /dev/null
+++ b/keyboards/adpenrose/mine/keymaps/solenoid/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2022 Arturo Avila (@Arturo Avila)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                                                                                                                                                                                              HF_TOGG,
+        KC_ESC,    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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_GRV,    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_P7,  KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,  KC_P5,   KC_P6,
+        KC_CAPS,   KC_A,    KC_S,     KC_D,     KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,           KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   MO(1), KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,         KC_P0,   KC_PDOT, 
+        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT  
+    ),
+
+    [1] = LAYOUT_all(
+                                                                                                                                                                                                                             KC_TRNS,
+        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_PSCR,  KC_DEL,               KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, 
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,   KC_TRNS, 
+        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS 
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] =  { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+#ifdef HAPTIC_ENABLE
+bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_VOLU ... KC_VOLD:
+            return false;
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk
new file mode 100644
index 0000000000..2a1e874d82
--- /dev/null
+++ b/keyboards/adpenrose/mine/keymaps/solenoid/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER += SOLENOID
+ENCODER_MAP_ENABLE = yes	# Encoder mapping functionality
\ No newline at end of file
diff --git a/keyboards/adpenrose/mine/keymaps/via/keymap.c b/keyboards/adpenrose/mine/keymaps/via/keymap.c
new file mode 100644
index 0000000000..776ed893d5
--- /dev/null
+++ b/keyboards/adpenrose/mine/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2022 Arturo Avila (@Arturo Avila)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                                                                                                                                                                                              KC_MUTE,
+        KC_ESC,    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_HOME,   KC_END,         KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 
+        KC_GRV,    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_P7,  KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,  KC_P5,   KC_P6,
+        KC_CAPS,   KC_A,    KC_S,     KC_D,     KC_F,    KC_G,                 KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS, KC_ENT,           KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_LSFT,   KC_BSLS, KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,         KC_P0,   KC_PDOT, 
+        KC_LCTL,   KC_LGUI,                     KC_LALT, KC_SPC,               KC_SPC,  KC_RALT, KC_RGUI,  KC_RCTL,                                KC_LEFT, KC_DOWN,  KC_RIGHT  
+    ),
+
+    [1] = LAYOUT_all(
+                                                                                                                                                                                                                             KC_TRNS,
+        QK_BOOT,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_PSCR,  KC_DEL,               KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, 
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,                        KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,              KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,   KC_TRNS,       KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,             KC_TRNS,             KC_TRNS,  KC_TRNS, 
+        KC_TRNS,   KC_TRNS,                           KC_TRNS,   KC_TRNS,                  KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,                                    KC_TRNS, KC_TRNS,  KC_TRNS 
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODER