1 files changed, 15 insertions, 16 deletions

diff --git a/keyboards/clueboard/17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
index 53bbbaa9d..65c64e43c 100644
--- a/keyboards/clueboard/17/keymaps/default/keymap.c
+++ b/keyboards/clueboard/17/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
-#include "17.h"
-
-#include "backlight.h"
+#include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -8,7 +6,6 @@
 // entirely and just use numbers.
 #define _BL 0
 #define _FL 1
-#define _RS 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   /* Keymap _BL: (Base Layer) Default Layer
@@ -24,12 +21,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |        0|   .| Ent|
    * '-------------------'
    */
-[_BL] = KEYMAP(
-  LT(_FL, KC_NLCK), 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),
+  [_BL] = LAYOUT_numpad_5x4(
+    LT(_FL, KC_NLCK), 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  \
+  ),
 
   /* Keymap _FL: Function Layer
    * .-------------------.
@@ -44,10 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      Fn1|    | Fn7|
    * '-------------------'
    */
-[_FL] = KEYMAP(
-  LT(_FL, KC_NLCK), KC_TRNS, KC_TRNS, RGB_TOG, \
-  KC_TRNS,          RGB_SAI,    KC_TRNS, RGB_VAI, \
-  RGB_HUD,             BL_STEP, RGB_HUI, \
-  KC_TRNS,          RGB_SAD,    KC_TRNS, RGB_VAD, \
-  RGB_MOD,                      KC_TRNS)
+  [_FL] = LAYOUT_numpad_5x4(
+    LT(_FL, KC_NLCK), _______, _______, RGB_TOG, \
+    _______,          RGB_SAI, _______,          \
+    RGB_HUD,          BL_STEP, RGB_HUI, RGB_VAI, \
+    _______,          RGB_SAD, _______,          \
+    RGB_MOD,                   _______, RGB_VAD  \
+  )
 };