QMK Configurator Support for KMAC (#2852)

* Added KMAC Config

* Removed .vscode

5 files changed, 329 insertions, 135 deletions

diff --git a/keyboards/kmac/info.json b/keyboards/kmac/info.json
new file mode 100644
index 000000000..f86cfdde5
--- /dev/null
+++ b/keyboards/kmac/info.json
@@ -0,0 +1,192 @@
+{
+  "keyboard_name": "kmac",
+  "url": "",
+  "maintainer": "qmk",
+  "bootloader": "",
+  "width": 18.25,
+  "height": 6.5,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 2, "y": 0 },
+        { "label": "F2", "x": 3, "y": 0 },
+        { "label": "F3", "x": 4, "y": 0 },
+        { "label": "F4", "x": 5, "y": 0 },
+        { "label": "F5", "x": 6.5, "y": 0 },
+        { "label": "F6", "x": 7.5, "y": 0 },
+        { "label": "F7", "x": 8.5, "y": 0 },
+        { "label": "F8", "x": 9.5, "y": 0 },
+        { "label": "F9", "x": 11, "y": 0 },
+        { "label": "F10", "x": 12, "y": 0 },
+        { "label": "F11", "x": 13, "y": 0 },
+        { "label": "F12", "x": 14, "y": 0 },
+        { "label": "PrtSc", "x": 15.25, "y": 0 },
+        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "~", "x": 0, "y": 1.5 },
+        { "label": "!", "x": 1, "y": 1.5 },
+        { "label": "@", "x": 2, "y": 1.5 },
+        { "label": "#", "x": 3, "y": 1.5 },
+        { "label": "$", "x": 4, "y": 1.5 },
+        { "label": "%", "x": 5, "y": 1.5 },
+        { "label": "^", "x": 6, "y": 1.5 },
+        { "label": "&", "x": 7, "y": 1.5 },
+        { "label": "*", "x": 8, "y": 1.5 },
+        { "label": "(", "x": 9, "y": 1.5 },
+        { "label": ")", "x": 10, "y": 1.5 },
+        { "label": "_", "x": 11, "y": 1.5 },
+        { "label": "+", "x": 12, "y": 1.5 },
+        { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.5 },
+        { "label": "Home", "x": 16.25, "y": 1.5 },
+        { "label": "PgUp", "x": 17.25, "y": 1.5 },
+        { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.5 },
+        { "label": "W", "x": 2.5, "y": 2.5 },
+        { "label": "E", "x": 3.5, "y": 2.5 },
+        { "label": "R", "x": 4.5, "y": 2.5 },
+        { "label": "T", "x": 5.5, "y": 2.5 },
+        { "label": "Y", "x": 6.5, "y": 2.5 },
+        { "label": "U", "x": 7.5, "y": 2.5 },
+        { "label": "I", "x": 8.5, "y": 2.5 },
+        { "label": "O", "x": 9.5, "y": 2.5 },
+        { "label": "P", "x": 10.5, "y": 2.5 },
+        { "label": "{", "x": 11.5, "y": 2.5 },
+        { "label": "}", "x": 12.5, "y": 2.5 },
+        { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.5 },
+        { "label": "End", "x": 16.25, "y": 2.5 },
+        { "label": "PgDn", "x": 17.25, "y": 2.5 },
+        { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.5 },
+        { "label": "S", "x": 2.75, "y": 3.5 },
+        { "label": "D", "x": 3.75, "y": 3.5 },
+        { "label": "F", "x": 4.75, "y": 3.5 },
+        { "label": "G", "x": 5.75, "y": 3.5 },
+        { "label": "H", "x": 6.75, "y": 3.5 },
+        { "label": "J", "x": 7.75, "y": 3.5 },
+        { "label": "K", "x": 8.75, "y": 3.5 },
+        { "label": "L", "x": 9.75, "y": 3.5 },
+        { "label": ":", "x": 10.75, "y": 3.5 },
+        { "label": "\"", "x": 11.75, "y": 3.5 },
+        { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
+        { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.5 },
+        { "label": "X", "x": 3.25, "y": 4.5 },
+        { "label": "C", "x": 4.25, "y": 4.5 },
+        { "label": "V", "x": 5.25, "y": 4.5 },
+        { "label": "B", "x": 6.25, "y": 4.5 },
+        { "label": "N", "x": 7.25, "y": 4.5 },
+        { "label": "M", "x": 8.25, "y": 4.5 },
+        { "label": "<", "x": 9.25, "y": 4.5 },
+        { "label": ">", "x": 10.25, "y": 4.5 },
+        { "label": "?", "x": 11.25, "y": 4.5 },
+        { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.5 },
+        { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
+        { "label": "Win", "x": 1.25, "y": 5.5, "w": 1.25 },
+        { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
+        { "x": 3.75, "y": 5.5, "w": 6.25 },
+        { "label": "Alt", "x": 10, "y": 5.5, "w": 1.25 },
+        { "label": "Win", "x": 11.25, "y": 5.5, "w": 1.25 },
+        { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
+        { "label": "Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
+        { "label": "\u2190", "x": 15.25, "y": 5.5 },
+        { "label": "\u2193", "x": 16.25, "y": 5.5 },
+        { "label": "\u2192", "x": 17.25, "y": 5.5 }
+      ]
+    },
+
+    "LAYOUT_WKL": {
+      "layout": [
+        { "label": "Esc", "x": 0, "y": 0 },
+        { "label": "F1", "x": 2, "y": 0 },
+        { "label": "F2", "x": 3, "y": 0 },
+        { "label": "F3", "x": 4, "y": 0 },
+        { "label": "F4", "x": 5, "y": 0 },
+        { "label": "F5", "x": 6.5, "y": 0 },
+        { "label": "F6", "x": 7.5, "y": 0 },
+        { "label": "F7", "x": 8.5, "y": 0 },
+        { "label": "F8", "x": 9.5, "y": 0 },
+        { "label": "F9", "x": 11, "y": 0 },
+        { "label": "F10", "x": 12, "y": 0 },
+        { "label": "F11", "x": 13, "y": 0 },
+        { "label": "F12", "x": 14, "y": 0 },
+        { "label": "PrtSc", "x": 15.25, "y": 0 },
+        { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+        { "label": "Pause", "x": 17.25, "y": 0 },
+        { "label": "~", "x": 0, "y": 1.5 },
+        { "label": "!", "x": 1, "y": 1.5 },
+        { "label": "@", "x": 2, "y": 1.5 },
+        { "label": "#", "x": 3, "y": 1.5 },
+        { "label": "$", "x": 4, "y": 1.5 },
+        { "label": "%", "x": 5, "y": 1.5 },
+        { "label": "^", "x": 6, "y": 1.5 },
+        { "label": "&", "x": 7, "y": 1.5 },
+        { "label": "*", "x": 8, "y": 1.5 },
+        { "label": "(", "x": 9, "y": 1.5 },
+        { "label": ")", "x": 10, "y": 1.5 },
+        { "label": "_", "x": 11, "y": 1.5 },
+        { "label": "+", "x": 12, "y": 1.5 },
+        { "label": "Backspace", "x": 13, "y": 1.5, "w": 2 },
+        { "label": "Insert", "x": 15.25, "y": 1.5 },
+        { "label": "Home", "x": 16.25, "y": 1.5 },
+        { "label": "PgUp", "x": 17.25, "y": 1.5 },
+        { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
+        { "label": "Q", "x": 1.5, "y": 2.5 },
+        { "label": "W", "x": 2.5, "y": 2.5 },
+        { "label": "E", "x": 3.5, "y": 2.5 },
+        { "label": "R", "x": 4.5, "y": 2.5 },
+        { "label": "T", "x": 5.5, "y": 2.5 },
+        { "label": "Y", "x": 6.5, "y": 2.5 },
+        { "label": "U", "x": 7.5, "y": 2.5 },
+        { "label": "I", "x": 8.5, "y": 2.5 },
+        { "label": "O", "x": 9.5, "y": 2.5 },
+        { "label": "P", "x": 10.5, "y": 2.5 },
+        { "label": "{", "x": 11.5, "y": 2.5 },
+        { "label": "}", "x": 12.5, "y": 2.5 },
+        { "label": "|", "x": 13.5, "y": 2.5, "w": 1.5 },
+        { "label": "Delete", "x": 15.25, "y": 2.5 },
+        { "label": "End", "x": 16.25, "y": 2.5 },
+        { "label": "PgDn", "x": 17.25, "y": 2.5 },
+        { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
+        { "label": "A", "x": 1.75, "y": 3.5 },
+        { "label": "S", "x": 2.75, "y": 3.5 },
+        { "label": "D", "x": 3.75, "y": 3.5 },
+        { "label": "F", "x": 4.75, "y": 3.5 },
+        { "label": "G", "x": 5.75, "y": 3.5 },
+        { "label": "H", "x": 6.75, "y": 3.5 },
+        { "label": "J", "x": 7.75, "y": 3.5 },
+        { "label": "K", "x": 8.75, "y": 3.5 },
+        { "label": "L", "x": 9.75, "y": 3.5 },
+        { "label": ":", "x": 10.75, "y": 3.5 },
+        { "label": "\"", "x": 11.75, "y": 3.5 },
+        { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
+        { "label": "Shift", "x": 0, "y": 4.5, "w": 2.25 },
+        { "label": "Z", "x": 2.25, "y": 4.5 },
+        { "label": "X", "x": 3.25, "y": 4.5 },
+        { "label": "C", "x": 4.25, "y": 4.5 },
+        { "label": "V", "x": 5.25, "y": 4.5 },
+        { "label": "B", "x": 6.25, "y": 4.5 },
+        { "label": "N", "x": 7.25, "y": 4.5 },
+        { "label": "M", "x": 8.25, "y": 4.5 },
+        { "label": "<", "x": 9.25, "y": 4.5 },
+        { "label": ">", "x": 10.25, "y": 4.5 },
+        { "label": "?", "x": 11.25, "y": 4.5 },
+        { "label": "Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
+        { "label": "\u2191", "x": 16.25, "y": 4.5 },
+        { "label": "Ctrl", "x": 0, "y": 5.5, "w": 1.5 },
+        { "label": "Win", "x": 1.5, "y": 5.5 },
+        { "label": "Alt", "x": 2.5, "y": 5.5, "w": 1.5 },
+        { "x": 4, "y": 5.5, "w": 7 },
+        { "label": "Alt", "x": 11, "y": 5.5, "w": 1.5 },
+        { "label": "Win", "x": 12.5, "y": 5.5 },
+        { "label": "Ctrl", "x": 13.5, "y": 5.5, "w": 1.5 },
+        { "label": "\u2190", "x": 15.25, "y": 5.5 },
+        { "label": "\u2193", "x": 16.25, "y": 5.5 },
+        { "label": "\u2192", "x": 17.25, "y": 5.5 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/kmac/keymaps/default/keymap.c b/keyboards/kmac/keymaps/default/keymap.c
index f3ac93abf..8ae8627a0 100644
--- a/keyboards/kmac/keymaps/default/keymap.c
+++ b/keyboards/kmac/keymaps/default/keymap.c
@@ -13,7 +13,7 @@
  * 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 "kmac.h"
+#include QMK_KEYBOARD_H
 
 // Helpful defines
 #define _______ KC_TRNS
@@ -26,22 +26,20 @@
 #define _FL 1
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = KEYMAP(
-        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_BRK,  \
-        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_BSLS,      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_ENT,                                  \
-        KC_LSFT,          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(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT  \
-    ),
-    [_FL] = KEYMAP(
-        BL_STEP,          M(0),    M(1),    M(2),    M(3),    M(4),    M(5),    M(6),    M(7),    M(8),    M(9),    M(10),   M(11),        _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                 \
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,          \
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______  \
-    ),
+    [_BL] = 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_BRK,
+        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_BSLS, 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_ENT,
+        KC_LSFT, 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(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+    [_FL] = LAYOUT(
+        BL_STEP, M(0), M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
 const uint16_t PROGMEM fn_actions[] = {
@@ -51,47 +49,52 @@ const uint16_t PROGMEM fn_actions[] = {
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
     // MACRODOWN only works in this function
-    switch(id) {
-        case 0:
-            if (record->event.pressed) {
-                SEND_STRING("The");
-                return false;
-            }
-            break;
-        case 1:
-            if (record->event.pressed) {
-                SEND_STRING("Custom");
-                return false;
-            }
-            break;
-        case 2:
-            if (record->event.pressed) {
-                SEND_STRING("Keyboard");
-                return false;
-            }
-            break;
-        case 3:
-            if (record->event.pressed) {
-                return MACRO( D(LCTL), T(C), U(LCTL), T(RGHT), D(LCTL), T(V), U(LCTL), END );
-            }
-            break;
+    switch (id)
+    {
+    case 0:
+        if (record->event.pressed)
+        {
+            SEND_STRING("The");
+            return false;
+        }
+        break;
+    case 1:
+        if (record->event.pressed)
+        {
+            SEND_STRING("Custom");
+            return false;
+        }
+        break;
+    case 2:
+        if (record->event.pressed)
+        {
+            SEND_STRING("Keyboard");
+            return false;
+        }
+        break;
+    case 3:
+        if (record->event.pressed)
+        {
+            return MACRO(D(LCTL), T(C), U(LCTL), T(RGHT), D(LCTL), T(V), U(LCTL), END);
+        }
+        break;
     }
     return MACRO_NONE;
 };
 
-
-void matrix_init_user(void) {
-
+void matrix_init_user(void)
+{
 }
 
-void matrix_scan_user(void) {
-
+void matrix_scan_user(void)
+{
 }
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record)
+{
     return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-
+void led_set_user(uint8_t usb_led)
+{
 }
diff --git a/keyboards/kmac/keymaps/winkeyless/keymap.c b/keyboards/kmac/keymaps/winkeyless/keymap.c
index e3d66ea08..985d5a89f 100644
--- a/keyboards/kmac/keymaps/winkeyless/keymap.c
+++ b/keyboards/kmac/keymaps/winkeyless/keymap.c
@@ -13,7 +13,7 @@
  * 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 "kmac.h"
+#include QMK_KEYBOARD_H
 
 // Helpful defines
 #define _______ KC_TRNS
@@ -26,22 +26,20 @@
 #define _FL 1
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BL] = KEYMAP_WINKEYLESS(
-        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_BRK,  \
-        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_BSLS,      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_ENT,                                  \
-        KC_LSFT,          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, MO(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT  \
-    ),
-    [_FL] = KEYMAP_WINKEYLESS(
-        BL_STEP,          M(0),    M(1),    M(2),    M(3),    M(4),    M(5),    M(6),    M(7),    M(8),    M(9),    M(10),   M(11),        _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                 \
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,          \
-        _______, _______, _______,                            _______,                                     _______, _______, _______,      _______, _______, _______  \
-    ),
+    [_BL] = LAYOUT_WKL(
+        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_BRK,
+        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_BSLS, 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_ENT,
+        KC_LSFT, 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, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+    [_FL] = LAYOUT_WKL(
+        BL_STEP, M(0), M(1), M(2), M(3), M(4), M(5), M(6), M(7), M(8), M(9), M(10), M(11), _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
 const uint16_t PROGMEM fn_actions[] = {
@@ -51,47 +49,52 @@ const uint16_t PROGMEM fn_actions[] = {
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
     // MACRODOWN only works in this function
-    switch(id) {
-        case 0:
-            if (record->event.pressed) {
-                SEND_STRING("The");
-                return false;
-            }
-            break;
-        case 1:
-            if (record->event.pressed) {
-                SEND_STRING("Custom");
-                return false;
-            }
-            break;
-        case 2:
-            if (record->event.pressed) {
-                SEND_STRING("Keyboard");
-                return false;
-            }
-            break;
-        case 3:
-            if (record->event.pressed) {
-                return MACRO( D(LCTL), T(C), U(LCTL), T(RGHT), D(LCTL), T(V), U(LCTL), END );
-            }
-            break;
+    switch (id)
+    {
+    case 0:
+        if (record->event.pressed)
+        {
+            SEND_STRING("The");
+            return false;
+        }
+        break;
+    case 1:
+        if (record->event.pressed)
+        {
+            SEND_STRING("Custom");
+            return false;
+        }
+        break;
+    case 2:
+        if (record->event.pressed)
+        {
+            SEND_STRING("Keyboard");
+            return false;
+        }
+        break;
+    case 3:
+        if (record->event.pressed)
+        {
+            return MACRO(D(LCTL), T(C), U(LCTL), T(RGHT), D(LCTL), T(V), U(LCTL), END);
+        }
+        break;
     }
     return MACRO_NONE;
 };
 
-
-void matrix_init_user(void) {
-
+void matrix_init_user(void)
+{
 }
 
-void matrix_scan_user(void) {
-
+void matrix_scan_user(void)
+{
 }
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record)
+{
     return true;
 }
 
-void led_set_user(uint8_t usb_led) {
-
+void led_set_user(uint8_t usb_led)
+{
 }
diff --git a/keyboards/kmac/kmac.h b/keyboards/kmac/kmac.h
index 1d9d8e36b..44de8914a 100644
--- a/keyboards/kmac/kmac.h
+++ b/keyboards/kmac/kmac.h
@@ -19,38 +19,35 @@
 #include "quantum.h"
 
 // Keymap for the winkey version of the PCB.
-#define KEYMAP( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4F,      \
-    K50, K51, K52,                K55,                K58, K5A, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-/*        0      1      2      3      4      5      6      7      8      9      A      B      C      D      E      F      G    */  \
-/* 0 */ { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-/* 1 */ { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-/* 2 */ { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-/* 3 */ { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   KC_NO, KC_NO, KC_NO }, \
-/* 4 */ { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   KC_NO, KC_NO, K4D,   KC_NO, K4F,   KC_NO }, \
-/* 5 */ { K50,   K51,   K52,   KC_NO, KC_NO, K55,   KC_NO, KC_NO, K58,   KC_NO, K5A,   KC_NO, K5C,   K5D,   K5E,   K5F,   K5G   }  \
-}
+#define LAYOUT(                                                                                                                           \
+    K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,                                                       \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,                                                  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,                                                  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,                                                                      \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4F,                                                                      \
+    K50, K51, K52, K55, K58, K5A, K5C, K5D, K5E, K5F, K5G)                                                                                \
+    {                                                                                                                                     \
+        /*        0      1      2      3      4      5      6      7      8      9      A      B      C      D      E      F      G    */ \
+        /* 0 */ {K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G},                                  \
+            /* 1 */ {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G},                                \
+            /* 2 */ {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G},                                \
+            /* 3 */ {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, KC_NO, KC_NO},                        \
+            /* 4 */ {K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, KC_NO, KC_NO, K4D, KC_NO, K4F, KC_NO},                        \
+        /* 5 */ { K50, K51, K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, K58, KC_NO, K5A, KC_NO, K5C, K5D, K5E, K5F, K5G }                       \
+    }
 
 // Keymap for the winkeyless version of the PCB.
-#define KEYMAP_WINKEYLESS( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4D,           K4F,      \
-    K50, K51, K52,                K55,                     K58, K5A, K5D,      K5E, K5F, K5G  \
-) KEYMAP( \
-    K00,          K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,      K0E,   K0F,   K0G, \
-    K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,      K1E,   K1F,   K1G, \
-    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,      K2E,   K2F,   K2G, \
-    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,          K3D,                         \
-    K40,          K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,          K4D,             K4F,        \
-    K50,   K51,   K52,                        K55,                        K58,   K5A,   KC_NO, K5D,      K5E,   K5F,   K5G  \
-)
+#define LAYOUT_WKL(                                                                                                                               \
+    K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,                                                               \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,                                                          \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,                                                          \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,                                                                              \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4F,                                                                              \
+    K50, K51, K52, K55, K58, K5A, K5D, K5E, K5F, K5G) LAYOUT(K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,      \
+                                                             K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+                                                             K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+                                                             K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,                     \
+                                                             K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4F,                     \
+                                                             K50, K51, K52, K55, K58, K5A, KC_NO, K5D, K5E, K5F, K5G)
 
 #endif
diff --git a/keyboards/kmac/readme.md b/keyboards/kmac/readme.md
index fccf902ca..ec36c0a5c 100644
--- a/keyboards/kmac/readme.md
+++ b/keyboards/kmac/readme.md
@@ -1,5 +1,4 @@
-KMAC keyboard firmware
-======================
+# KMAC keyboard firmware
 
 A Korean custom keyboard designed by Byungho Kim and the KBDMania community.
 
@@ -37,9 +36,9 @@ To define your own keymap, copy one of the [existing keymap](keymaps) folders an
 
 To make it easy to define keymaps for the different versions of the PCB two macros are provided.
 
-| PCB            | Macro                 |
-| -------------- | --------------------- |
-| Winkey PCB     | `KEYMAP()`            |
-| Winkeyless PCB | `KEYMAP_WINKEYLESS()` |
+| PCB            | Macro          |
+| -------------- | -------------- |
+| Winkey PCB     | `LAYOUT()`     |
+| Winkeyless PCB | `LAYOUT_WKL()` |
 
 To build the firmware with a custom keymap, run `make <keymap name>`