1 files changed, 22 insertions, 19 deletions
diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
index e73b8a99ec..e8fae1dde0 100644
--- a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c
@@ -1,24 +1,27 @@
-#include "lfkpad.h"
-#include "issi.h"
-#include "lighting.h"
-#include "action_layer.h"
+#include QMK_KEYBOARD_H
+
+// readability
+#define _______ KC_TRNS
+#define XXXXXXX KC_NO
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT( /* Base */
-  KC_ESC,   KC_TAB,  KC_PEQL, MO(1), \
-  KC_LNUM,  KC_PSLS, KC_PAST, KC_PMNS, \
-  KC_P7,    KC_P8,   KC_P9,   KC_PPLS, \
-  KC_P4,    KC_P5,   KC_P6, \
-  KC_P1,    KC_P2,   KC_P3,   KC_PENT, \
-  KC_P0,    KC_PDOT),
-
-[1] = LAYOUT( /* RGB */
-  RGB_SAI,  RGB_VAI,  RGB_HUI,  KC_TRNS, \
-  RGB_SAD,  RGB_VAD,  RGB_HUD,  KC_TRNS, \
-  RGB_M_X,  RGB_M_G,  RGB_MOD,  RGB_RMOD, \
-  RGB_M_SW, RGB_M_SN, RGB_M_K, \
-  RGB_M_P,  RGB_M_B,  RGB_M_R,  RGB_TOG, \
-  KC_NO,    KC_NO),
+  [0] = LAYOUT_numpad_6x4( /* Base */
+    KC_ESC,   KC_TAB,   KC_PEQL,  MO(1),   \
+    KC_LNUM,  KC_PSLS,  KC_PAST,  KC_PMNS, \
+    KC_P7,    KC_P8,    KC_P9,             \
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS, \
+    KC_P1,    KC_P2,    KC_P3,             \
+      KC_P0,            KC_PDOT,  KC_PENT  \
+  ),
+
+  [1] = LAYOUT_numpad_6x4( /* RGB */
+    RGB_SAI,  RGB_VAI,  RGB_HUI,  _______,  \
+    RGB_SAD,  RGB_VAD,  RGB_HUD,  _______,  \
+    RGB_M_X,  RGB_M_G,  RGB_MOD,            \
+    RGB_M_SW, RGB_M_SN, RGB_M_K,  RGB_RMOD, \
+    RGB_M_P,  RGB_M_B,  RGB_M_R,            \
+      XXXXXXX,          XXXXXXX,  RGB_TOG   \
+  ),
 };