[Keyboard] Revert "Fix id67 RGB Matrix (#16916)" - on IDOBAO ID67 kb (#16917)

Co-authored-by: Drashna Jaelre <drashna@live.com>

15 files changed, 139 insertions, 273 deletions

diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h
index be6594b0c1..f94606c9e7 100644
--- a/keyboards/idobao/id67/config.h
+++ b/keyboards/idobao/id67/config.h
@@ -22,7 +22,7 @@
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x6964 /* "id" */
 #define PRODUCT_ID      0x0067
-#define DEVICE_VER      0x0001
+#define DEVICE_VER      0x0002
 #define MANUFACTURER    IDOBAO
 #define PRODUCT         ID67
 
@@ -46,37 +46,19 @@
 #define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN F0
 
-// RGB Light config
-#if defined(RGBLIGHT_ENABLE)
-    #define RGBLED_NUM 77
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-    #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//     #define RGBLIGHT_EFFECT_BREATHING
-//     #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//     #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//     #define RGBLIGHT_EFFECT_SNAKE
-//     #define RGBLIGHT_EFFECT_KNIGHT
-//     #define RGBLIGHT_EFFECT_CHRISTMAS
-//     #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//     #define RGBLIGHT_EFFECT_RGB_TEST
-//     #define RGBLIGHT_EFFECT_ALTERNATING
-#endif
-
 // RGB Matrix config
 #if defined(RGB_MATRIX_ENABLE)
-    #define DRIVER_LED_TOTAL 77
-    #define DRIVER_LED_UNDERGLOW 10
+    #ifndef ID67_DISABLE_UNDERGLOW
+        #define DRIVER_LED_TOTAL 77
+    #else
+        #define DRIVER_LED_TOTAL 67
+    #endif
 
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150    // limits maximum brightness of LEDs to x out of 255. If not defined maximum brightness is set to 255
 
     #define RGB_MATRIX_KEYPRESSES
+
     #define ENABLE_RGB_MATRIX_ALPHAS_MODS          // Static dual hue, speed is hue for secondary hue
     #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN     // Static gradient top to bottom, speed controls how much gradient changes
     #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT  // Static gradient left to right, speed controls how much gradient changes
@@ -92,7 +74,7 @@
     #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN        // Full gradient scrolling top to bottom
     #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN         // Full gradient scrolling out to in
     #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL    // Full dual gradients scrolling out to in
-    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradient Chevron shaped scrolling left to right
     #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL       // Full gradient spinning pinwheel around center of keyboard
     #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL         // Full gradient spinning spiral around center of keyboard
     #define ENABLE_RGB_MATRIX_DUAL_BEACON          // Full gradient spinning around center of keyboard
@@ -100,10 +82,18 @@
     #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS    // Full dual gradients spinning two halfs of keyboard
     #define ENABLE_RGB_MATRIX_RAINDROPS            // Randomly changes a single key's hue
     #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  // Randomly changes a single key's hue and saturation
-    #define ENABLE_RGB_MATRIX_HUE_BREATHING        // Hue shifts up a slight ammount at the same time, then shifts back
-    #define ENABLE_RGB_MATRIX_HUE_PENDULUM         // Hue shifts up a slight ammount in a wave to the right, then back to the left
-    #define ENABLE_RGB_MATRIX_HUE_WAVE             // Hue shifts up a slight ammount and then back down in a wave to the right
-#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING        // Hue shifts up a slight amount at the same time, then shifts back
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM         // Hue shifts up a slight amount in a wave to the right, then back to the left
+    #define ENABLE_RGB_MATRIX_HUE_WAVE             // Hue shifts up a slight amount and then back down in a wave to the right
+
+    // don't need `#if`, animation modes themselves check defines
+    // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+    // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+    // #endif // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+
+    // don't need `#if`, animation modes themselves check defines
+    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE// Pulses keys hit to hue & value then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE       // Static single hue, pulses keys hit to shifted hue then fades to current hue
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
@@ -116,5 +106,5 @@
     #define ENABLE_RGB_MATRIX_MULTISPLASH          // Full gradient & value pulse away from multiple key hits then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_SPLASH         // Hue & value pulse away from a single key hit then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
-#endif // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+    // #endif // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
 #endif // #if defined(RGB_MATRIX_ENABLE)
diff --git a/keyboards/idobao/id67/id67.c b/keyboards/idobao/id67/id67.c
index 8d27298625..155cc74087 100644
--- a/keyboards/idobao/id67/id67.c
+++ b/keyboards/idobao/id67/id67.c
@@ -19,7 +19,11 @@
 
 #define __ NO_LED
 
-// Indices are reveresed on the physical board, top left is bottom right.
+#if defined(RGB_MATRIX_ENABLE)
+
+/* NB!!: Indices are reversed on the physical board, top left is bottom right.
+ * These "LED Index to *" arrays are in that reversed order!
+ * i.e., Space row on top, listed right to left */
 led_config_t g_led_config = { {
     // Key Matrix to LED Index
     {66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52},
@@ -47,15 +51,46 @@ led_config_t g_led_config = { {
     1,    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9,  // third row
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,  // fourth row
     1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4   // fifth row
-    // underglow leds
+    // underglow LEDs
     #ifndef ID67_DISABLE_UNDERGLOW
     , 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
     #endif
 } };
 
-__attribute__ ((weak))
+#endif  // #ifdef RGB_MATRIX_ENABLE
+
+
+/* Use `#define ID67_CAPS_LOCK_KEY_INDEX 36` in `keymaps/yourkeymap/config.h`
+ * if you want to enable Caps-Lock LED mode */
+#if defined(RGB_MATRIX_ENABLE) && defined(ID67_CAPS_LOCK_KEY_INDEX)
+
+#define ID67_CAPS_LOCK_MAX_BRIGHTNESS 0xFF
+#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #undef ID67_CAPS_LOCK_MAX_BRIGHTNESS
+    #define ID67_CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+#define ID67_CAPS_LOCK_VAL_STEP 8
+#ifdef RGB_MATRIX_VAL_STEP
+    #undef ID67_CAPS_LOCK_VAL_STEP
+    #define ID67_CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#endif
+
+/* This function is defined as weak, so if you create your own in keymap then
+ * that will compile, not this */
+__attribute__((weak))
 void rgb_matrix_indicators_user(void) {
     if (host_keyboard_led_state().caps_lock) {
-        rgb_matrix_set_color(23, 0xFF, 0xFF, 0xFF);
+        uint8_t b = rgb_matrix_get_val();
+        if (b < ID67_CAPS_LOCK_VAL_STEP) {
+            b = ID67_CAPS_LOCK_VAL_STEP;
+        } else if (b < (ID67_CAPS_LOCK_MAX_BRIGHTNESS - ID67_CAPS_LOCK_VAL_STEP)) {
+            b += ID67_CAPS_LOCK_VAL_STEP;  // one step more than current brightness
+        } else {
+            b = ID67_CAPS_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, b, b, b);  // white, with the adjusted brightness
     }
 }
+
+#endif // #ifdef ID67_CAPS_LOCK_KEY_INDEX
diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json
index 774d913413..545cd863d8 100644
--- a/keyboards/idobao/id67/info.json
+++ b/keyboards/idobao/id67/info.json
@@ -1,7 +1,7 @@
 {
-    "keyboard_name": "ID67 RGB Matrix variant",
-    "url": "",
-    "maintainer": "qmk",
+    "keyboard_name": "ID67",
+    "url": "https://idobao.net",
+    "maintainer": "thewerther",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_65_ansi_blocker"
     },
diff --git a/keyboards/idobao/id67/keymaps/default_nug/config.h b/keyboards/idobao/id67/keymaps/default_nug/config.h
deleted file mode 100644
index d92c93ce1e..0000000000
--- a/keyboards/idobao/id67/keymaps/default_nug/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2021 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * NB!  THIS VARIANT DISABLES THE UNDERGLOW LEDs
- *      FOR BOARDS WITH A SOLID (NON-ACRILIC) BOTTOM
- */
-
-#pragma once
-
-#if defined(RGB_MATRIX_ENABLE)
-    #define ID67_DISABLE_UNDERGLOW
-#endif
diff --git a/keyboards/idobao/id67/keymaps/default_nug/keymap.c b/keyboards/idobao/id67/keymaps/default_nug/keymap.c
deleted file mode 100644
index 30e71734a3..0000000000
--- a/keyboards/idobao/id67/keymaps/default_nug/keymap.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 Tybera
- * Copyright 2022 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * NB!  THIS VARIANT DISABLES THE UNDERGLOW LEDs
- *      FOR BOARDS WITH A SOLID (NON-ACRILIC) BOTTOM
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi_blocker(
-        KC_ESC,  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_TILD,
-        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_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_PGUP,
-        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_PGDN,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi_blocker(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______,
-        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,      _______,
-        _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,             _______,
-        _______,           RESET,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______,         _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-
-};
diff --git a/keyboards/idobao/id67/keymaps/thewerther/config.h b/keyboards/idobao/id67/keymaps/thewerther/config.h
index 539e3bbb41..a63a92b171 100644
--- a/keyboards/idobao/id67/keymaps/thewerther/config.h
+++ b/keyboards/idobao/id67/keymaps/thewerther/config.h
@@ -20,9 +20,8 @@
 #define TAPPING_TERM 500
 
 #if defined(RGB_MATRIX_ENABLE)
-    #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
     #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 
     // change saturation and hue step size
     #undef RGBLIGHT_HUE_STEP
@@ -85,11 +84,11 @@
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
     #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
 
-#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE// Pulses keys hit to hue & value then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE       // Static single hue, pulses keys hit to shifted hue then fades to current hue
     #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
     #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
-#endif // # if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+    // #endif // # if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
 #endif // # if defined(RGB_MATRIX_ENABLE)
 
diff --git a/keyboards/idobao/id67/keymaps/via/config.h b/keyboards/idobao/id67/keymaps/via/config.h
deleted file mode 100644
index 336ad1e585..0000000000
--- a/keyboards/idobao/id67/keymaps/via/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2021 Tybera
- * Copyright 2022 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#if defined(RGB_MATRIX_ENABLE)
-    #define VIA_QMK_RGBLIGHT_ENABLE
-#endif
diff --git a/keyboards/idobao/id67/keymaps/via_nug/config.h b/keyboards/idobao/id67/keymaps/via_nug/config.h
deleted file mode 100644
index a2fa129b2e..0000000000
--- a/keyboards/idobao/id67/keymaps/via_nug/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 thewerther
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * NB!  THIS VARIANT DISABLES THE UNDERGLOW LEDs
- *      FOR BOARDS WITH A SOLID (NON-ACRILIC) BOTTOM
- */
-
-#pragma once
-
-#if defined(RGB_MATRIX_ENABLE)
-    #define VIA_QMK_RGBLIGHT_ENABLE
-    #define ID67_DISABLE_UNDERGLOW
-#endif
diff --git a/keyboards/idobao/id67/keymaps/via_nug/keymap.c b/keyboards/idobao/id67/keymaps/via_nug/keymap.c
deleted file mode 100644
index b008f9d125..0000000000
--- a/keyboards/idobao/id67/keymaps/via_nug/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2021 Tybera
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * NB!  THIS VARIANT DISABLES THE UNDERGLOW LEDs
- *      FOR BOARDS WITH A SOLID (NON-ACRILIC) BOTTOM
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_65_ansi_blocker(
-        KC_ESC,  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_TILD,
-        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_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_PGUP,
-        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_PGDN,
-        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
-    ),
-    [1] = LAYOUT_65_ansi_blocker(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______,
-        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,      _______,
-        _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,             _______,
-        _______,            RESET,   BL_DEC,  BL_TOGG, BL_INC,  KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______,        _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-	[2] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-	[3] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-};
diff --git a/keyboards/idobao/id67/keymaps/via_nug/rules.mk b/keyboards/idobao/id67/keymaps/via_nug/rules.mk
deleted file mode 100644
index ca9fed0e6b..0000000000
--- a/keyboards/idobao/id67/keymaps/via_nug/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-LTO_ENABLE = yes
-VIA_ENABLE = yes
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
index 88fe361bde..92b3ec0658 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/config.h
@@ -1,5 +1,5 @@
 /*
- * Idobao ID67 Keymap for a ID67 Bestype, built for Mac use
+ * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
  * Copyright (C) 2022  Vino Rodrigues
  *
  * This program is free software: you can redistribute it and/or modify
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #if defined(RGB_MATRIX_ENABLE)
     #define VIA_QMK_RGBLIGHT_ENABLE
     #define ID67_DISABLE_UNDERGLOW  // personal choice, I use a ID67 Bestype
@@ -23,9 +25,7 @@
     #ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
         #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
     #endif
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200  // // limits maximum brightness of LEDs to 200 out of 255
-
-    //// #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200  // limits maximum brightness of LEDs to x out of 255
 
     //// #define RGB_MATRIX_KEYPRESSES
 
@@ -46,7 +46,7 @@
     //// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN           // Full gradient scrolling top to bottom
     //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN            // Full gradient scrolling out to in
     //// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL       // Full dual gradients scrolling out to in
-    //// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
+    //// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradient Chevron shaped scrolling left to right
     //// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL          // Full gradient spinning pinwheel around center of keyboard
     //// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL            // Full gradient spinning spiral around center of keyboard
     //// #define ENABLE_RGB_MATRIX_DUAL_BEACON             // Full gradient spinning around center of keyboard
@@ -54,32 +54,33 @@
     //// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS       // Full dual gradients spinning two halfs of keyboard
     //// #define ENABLE_RGB_MATRIX_RAINDROPS               // Randomly changes a single key's hue
     //// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS     // Randomly changes a single key's hue and saturation
-    //// #define ENABLE_RGB_MATRIX_HUE_BREATHING           // Hue shifts up a slight ammount at the same time, then shifts back
-    //// #define ENABLE_RGB_MATRIX_HUE_PENDULUM            // Hue shifts up a slight ammount in a wave to the right, then back to the left
-    //// #define ENABLE_RGB_MATRIX_HUE_WAVE                // Hue shifts up a slight ammount and then back down in a wave to the right
+    //// #define ENABLE_RGB_MATRIX_HUE_BREATHING           // Hue shifts up a slight amount at the same time, then shifts back
+    //// #define ENABLE_RGB_MATRIX_HUE_PENDULUM            // Hue shifts up a slight amount in a wave to the right, then back to the left
+    //// #define ENABLE_RGB_MATRIX_HUE_WAVE                // Hue shifts up a slight amount and then back down in a wave to the right
 
     #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
     #undef ENABLE_RGB_MATRIX_PIXEL_FLOW
-    #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+    //// #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 
-    #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
-        //// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-        //// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-        #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-    #endif
+    // don't need `#if`, animation modes themselves check defines
+    // #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+    //// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    //// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+    // #endif
 
-    #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-        //// #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-        //// #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-        //// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
-    #endif
+    // don't need `#if`, animation modes themselves check defines
+    // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+    //// #define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+    //// #define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+    //// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+    // #endif
 #endif
diff --git a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
index 2a42295b97..c62db2c724 100644
--- a/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
+++ b/keyboards/idobao/id67/keymaps/vinorodrigues/keymap.c
@@ -1,5 +1,5 @@
 /*
- * Idobao ID67 Keymap for a ID67 Bestype, built for Mac use
+ * IDOBAO ID67 Keymap for a ID67 Bestype, built for Mac use
  * Copyright (C) 2022  Vino Rodrigues
  *
  * This program is free software: you can redistribute it and/or modify
@@ -20,10 +20,10 @@
 #include "version.h"
 
 enum {
-    LAYER_0 = 0,
-    LAYER_1,
-    LAYER_2,
-    LAYER_3
+    _BASE = 0,
+    _FN1,
+    _FN2,
+    _FN3
 };
 
 enum {
@@ -37,32 +37,32 @@ enum macos_consumer_usages {
     _AC_SHOW_ALL_APPS    = 0x2A0   // mapped to KC_LPAD
 };
 
-#define LT1_C_L LT(LAYER_1, KC_CAPS)
+#define LT1_C_L LT(_FN1, KC_CAPS)
 
 #ifndef MIN
     #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [LAYER_0] = LAYOUT_65_ansi_blocker(
+    [_BASE] = LAYOUT_65_ansi_blocker(
         KC_GESC,  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_GRAVE, \
         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_BSLASH, KC_DELETE, \
         LT1_C_L,  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_PGUP, \
         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_PGDN, \
         KC_LCTL,  KC_LALT,           KC_LGUI,                    KC_SPC,                             FN_MO13, FN_MO23,   KC_LEFT, KC_DOWN,   KC_RIGHT),
-    [LAYER_1] = LAYOUT_65_ansi_blocker(
+    [_FN1] = LAYOUT_65_ansi_blocker(
         KC_GRAVE, 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_ERAS,   KC_F13, \
         _______,  XXXXXXX,  KC_UP,   XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_HOME,   KC_END,  KC_EJCT,   KC_INS, \
         KC_CAPS,  KC_LEFT,  KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_PGDN,            KC_PENT,   KC_HOME, \
         KC_RSFT,            XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS,  KC_DELETE, KC_LSFT, _______,   KC_END, \
         KC_RCTL,  KC_RALT,           KC_RGUI,                    _______,                            _______, _______,   _______, _______,   _______),
-    [LAYER_2] = LAYOUT_65_ansi_blocker(
+    [_FN2] = LAYOUT_65_ansi_blocker(
         KC_ESC,   KC_BRID,  KC_BRIU, KC_MCON,  KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,   KC_VOLU, KC_OUT,    KC_F14, \
         RGB_TOG,  RGB_MOD,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX,   KC_PSCR, \
         XXXXXXX,  RGB_RMOD, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, RGB_SAI,            XXXXXXX,   KC_SLCK, \
         XXXXXXX,            XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUD, RGB_SAD,   XXXXXXX, RGB_VAI,   KC_PAUS, \
         XXXXXXX,  XXXXXXX,           XXXXXXX,                    XXXXXXX,                            XXXXXXX, XXXXXXX,   RGB_SPD, RGB_VAD,   RGB_SPI),
-    [LAYER_3] = LAYOUT_65_ansi_blocker(
+    [_FN3] = LAYOUT_65_ansi_blocker(
         RESET,    MACRO01,  MACRO02, MACRO03, MACRO04, MACRO05, MACRO06, MACRO07, MACRO08, MACRO09, MACRO10, MACRO11,   MACRO12, KC_POWER,  KC_F15, \
         XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, KC_SLEP,   XXXXXXX, \
         XXXXXXX,  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            DEBUG,     XXXXXXX, \
@@ -95,6 +95,8 @@ const uint8_t g_led_config_new_flags[DRIVER_LED_TOTAL] = {
     0x21, 0x01, 0x04, 0x04, 0x04, 0x04, 0x24, 0x24, 0x24, 0x24, 0x04, 0x04, 0x04, 0x04, 0x21   // 123 row
 };
 
+#define ID67_CAPS_LOCK_KEY_INDEX 36  // position of Caps Lock key
+
 bool isRGBOff = false;
 bool isCapsBlink = false;
 static uint16_t recording_timer;
@@ -121,7 +123,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
     if (host_keyboard_led_state().caps_lock) {
         if (isRGBOff) {
-            rgb_matrix_set_color(23, v, v, v);  // white
+            rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v);  // white
         } else {
             // Caps Lock key/LED
             if (timer_elapsed(recording_timer) > 500) {
@@ -129,7 +131,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
                 recording_timer = timer_read();
             }
             if (isCapsBlink) {
-                rgb_matrix_set_color(23, v, v, v);  // white
+                rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, v, v, v);  // white
             }
 
             // Alpha keys/LEDs
@@ -144,21 +146,21 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         uint8_t g = 0;
         uint8_t b = 0;
 
-        if ((g_led_config.flags[23] & LED_FLAG_LAYER_IND) != 0) {
+        if ((g_led_config.flags[ID67_CAPS_LOCK_KEY_INDEX] & LED_FLAG_LAYER_IND) != 0) {
             switch (current_layer) {
-                case LAYER_1: b = v; break;  // blue
-                case LAYER_2: g = v; break;  // green
-                case LAYER_3: r = v; break;  // red
+                case _FN1: b = v; break;  // blue
+                case _FN2: g = v; break;  // green
+                case _FN3: r = v; break;  // red
             }
         }
 
-        rgb_matrix_set_color(23, r, g, b);  // off
+        rgb_matrix_set_color(ID67_CAPS_LOCK_KEY_INDEX, r, g, b);  // off
     }
 
     // Layer indicator stuff
 
     switch (current_layer) {
-        case LAYER_1:
+        case _FN1:
             for (uint8_t i = led_min; i <= led_max; i++) {
                 if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
                     rgb_matrix_set_color(i, 0, 0, v);  // blue
@@ -166,7 +168,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
             break;
 
-        case LAYER_2:
+        case _FN2:
             for (uint8_t i = led_min; i <= led_max; i++) {
                 if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
                     rgb_matrix_set_color(i, 0, v, 0);  // green
@@ -174,7 +176,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             }
             break;
 
-        case LAYER_3:
+        case _FN3:
             for (uint8_t i = led_min; i <= led_max; i++) {
                 if ((g_led_config.flags[i] & LED_FLAG_LAYER_IND) != 0) {
                     rgb_matrix_set_color(i, v, 0, 0);  // red
diff --git a/keyboards/idobao/id67/post_rules.mk b/keyboards/idobao/id67/post_rules.mk
new file mode 100644
index 0000000000..5eecdef4ce
--- /dev/null
+++ b/keyboards/idobao/id67/post_rules.mk
@@ -0,0 +1,14 @@
+# Some ID67 variants (v1 base build & "Bestype") have a solid back plate,
+#  this enables switching off thoes LEDs
+# Usage:  `make idobao/id67:default UNDERGLOW=off`
+
+ifeq ($(findstring off,$(UNDERGLOW)), off)
+  $(info ** UNDERGLOW OFF)
+  OPT_DEFS += -DID67_DISABLE_UNDERGLOW
+else ifeq ($(findstring no,$(UNDERGLOW)), no)
+  $(info ** NO UNDERGLOW)
+  OPT_DEFS += -DID67_DISABLE_UNDERGLOW
+else ifeq ($(findstring 0,$(UNDERGLOW)), 0)
+  $(info ** Nil UNDERGLOW)
+  OPT_DEFS += -DID67_DISABLE_UNDERGLOW
+endif
diff --git a/keyboards/idobao/id67/readme.md b/keyboards/idobao/id67/readme.md
index c061db8f03..b69e2e60b1 100644
--- a/keyboards/idobao/id67/readme.md
+++ b/keyboards/idobao/id67/readme.md
@@ -1,6 +1,6 @@
 # IDOBAO ID67
 
-![id67](https://i.imgur.com/9roQ4Mih.jpeg)
+![id67](https://idobao.github.io/assets/img/idobao-id67.png)
 
 A 65% hotswap keyboard from IDOBAO.
 
@@ -9,14 +9,14 @@ A 65% hotswap keyboard from IDOBAO.
 * Keyboard Maintainer: Tybera *(fmr.)*, [thewerther](https://github.com/thewerther) *(curr.)*
 * Hardware Supported: IDOBAO ID67, ID67V2, ID67 Crystal & ID67 Bestype
 * Hardware Availability: IDOBAO website: 
-* [ID67](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
-* [ID67V2](https://idobao.net/collections/65-layout/products/idobao-id67v2-65-hot-swappable-mechanical-keyboard-kit)
-* [ID67 Crystal](https://idobao.net/collections/65-layout/products/idobao-id67-crystal-keyboard-kit-gasket-mount-version)
-* [ID67 Bestype](https://idobao.net/collections/65-layout/products/idobao-id67-bestype-keyboard-kit-aluminum-with-brass-weight)
+  * [ID67](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
+  * [ID67V2](https://idobao.net/products/idobao-id67v2-65-hot-swappable-mechanical-keyboard-kit)
+  * [ID67 Crystal](https://idobao.net/products/idobao-id67-crystal-keyboard-kit-gasket-mount-version)
+  * [ID67 Bestype](https://idobao.net/products/idobao-id67-bestype-keyboard-kit-aluminum-with-brass-weight)
 
 ## Layout
 
-![ID67 layout](https://i.imgur.com/Ge6Uxao.png)
+![ID67 layout](https://idobao.github.io/kle/idobao-id67.png)
 
 
 ## Compiling and flashing
diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk
index cda7bbd9cd..729e1ca67c 100644
--- a/keyboards/idobao/id67/rules.mk
+++ b/keyboards/idobao/id67/rules.mk
@@ -16,10 +16,6 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
 RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature
 RGB_MATRIX_DRIVER = WS2812 	# ID67 uses WS2812 driver
-
-KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
-LTO_ENABLE = yes
 LAYOUTS = 65_ansi_blocker