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

Fixes merge conflicts in:

- keyboards/poker87c/rules.mk and keyboards/poker87d/rules.mk
  - Conflicts from PR 13961
- keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c
  - Conflict from PR 13947

6 files changed, 185 insertions, 62 deletions

diff --git a/keyboards/poker87d/config.h b/keyboards/poker87d/config.h
index eeac6bc4d2..7cf87340e4 100644
--- a/keyboards/poker87d/config.h
+++ b/keyboards/poker87d/config.h
@@ -19,11 +19,11 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define VENDOR_ID       0x6D66 // "mf" - mfkiiyd
+#define PRODUCT_ID      0x087D // "87D"
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Hotswap
-#define PRODUCT         POKER-87
+#define MANUFACTURER    mfkiiyd
+#define PRODUCT         POKER-87D Hotswap
 
 /* key matrix size */
 #define MATRIX_ROWS 6
diff --git a/keyboards/poker87d/info.json b/keyboards/poker87d/info.json
index 5a5eda4324..50c1a7560f 100644
--- a/keyboards/poker87d/info.json
+++ b/keyboards/poker87d/info.json
@@ -1,11 +1,14 @@
 {
-    "keyboard_name": "POKER-87",
+    "keyboard_name": "POKER-87D",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "mfkiiyd",
     "width": 18.25,
     "height": 6.5,
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 {"label":"K00 (E6,D1)", "x":0, "y":0},
                 {"label":"K01 (E6,D0)", "x":2, "y":0},
@@ -23,6 +26,7 @@
                 {"label":"K0D (E6,B4)", "x":15.25, "y":0},
                 {"label":"K0E (E6,B0)", "x":16.25, "y":0},
                 {"label":"K3D (F0,B4)", "x":17.25, "y":0},
+
                 {"label":"K10 (B7,D1)", "x":0, "y":1.5},
                 {"label":"K11 (B7,D0)", "x":1, "y":1.5},
                 {"label":"K12 (B7,F7)", "x":2, "y":1.5},
@@ -41,6 +45,7 @@
                 {"label":"K5B (D7,F4)", "x":15.25, "y":1.5},
                 {"label":"K5C (D7,F1)", "x":16.25, "y":1.5},
                 {"label":"K3E (F0,B0)", "x":17.25, "y":1.5},
+
                 {"label":"K20 (D4,D1)", "x":0, "y":2.5, "w":1.5},
                 {"label":"K21 (D4,D0)", "x":1.5, "y":2.5},
                 {"label":"K22 (D4,F7)", "x":2.5, "y":2.5},
@@ -54,10 +59,10 @@
                 {"label":"K2A (D4,B5)", "x":10.5, "y":2.5},
                 {"label":"K2B (D4,F4)", "x":11.5, "y":2.5},
                 {"label":"K2C (D4,F1)", "x":12.5, "y":2.5, "w":1.25},
-                {"label":"K3C (F0,F1)", "x":13.75, "y":2.5, "w":1.25, "h":2},
                 {"label":"K2E (D4,B0)", "x":15.25, "y":2.5},
                 {"label":"K5D (D7,B4)", "x":16.25, "y":2.5},
                 {"label":"K5E (D7,B0)", "x":17.25, "y":2.5},
+
                 {"label":"K30 (F0,D1)", "x":0, "y":3.5, "w":1.75},
                 {"label":"K31 (F0,D0)", "x":1.75, "y":3.5},
                 {"label":"K32 (F0,F7)", "x":2.75, "y":3.5},
@@ -71,6 +76,8 @@
                 {"label":"K3A (F0,B5)", "x":10.75, "y":3.5},
                 {"label":"K3B (F0,F4)", "x":11.75, "y":3.5},
                 {"label":"K2D (D4,B4)", "x":12.75, "y":3.5},
+                {"label":"K3C (F0,F1)", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
                 {"label":"K40 (D6,D1)", "x":0, "y":4.5, "w":1.25},
                 {"label":"K41 (D6,D0)", "x":1.25, "y":4.5},
                 {"label":"K42 (D6,F7)", "x":2.25, "y":4.5},
@@ -86,6 +93,7 @@
                 {"label":"K4C (D6,F1)", "x":12.25, "y":4.5, "w":1.75},
                 {"label":"K4D (D6,B4)", "x":14, "y":4.5},
                 {"label":"K4E (D6,B0)", "x":16.25, "y":4.5},
+
                 {"label":"K50 (D7,D1)", "x":0, "y":5.5, "w":1.25},
                 {"label":"K51 (D7,D0)", "x":1.25, "y":5.5, "w":1.25},
                 {"label":"K52 (D7,F7)", "x":2.5, "y":5.5, "w":1.25},
@@ -98,6 +106,103 @@
                 {"label":"K59 (D7,C6)", "x":16.25, "y":5.5},
                 {"label":"K5A (D7,B5)", "x":17.25, "y":5.5}
             ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5},
+                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 4.5, "w": 1.25},
+                {"x": 1.25, "y": 4.5},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.25},
+                {"x": 1.25, "y": 5.5, "w": 1.25},
+                {"x": 2.5, "y": 5.5, "w": 1.25},
+                {"x": 3.75, "y": 5.5, "w": 6.25},
+                {"x": 10, "y": 5.5, "w": 1.25},
+                {"x": 11.25, "y": 5.5, "w": 1.25},
+                {"x": 12.5, "y": 5.5, "w": 1.25},
+                {"x": 13.75, "y": 5.5, "w": 1.25},
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/poker87d/keymaps/default/keymap.c b/keyboards/poker87d/keymaps/default/keymap.c
index ab0318573a..8adc58ae11 100644
--- a/keyboards/poker87d/keymaps/default/keymap.c
+++ b/keyboards/poker87d/keymaps/default/keymap.c
@@ -17,21 +17,23 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        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_PSCR, KC_SLCK, KC_PAUS,
-        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_INS,  KC_HOME, KC_PGUP,
-        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_ENT,       KC_DEL,  KC_END,  KC_PGDN,
-        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_LSFT,   KC_NUBS, 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_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   KC_RGUI,   MO(1),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+
+    [0] = LAYOUT_all(
+        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_PSCR, KC_SLCK, KC_PAUS,
+        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_INS,  KC_HOME, KC_PGUP,
+        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_DEL,  KC_END,  KC_PGDN,
+        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_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-        _______,          KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,   _______,      _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-        _______,   _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,        _______,            KC_VOLU,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      KC_MPRV, KC_VOLD, KC_MNXT
+
+    [1] = LAYOUT_all(
+        _______,          KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
 
 };
diff --git a/keyboards/poker87d/keymaps/via/keymap.c b/keyboards/poker87d/keymaps/via/keymap.c
index a75465d228..b2eff1ce33 100644
--- a/keyboards/poker87d/keymaps/via/keymap.c
+++ b/keyboards/poker87d/keymaps/via/keymap.c
@@ -18,39 +18,41 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT(
-        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_PSCR, KC_SLCK, KC_PAUS,
-        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_INS,  KC_HOME, KC_PGUP,
-        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_ENT,       KC_DEL,  KC_END,  KC_PGDN,
-        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_LSFT,   KC_NUBS, 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_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   KC_RGUI,   MO(1),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_all(
+        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_PSCR, KC_SLCK, KC_PAUS,
+        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_INS,  KC_HOME, KC_PGUP,
+        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_DEL,  KC_END,  KC_PGDN,
+        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_LSFT, KC_NUBS, 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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
-        _______,          KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,   _______,      _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-        _______,   _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______,        _______,            KC_VOLU,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      KC_MPRV, KC_VOLD, KC_MNXT
+
+    [1] = LAYOUT_all(
+        _______,          KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______,                      KC_VOLU,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             KC_MPRV, KC_VOLD, KC_MNXT
     ),
-	
-    [2] = LAYOUT(
-        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,      _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______, _______, _______,        _______,            _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+
+    [2] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
-	
-    [3] = LAYOUT(
-        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,      _______, _______, _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______,   _______, _______, _______, _______,  _______, _______,  _______, _______, _______, _______, _______, _______,        _______,            _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+
+    [3] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
+
 };
 
diff --git a/keyboards/poker87d/poker87d.h b/keyboards/poker87d/poker87d.h
index f414e4bb50..8ea11b0127 100644
--- a/keyboards/poker87d/poker87d.h
+++ b/keyboards/poker87d/poker87d.h
@@ -18,11 +18,13 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define XXX KC_NO
+
+#define LAYOUT_all( \
     K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0D, K0E, K3D,  \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,  K5B, K5C, K3E,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,  K3C,    K2E, K5D, K5E,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D,                         \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K2E, K5D, K5E,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D,   K3C,                  \
     K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,     K4D,       K4E,       \
     K50,  K51,  K52,              K53,                K54,  K55,  K56,  K57,    K58, K59, K5A   \
 ) { \
@@ -34,3 +36,18 @@
     { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
 }
 
+#define LAYOUT_tkl_iso( \
+    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0D, K0E, K3D,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E,  K5B, K5C, K3E,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,          K2E, K5D, K5E,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K2D,   K3C,                  \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,          K4C,       K4E,       \
+    K50,  K51,  K52,              K53,                K54,  K55,  K56,  K57,    K58, K59, K5A   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \
+}
diff --git a/keyboards/poker87d/rules.mk b/keyboards/poker87d/rules.mk
index e4f8259605..7041211403 100644
--- a/keyboards/poker87d/rules.mk
+++ b/keyboards/poker87d/rules.mk
@@ -8,10 +8,10 @@ BOOTLOADER = atmel-dfu
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
+MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
@@ -21,7 +21,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
-KEY_LOCK_ENABLE = no      # Enable KC_LOCK support
-
-# generated by KBFirmware JSON to QMK Parser
-# https://noroadsleft.github.io/kbf_qmk_converter/
+LAYOUTS = tkl_iso